From fcd8fec8154567062ea6c1a27b5f599808fc4af9 Mon Sep 17 00:00:00 2001 From: Zandario Date: Sat, 17 Oct 2020 05:37:58 -0500 Subject: [PATCH] Fixes an oversight and updates some defines (#13558) --- code/__DEFINES/species.dm | 3 +++ code/datums/diseases/transformation.dm | 4 ++-- .../carbon/human/species_types/android.dm | 2 +- .../carbon/human/species_types/angel.dm | 2 +- .../carbon/human/species_types/arachnid.dm | 12 ++++++------ .../carbon/human/species_types/dullahan.dm | 2 +- .../carbon/human/species_types/felinid.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 4 ++-- .../human/species_types/lizardpeople.dm | 4 ++-- .../carbon/human/species_types/podpeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 4 ++-- .../carbon/human/species_types/skeletons.dm | 2 +- .../carbon/human/species_types/synths.dm | 4 ++-- .../carbon/human/species_types/vampire.dm | 2 +- .../carbon/human/species_types/zombies.dm | 8 ++++---- icons/mob/human_parts_greyscale.dmi | Bin 93083 -> 93087 bytes 16 files changed, 30 insertions(+), 27 deletions(-) diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm index c6cc6a5037..3b4c674079 100644 --- a/code/__DEFINES/species.dm +++ b/code/__DEFINES/species.dm @@ -5,6 +5,7 @@ #define SPECIES_ANDROID "android" #define SPECIES_ANGEL "angel" #define SPECIES_MAMMAL "mammal" +#define SPECIES_ARACHNID "arachnid" #define SPECIES_INSECT "insect" #define SPECIES_DULLAHAN "dullahan" #define SPECIES_DWARF "dwarf" @@ -34,6 +35,7 @@ #define SPECIES_SYNTH_MIL "military_synth" #define SPECIES_VAMPIRE "vampire" #define SPECIES_XENOHYBRID "xeno" +#define SPECIES_ZOMBIE "zombie" // Species Category Defines --------------------- @@ -45,6 +47,7 @@ #define SPECIES_CATEGORY_PLANT "plant" #define SPECIES_CATEGORY_ROBOT "robotic" #define SPECIES_CATEGORY_JELLY "jelly" +#define SPECIES_CATEGORY_LIZARD "lizard" #define SPECIES_CATEGORY_SHADOW "shadow" #define SPECIES_CATEGORY_SKELETON "skeleton" #define SPECIES_CATEGORY_UNDEAD "undead" diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index f952307685..44775ed031 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -236,12 +236,12 @@ switch(stage) if(1) if(ishuman(affected_mob) && affected_mob.dna) - if(affected_mob.dna.species.id == "slime" || affected_mob.dna.species.id == "stargazer" || affected_mob.dna.species.id == "slimelumi") + if(affected_mob.dna.species.id == SPECIES_SLIME_LUMI || affected_mob.dna.species.id == SPECIES_STARGAZER || affected_mob.dna.species.id == SPECIES_SLIME_LUMI) stage = 5 if(3) if(ishuman(affected_mob)) var/mob/living/carbon/human/human = affected_mob - if(human.dna.species.id != "slime" && affected_mob.dna.species.id != "stargazer" && affected_mob.dna.species.id != "slimelumi") + if(human.dna.species.id != SPECIES_SLIME_LUMI && affected_mob.dna.species.id != SPECIES_STARGAZER && affected_mob.dna.species.id != SPECIES_SLIME_LUMI) human.set_species(/datum/species/jelly/slime) /datum/disease/transformation/corgi diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm index 492f3d58e0..bfa3073f64 100644 --- a/code/modules/mob/living/carbon/human/species_types/android.dm +++ b/code/modules/mob/living/carbon/human/species_types/android.dm @@ -10,5 +10,5 @@ damage_overlay_type = "synth" mutanttongue = /obj/item/organ/tongue/robot species_language_holder = /datum/language_holder/synthetic - limbs_id = "synth" + limbs_id = SPECIES_SYNTH species_category = SPECIES_CATEGORY_ROBOT diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm index 9c87f3ad5d..9e34411847 100644 --- a/code/modules/mob/living/carbon/human/species_types/angel.dm +++ b/code/modules/mob/living/carbon/human/species_types/angel.dm @@ -7,7 +7,7 @@ use_skintones = USE_SKINTONES_GRAYSCALE_CUSTOM no_equip = list(SLOT_BACK) blacklisted = 1 - limbs_id = "human" + limbs_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human species_category = SPECIES_CATEGORY_BASIC //they're a kind of human diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm index 2072883c54..4a8c872400 100644 --- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm +++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm @@ -1,6 +1,6 @@ /datum/species/arachnid name = "Arachnid" - id = "arachnid" + id = SPECIES_ARACHNID override_bp_icon = 'icons/mob/arachnid_parts.dmi' say_mod = "chitters" default_color = "00FF00" @@ -59,10 +59,10 @@ SW?.Remove(H) /datum/action/innate/spin_web - name = "Spin Web" - check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS - icon_icon = 'icons/mob/actions/actions_animal.dmi' - button_icon_state = "lay_web" + name = "Spin Web" + check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS + icon_icon = 'icons/mob/actions/actions_animal.dmi' + button_icon_state = "lay_web" /datum/action/innate/spin_cocoon name = "Spin Cocoon" @@ -152,4 +152,4 @@ else A.forceMove(C) H.visible_message("[H] wraps [A] into a cocoon!") - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index f756fd8816..7faa08b52c 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -11,7 +11,7 @@ mutanttongue = /obj/item/organ/tongue/dullahan mutantears = /obj/item/organ/ears/dullahan blacklisted = TRUE - limbs_id = "human" + limbs_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human has_field_of_vision = FALSE //Too much of a trouble, their vision is already bound to their severed head. species_category = SPECIES_CATEGORY_UNDEAD diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 011b6b7642..3fcefbe2cc 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -2,7 +2,7 @@ /datum/species/human/felinid name = "Felinid" id = SPECIES_FELINID - limbs_id = "human" + limbs_id = SPECIES_HUMAN mutant_bodyparts = list("mam_tail" = "Cat", "mam_ears" = "Cat", "deco_wings" = "None") diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 58a10fb08e..a87c92bdb9 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -468,7 +468,7 @@ /datum/species/jelly/roundstartslime name = "Xenobiological Slime Hybrid" id = SPECIES_SLIME_HYBRID - limbs_id = "slime" + limbs_id = SPECIES_SLIME default_color = "00FFFF" species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR) inherent_traits = list(TRAIT_TOXINLOVER) @@ -480,7 +480,7 @@ heatmod = 1 burnmod = 1 - allowed_limb_ids = list("slime","stargazer","lum") + allowed_limb_ids = list(SPECIES_SLIME,SPECIES_STARGAZER,SPECIES_SLIME_LUMI) /datum/action/innate/slime_change name = "Alter Form" diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c37a24a93a..e02d15303f 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -28,7 +28,7 @@ tail_type = "tail_lizard" wagging_type = "waggingtail_lizard" - species_category = "lizard" + species_category = SPECIES_CATEGORY_LIZARD /datum/species/lizard/random_name(gender,unique,lastname) if(unique) @@ -47,7 +47,7 @@ /datum/species/lizard/ashwalker name = "Ash Walker" id = SPECIES_ASHWALKER - limbs_id = "lizard" + limbs_id = SPECIES_LIZARD species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE) inherent_traits = list(TRAIT_CHUNKYFINGERS) mutantlungs = /obj/item/organ/lungs/ashwalker diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index fae8ebfb0d..3d79e13685 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -69,7 +69,7 @@ id = SPECIES_POD_WEAK species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS) mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs") - limbs_id = "pod" + limbs_id = SPECIES_POD light_nutrition_gain_factor = 3 light_bruteheal = -0.2 light_burnheal = -0.2 diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 7dc8083264..4806813c04 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -33,7 +33,7 @@ /datum/species/shadow/nightmare name = "Nightmare" id = SPECIES_NIGHTMARE - limbs_id = "shadow" + limbs_id = SPECIES_SHADOW burnmod = 1.5 blacklisted = TRUE no_equip = list(SLOT_WEAR_MASK, SLOT_WEAR_SUIT, SLOT_GLOVES, SLOT_SHOES, SLOT_W_UNIFORM, SLOT_S_STORE) @@ -141,7 +141,7 @@ playsound(owner,'sound/effects/singlebeat.ogg',40,1) if(respawn_progress >= HEART_RESPAWN_THRESHHOLD) owner.revive(full_heal = TRUE) - if(!(owner.dna.species.id == "shadow" || owner.dna.species.id == "nightmare")) + if(!(owner.dna.species.id == SPECIES_SHADOW || owner.dna.species.id == SPECIES_NIGHTMARE)) var/mob/living/carbon/old_owner = owner Remove(HEART_SPECIAL_SHADOWIFY) old_owner.set_species(/datum/species/shadow) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index b0673a7df4..8175f505fa 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -32,7 +32,7 @@ /datum/species/skeleton/space name = "Spooky Spacey Skeleton" id = SPECIES_SKELETON_SPACE - limbs_id = "skeleton" + limbs_id = SPECIES_SKELETON blacklisted = 1 inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT, TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER) diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm index 5d2b6f4c77..91711b5c39 100644 --- a/code/modules/mob/living/carbon/human/species_types/synths.dm +++ b/code/modules/mob/living/carbon/human/species_types/synths.dm @@ -11,7 +11,7 @@ meat = null gib_types = /obj/effect/gibspawner/robot damage_overlay_type = "synth" - limbs_id = "synth" + limbs_id = SPECIES_SYNTH var/list/initial_species_traits = list(NOTRANSSTING) //for getting these values back for assume_disguise() var/list/initial_inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER,TRAIT_NOBREATH) var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off @@ -80,7 +80,7 @@ qdel(fake_species) fake_species = null meat = initial(meat) - limbs_id = "synth" + limbs_id = SPECIES_SYNTH use_skintones = FALSE sexes = 0 fixed_mut_color = "" diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index c2bafd0065..676248c463 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -11,7 +11,7 @@ mutant_heart = /obj/item/organ/heart/vampire mutanttongue = /obj/item/organ/tongue/vampire blacklisted = TRUE - limbs_id = "human" + limbs_id = SPECIES_HUMAN skinned_type = /obj/item/stack/sheet/animalhide/human var/info_text = "You are a Vampire. You will slowly but constantly lose blood if outside of a coffin. If inside a coffin, you will slowly heal. You may gain more blood by grabbing a live victim and using your drain ability." species_category = SPECIES_CATEGORY_UNDEAD diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm index f1c0b8e7c0..385dd94f04 100644 --- a/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -3,7 +3,7 @@ /datum/species/zombie // 1spooky name = "High-Functioning Zombie" - id = "zombie" + id = SPECIES_ZOMBIE say_mod = "moans" sexes = 0 blacklisted = 1 @@ -19,7 +19,7 @@ /datum/species/zombie/notspaceproof id = "notspaceproofzombie" - limbs_id = "zombie" + limbs_id = SPECIES_ZOMBIE blacklisted = 0 inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_FAKEDEATH) @@ -31,7 +31,7 @@ /datum/species/zombie/infectious name = "Infectious Zombie" id = "memezombies" - limbs_id = "zombie" + limbs_id = SPECIES_ZOMBIE inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_NOBREATH,TRAIT_NODEATH,TRAIT_NOSOFTCRIT, TRAIT_FAKEDEATH) mutanthands = /obj/item/zombie_hand armor = 20 // 120 damage to KO a zombie, which kills it @@ -100,7 +100,7 @@ /datum/species/krokodil_addict name = SPECIES_HUMAN id = "goofzombies" - limbs_id = "zombie" //They look like zombies + limbs_id = SPECIES_ZOMBIE //They look like zombies sexes = 0 meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie mutanttongue = /obj/item/organ/tongue/zombie diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 814ac9a396978778417364e269581257ef74347c..fb864385c741d8dbea7de5752edeabdcbd00551e 100644 GIT binary patch delta 1316 zcmV+<1>5?Y*9D)~1&}0v|9VtdbVOxyV{&P5bZKvH004NLrJKuc+ei>a*Vb1M$<`Q* zm29;cI2d@5`~uOG+G0aPF^4ILIAAdjn${v3{ ztzK-~xu(uG+4n#GT;2WWc72&`vTy6vU1{CE?8860-t;!xWM962tnPNM?XpeweRcQT zn#y+BCVQBGa;Qw5m)7j^N`aptye)0lW9dLs?KU?pRrUhg=B2535}X&dbU4N<3H*Wt zZSL(J>vJ~vB$x1KjE`Osd9L5)rse8hqDLEucxb9nl9a?RO48=u?u8tT_U_%ZJGy96 z`t~*$X}W4=I96wW%VvbxwmB-JZ7`$hIyly&q|i3bu`aSkju{BNb9>jjeQS0$e}D<* zF?yc$f;?-O$GkXG<12}@qD`xhG}AsbcyN#C?YTNMd}Jq<>9S!xG;~sfCYqrMr2`bo zz~b6;hH_|^p&z`dd+dk_2EFs9?zt-xnrcI5cvJV(8>23NYhVK77LLUT2}F;KMe*J< zpZsIJf1^H0;M=_nF!f1FQ*Gvxz%rjiUDU=DrfrPH2njTw#G-ibnNK?JDocHmz_)uD zVCs{UrrOLWfn`34x~PpQOxqZX5fW%ViAC|=GoS1mZ!7AP1iszN08^i&G}UH42`uwT z)J1JfVcN!jSd5TB^GPg<_g>g1eyE(ZQ>Fko`+lgLwp)@2C5NzM{7^Y%&y4zf6(j-D zIv5KR6D`;~V}Y7aps#wwT^GAyPfss zE!$-4`}O_B@C)fc_|-<>_~rSpGz>&vaVN@sc|LLY)oD#s9_}A5T*9Y{04oC&ab?0# z4WEfFtyzBg+tPNu8r{{#UCVodUdeL8!lzel+*SLY(Pa;l1jY}Nu^1tN_@o+(LQknt zpRn71T>8J)48OghBTk=HbDrxn$3&WWX3|DYo#V8vQ%O=1%{xjppS6ZrPbzuLN?uP74>b(u@X`+?CVlYJ&|VMglxGl4=zZK7u( zau(@|v{`nCEgWTc*uqH;nrPA{lnz=b1B+`@9Lk~hjo)GR(&r9a_Acq_&TjF~4^kR` zG%wI}mCbNm3v^t7q3NPBvqnl|cf@*>6rurRUC3E6g8(mC&1XXwXQj*RY^an~ThSka z7Gx5yOk335Tiuu5z2mPmGah_Ei9G&BGY=3lz%#Ch!(*;VogG9?@)|E5j?L4^Ver&z z$|B)Qw!wwqPh_TZb0JvFtZjvputnK_LBD1aKYl%C ak3XMQ{{vlJbt}kN_`QQD1-B>#0dr=}hnb%M delta 1312 zcmV+*1>gFg*9Du`1&}0v`+8JZbVOxyV{&P5bZKvH004NLrJK!i+c*$}&(c${lB+8f zE4k{ju1}vuC9`8^8L%#_3A&j@A71ueA}#7xpjxU^MACR>1?u1K7Cq$ulBBKlWp>Sy?Sa) zY1?F*+>d~~FHM!^*6h<#0Y5?TF1KxmsXdxqhTb0J`xG&j{=0;ieH9gZm!fntF` zlNR=X`8n46B$eP#7(RGK#B=^8H4SGkB=led5$=mBq$G(Hi$t2Vum?edp$qqBnmrvf zG5Yp27|?XoOyHP*oei4-%%;tW8BK!;nvR20K8l1kaZY)WF>+EM;JrJz&K(-Fx9L3; zn8xTjn*}->sAHa;sqm8ow8BlZ4`{}Hta0O>ptt+#So4-0v5c2B>#?St>N!yljZoS^ zJ`GH+b*E2gF@izu3R8956%m?pLuVAG>Zmt=23}Uc2#iZOBqIoj9vPD2 zwP!y0V~gUI`XmD1uB8W4pTua&&3xjq%qM{tl`#g>GKORX0nH~NDPDW#leTcBr9O$k zw`=La)F&~TaxwAsInH^GQgG*Pi*L=&?&qQ1BhtbBByr#tT0#d+H6($-en|)fYYu zOfG&+_S6xc8_k%`Gzar$8@$I%1HfKz3c!2Ky9h-C?l~ts+;<{=wl%y9z}rKVm?$Lf zLs5d7PnfUDzRls{mVKL3GnIXtV;_}$o5RN&pjx_r5GyPg^}FqI+gMY~=J9R4+S|gs zCfj6lx4F9-enk$1&lUp5FV~+b7>J&6C(^#&pE!KBTO*eHyZbAT@S!BY$N)*qbQsFv zBhk4v%O8K2+qP4q+se2(-81Nn${7~!UX^jP_PxN%Hj@a9H&~#0Q zAXv8vT9jCFfq5|$zFwb)(hI?hp^~b0x%n=CXn~UWWZI4Ai>+!nnOLc*&o`11bO&91@z4W=`j=f8|s3h<08z~M31$j%O;MtTh|9*#|A-&_e6m9?pG7Pd%DenM@3Hkf~V)43h)#3}xEZv{MS+<<0%J8~;es;vtg zffG2${MiZrloO*VH(bGIhyUFt@baHQD?gc*7LMNcj>lx$p&IALx5+VFIIKf=%HbeQ z082+a@DQo)_|^6a3)Z6Ugj@R&44L5?*B$;vf@fuCpq`dvVck6K4D@sI9!;g^w