Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 450ab0e

Browse filesBrowse files
MoltijoeMoltijoe
authored
species defines (yogstation13#22236)
1 parent ce18676 commit 450ab0e
Copy full SHA for 450ab0e

46 files changed

+125-90Lines changed: 125 additions & 90 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/__DEFINES/mobs.dm‎

Copy file name to clipboardExpand all lines: code/__DEFINES/mobs.dm
+31Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,37 @@
8585
#define ALL_NON_ROBOTIC (MOB_ORGANIC|MOB_INORGANIC|MOB_UNDEAD)
8686
#define ALL_BIOTYPES (MOB_ORGANIC|MOB_INORGANIC|MOB_ROBOTIC|MOB_UNDEAD)
8787

88+
// Defines for Species IDs. Used to refer to the name of a species, for things like bodypart names or species preferences.
89+
#define SPECIES_ABDUCTOR "abductor"
90+
#define SPECIES_ANDROID "android"
91+
#define SPECIES_DULLAHAN "dullahan"
92+
#define SPECIES_ETHEREAL "ethereal"
93+
#define SPECIES_FELINE "felinid"
94+
#define SPECIES_FLYPERSON "fly"
95+
#define SPECIES_HUMAN "human"
96+
97+
#define SPECIES_JELLYPERSON "jelly"
98+
#define SPECIES_SLIMEPERSON "slime"
99+
#define SPECIES_LUMINESCENT "lum" //for some reason it's just lum in our codebase and i don't want to break stuff by changing it
100+
#define SPECIES_STARGAZER "stargazer"
101+
#define SPECIES_LIZARD "lizard"
102+
#define SPECIES_LIZARD_ASH "ashlizard"
103+
#define SPECIES_LIZARD_ASH_SHAMAN "ashlizardshaman"
104+
#define SPECIES_LIZARD_DRACONID "draconid"
105+
106+
#define SPECIES_NIGHTMARE "nightmare"
107+
#define SPECIES_MOTH "moth"
108+
#define SPECIES_MUSHROOM "mush"
109+
#define SPECIES_PLASMAMAN "plasmaman"
110+
#define SPECIES_PODPERSON "pod"
111+
#define SPECIES_SHADOW "shadow"
112+
#define SPECIES_SKELETON "skeleton"
113+
#define SPECIES_SNAIL "snail"
114+
#define SPECIES_VAMPIRE "vampire"
115+
#define SPECIES_ZOMBIE "zombie"
116+
#define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
117+
#define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
118+
88119
//Organ defines for carbon mobs
89120
#define ORGAN_ORGANIC 1
90121
#define ORGAN_ROBOTIC 2
Collapse file

‎code/__DEFINES/{yogs_defines}/mobs.dm‎

Copy file name to clipboardExpand all lines: code/__DEFINES/{yogs_defines}/mobs.dm
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
#define MONKIFY_BLOOD_COEFFICIENT (BLOOD_VOLUME_MONKEY/BLOOD_VOLUME_GENERIC) //the ratio of monkey to human blood volume so a 100% blood volume monkey will not instantly die when you turn it into a human with ~58% blood volume
1111

12+
#define SPECIES_DARKSPAWN "darkspawn"
13+
#define SPECIES_IPC "ipc"
14+
#define SPECIES_POLYSMORPH "polysmorph"
15+
#define SPECIES_PRETERNIS "preternis"
1216
#define SPECIES_VOX "vox"
1317

1418
#define BUTT_SPRITE_VOX "vox"
Collapse file

‎code/__HELPERS/game.dm‎

Copy file name to clipboardExpand all lines: code/__HELPERS/game.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
var/mob/living/carbon/human/H
391391
if(ishuman(M.current))
392392
H = M.current
393-
return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != "memezombies")
393+
return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != SPECIES_ZOMBIE_INFECTIOUS)
394394
else if(isliving(M.current))
395395
if(isAI(M.current))
396396
var/mob/living/silicon/ai/AI = M.current
Collapse file

‎code/datums/traits/negative.dm‎

Copy file name to clipboardExpand all lines: code/datums/traits/negative.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188

189189
/datum/quirk/nyctophobia/on_process()
190190
var/mob/living/carbon/human/H = quirk_holder
191-
if((H.dna.species.id in list("shadow", "nightmare", "darkspawn")) || is_darkspawn_or_thrall(H))
191+
if(isshadowperson(H) || is_darkspawn_or_thrall(H))
192192
return //we're tied with the dark, so we don't get scared of it; don't cleanse outright to avoid cheese
193193
var/turf/T = get_turf(quirk_holder)
194194
var/lums = T.get_lumcount()
Collapse file

‎code/game/gamemodes/clock_cult/clock_cult.dm‎

Copy file name to clipboardExpand all lines: code/game/gamemodes/clock_cult/clock_cult.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Credit where due:
283283
var/plasmaman //We use this to determine if we should activate internals in post_equip()
284284

285285
/datum/outfit/servant_of_ratvar/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
286-
if(H.dna.species.id == "plasmaman") //Plasmamen get additional equipment because of how they work
286+
if(H.dna.species.id == SPECIES_PLASMAMAN) //Plasmamen get additional equipment because of how they work
287287
head = /obj/item/clothing/head/helmet/space/plasmaman
288288
uniform = /obj/item/clothing/under/plasmaman //Plasmamen generally shouldn't need chameleon suits anyways, since everyone expects them to wear their fire suit
289289
r_hand = /obj/item/tank/internals/plasmaman/belt/full
Collapse file

‎code/game/machinery/computer/crew.dm‎

Copy file name to clipboardExpand all lines: code/game/machinery/computer/crew.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
197197
brutedam = round(tracked_mob.getBruteLoss(),1)
198198

199199
//species check
200-
if (ishumanbasic(tracked_mob))
200+
if (ishumanbasic(tracked_mob)) //this should really just pull the species name or something rather than having all these checks
201201
species = "Human"
202202
if (ispreternis(tracked_mob))
203203
species = "Robot"
Collapse file

‎code/game/machinery/limbgrower.dm‎

Copy file name to clipboardExpand all lines: code/game/machinery/limbgrower.dm
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
circuit = /obj/item/circuitboard/machine/limbgrower
1313

1414
/// The category of limbs we're browing in our UI.
15-
var/selected_category = "human"
15+
var/selected_category = SPECIES_HUMAN
1616
/// If we're currently printing something.
1717
var/busy = FALSE
1818
/// How efficient our machine is. Better parts = less chemicals used and less power used. Range of 1 to 0.25.
@@ -24,7 +24,7 @@
2424
/// Our internal techweb for limbgrower designs.
2525
var/datum/techweb/stored_research
2626
/// All the categories of organs we can print.
27-
var/list/categories = list("human", "lizard", "moth", "plasmaman", "ethereal", "polysmorph", "vox", "other")
27+
var/list/categories = list(SPECIES_HUMAN, SPECIES_LIZARD, SPECIES_MOTH, SPECIES_PLASMAMAN, SPECIES_ETHEREAL, SPECIES_POLYSMORPH, SPECIES_VOX, "other")
2828
//yogs grower a little different because we're going to allow meats to be converted to synthflesh because hugbox
2929
var/list/accepted_biomass = list(
3030
/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 25,
@@ -255,9 +255,9 @@
255255
/// The limb we're making with our buildpath, so we can edit it.
256256
var/obj/item/bodypart/limb = new buildpath(loc)
257257
/// Species with greyscale limbs.
258-
var/list/greyscale_species = list("human", "lizard", "ethereal")
258+
var/list/greyscale_species = list(SPECIES_HUMAN, SPECIES_LIZARD, SPECIES_ETHEREAL)
259259
if(selected_category in greyscale_species) //Species with greyscale parts should be included here
260-
if(selected_category == "human") //humans don't use the full colour spectrum, they use random_skin_tone
260+
if(selected_category == SPECIES_HUMAN) //humans don't use the full colour spectrum, they use random_skin_tone
261261
limb.skin_tone = random_skin_tone()
262262
else
263263
limb.species_color = random_short_color()
Collapse file

‎code/game/machinery/teleporter.dm‎

Copy file name to clipboardExpand all lines: code/game/machinery/teleporter.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
log_game("[M] ([key_name(M)]) was turned into a fly person")
8080
if(ishuman(M))//don't remove people from the round randomly you jerks
8181
var/mob/living/carbon/human/human = M
82-
if(human.dna && human.dna.species.id == "human")
82+
if(human.dna && human.dna.species.id == SPECIES_HUMAN)
8383
to_chat(M, span_italics("You hear a buzzing in your ears."))
8484
human.set_species(/datum/species/fly)
8585

Collapse file

‎code/game/objects/effects/decals/cleanable/humans.dm‎

Copy file name to clipboardExpand all lines: code/game/objects/effects/decals/cleanable/humans.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
. += "Some <B>feet</B>."
297297
else if(species == "monkey")
298298
. += "[icon2html('icons/mob/monkey.dmi', user, "monkey1")] Some <B>monkey paws</B>."
299-
else if(species == "human")
299+
else if(species == SPECIES_HUMAN)
300300
. += "[icon2html('icons/mob/human_parts.dmi', user, "default_human_l_leg")] Some <B>human feet</B>."
301301
else
302302
. += "[icon2html('icons/mob/human_parts.dmi', user, "[species]_l_leg")] Some <B>[species] feet</B>."
Collapse file

‎code/game/objects/effects/spawners/mystery_box.dm‎

Copy file name to clipboardExpand all lines: code/game/objects/effects/spawners/mystery_box.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
/datum/species/preternis/zombie
147147
name = "Low-Functioning Preternis"
148148
id = "preterniszombie"
149-
limbs_id = "preternis"
149+
limbs_id = SPECIES_PRETERNIS
150150
inherent_traits = list(TRAIT_NOBREATH, TRAIT_NOHUNGER, TRAIT_RADIMMUNE, TRAIT_MEDICALIGNORE, TRAIT_NO_BLOOD_REGEN, TRAIT_STABLELIVER, TRAIT_STABLEHEART, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE, TRAIT_FAKEDEATH, TRAIT_STUNIMMUNE, TRAIT_NODEATH)
151151
mutanthands = /obj/item/zombie_hand
152152
var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.