Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit da99308

Browse files
MqiibMoltijoe
andauthored
Removes normal legs from lizards to solve some issues and because I'm an evil bastard (#22290)
* legnt sorry i took your legs you're a snake now * deleted * these too --------- Co-authored-by: Molti <[email protected]>
1 parent 06d20d3 commit da99308

File tree

8 files changed

+6
-30
lines changed

8 files changed

+6
-30
lines changed

code/__HELPERS/global_lists.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
2929
init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, GLOB.spines_list)
3030
init_sprite_accessory_subtypes(/datum/sprite_accessory/spines_animated, GLOB.animated_spines_list)
31-
init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
3231
init_sprite_accessory_subtypes(/datum/sprite_accessory/caps, GLOB.caps_list)
3332
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list)
3433
init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wingsopen, GLOB.moth_wingsopen_list)

code/__HELPERS/mobs.dm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, GLOB.frills_list)
6262
if(!GLOB.spines_list.len)
6363
init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, GLOB.spines_list)
64-
if(!GLOB.legs_list.len)
65-
init_sprite_accessory_subtypes(/datum/sprite_accessory/legs, GLOB.legs_list)
6664
if(!GLOB.body_markings_list.len)
6765
init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
6866
if(!GLOB.wings_list.len)
@@ -121,7 +119,6 @@
121119
"frills" = pick(GLOB.frills_list),
122120
"spines" = pick(GLOB.spines_list),
123121
"body_markings" = pick(GLOB.body_markings_list),
124-
"legs" = "Normal Legs",
125122
"caps" = pick(GLOB.caps_list),
126123
"moth_wings" = pick(GLOB.moth_wings_list),
127124
"tail_polysmorph" = pick(GLOB.tails_list_polysmorph),

code/_globalvars/lists/flavor_misc.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(snouts_list)
2525
GLOBAL_LIST_EMPTY(horns_list)
2626
GLOBAL_LIST_EMPTY(frills_list)
2727
GLOBAL_LIST_EMPTY(spines_list)
28-
GLOBAL_LIST_EMPTY(legs_list)
2928
GLOBAL_LIST_EMPTY(animated_spines_list)
3029
//Polysmorph
3130
GLOBAL_LIST_EMPTY(tails_list_polysmorph)

code/modules/client/preferences/species_features/lizard.dm

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,6 @@
9797
target.dna.features["horns"] = value
9898

9999

100-
/datum/preference/choiced/lizard_legs
101-
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
102-
savefile_key = "feature_lizard_legs"
103-
savefile_identifier = PREFERENCE_CHARACTER
104-
relevant_mutant_bodypart = "legs"
105-
106-
/datum/preference/choiced/lizard_legs/init_possible_values()
107-
return assoc_to_keys(GLOB.legs_list)
108-
109-
/datum/preference/choiced/lizard_legs/apply_to_human(mob/living/carbon/human/target, value)
110-
target.dna.features["legs"] = value
111-
112-
113100
/datum/preference/choiced/lizard_snout
114101
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
115102
savefile_key = "feature_lizard_snout"

code/modules/mob/living/carbon/human/_species.dm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
459459
C.hud_used.update_locked_slots()
460460

461461
// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
462-
if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
463-
species_traits += DIGITIGRADE
464462
if(DIGITIGRADE in species_traits)
465463
C.Digitigrade_Leg_Swap(FALSE)
466464

@@ -1109,8 +1107,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
11091107
S = GLOB.wings_list[H.dna.features["wingsdetail"]]
11101108
if("wingsdetailopen")
11111109
S = GLOB.wings_open_list[H.dna.features["wingsdetail"]]
1112-
if("legs")
1113-
S = GLOB.legs_list[H.dna.features["legs"]]
11141110
if("moth_wings")
11151111
S = GLOB.moth_wings_list[H.dna.features["moth_wings"]]
11161112
if("moth_wingsopen")

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
id = SPECIES_LIZARD
88
say_mod = "hisses"
99
default_color = "00FF00"
10-
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAS_FLESH,HAS_BONE,HAS_TAIL)
10+
species_traits = list(MUTCOLORS,EYECOLOR,DIGITIGRADE,LIPS,HAS_FLESH,HAS_BONE,HAS_TAIL)
1111
inherent_traits = list(TRAIT_COLDBLOODED)
1212
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
13-
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
13+
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings")
1414
mutanttongue = /obj/item/organ/tongue/lizard
1515
mutanttail = /obj/item/organ/tail/lizard
1616
coldmod = 0.67 //used to being cold, just doesn't like it much
1717
heatmod = 0.67 //greatly appreciate heat, just not too much
18-
default_features = list("mcolor" = "#00FF00", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")
18+
default_features = list("mcolor" = "#00FF00", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None")
1919
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
2020
attack_verbs = list("slash", "scratch", "claw")
2121
attack_effect = ATTACK_EFFECT_CLAW

code/modules/mob/living/carbon/human/species_types/polysmorphs.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//Human xenopmorph hybrid
33
name = "Polysmorph"
44
id = SPECIES_POLYSMORPH
5-
species_traits = list(NOEYESPRITES, MUTCOLORS, NOCOLORCHANGE, DIGITIGRADE, HAS_FLESH, HAS_BONE, HAS_TAIL)
5+
species_traits = list(NOEYESPRITES, DIGITIGRADE, MUTCOLORS, NOCOLORCHANGE, DIGITIGRADE, HAS_FLESH, HAS_BONE, HAS_TAIL)
66
possible_genders = list(FEMALE)
77
inherent_traits = list(TRAIT_ACIDBLOOD, TRAIT_SKINNY)
88
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID
@@ -40,8 +40,8 @@
4040
attack_sound = 'sound/weapons/slash.ogg'
4141
miss_sound = 'sound/weapons/slashmiss.ogg'
4242
fixed_mut_color = "#444466" //don't mess with this if you don't feel like manually adjusting the mutant bodypart sprites
43-
mutant_bodyparts = list("tail_polysmorph", "dome", "dorsal_tubes", "teeth", "legs")
44-
default_features = list("tail_polysmorph" = "Polys", "dome" = "None", "dorsal_tubes" = "No", "teeth" = "None", "legs" = "Normal Legs")
43+
mutant_bodyparts = list("tail_polysmorph", "dome", "dorsal_tubes", "teeth")
44+
default_features = list("tail_polysmorph" = "Polys", "dome" = "None", "dorsal_tubes" = "No", "teeth" = "None")
4545
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
4646

4747
smells_like = "charred, acidic meat"

code/modules/surgery/bodyparts/dismemberment.dm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,6 @@
425425
limb_list -= excluded_limbs
426426
for(var/Z in limb_list)
427427
. += regenerate_limb(Z, noheal)
428-
if(("legs" in dna?.species?.mutant_bodyparts) && dna.features["legs"] == "Digitigrade Legs")
429-
Digitigrade_Leg_Swap(FALSE)
430428

431429
/mob/living/proc/regenerate_limb(limb_zone, noheal)
432430
return

0 commit comments

Comments
 (0)