Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[c] [PORT] Adds Defines for Species IDs #8071

Merged
merged 2 commits into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 60 additions & 19 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,66 @@
#define GIB_TYPE_HUMAN "human"
#define GIB_TYPE_ROBOTIC "robotic"

//Species ID defines
#define SPECIES_HUMAN "human"
#define SPECIES_IPC "ipc"
#define SPECIES_ETHEREAL "ethereal"
#define SPECIES_PLASMAMAN "plasmaman"
#define SPECIES_APID "apid"
#define SPECIES_MOTH "moth"
#define SPECIES_LIZARD "lizard"
#define SPECIES_ASHWALKER "ashlizard"
#define SPECIES_FELINID "felinid"
#define SPECIES_OOZELING "oozeling"
#define SPECIES_FLY "fly"
#define SPECIES_MONKEY "monkey"
#define SPECIES_JELLYPERSON "jelly"
#define SPECIES_SLIMEPERSON "slime"
#define SPECIES_LUMINESCENT "lum"
#define SPECIES_STARGAZER "stargazer"
#define SPECIES_ABDUCTOR "abductor"
#define SPECIES_SHADOWPERSON "shadow"
//Defines for Species IDs
#define SPECIES_ABDUCTOR "abductor"
#define SPECIES_ANDROID "android"
#define SPECIES_APID "apid"
#define SPECIES_DEBUG "debug"
#define SPECIES_DULLAHAN "dullahan"
#define SPECIES_ETHEREAL "ethereal"
#define SPECIES_FELINID "felinid"
#define SPECIES_FLY "fly"
#define SPECIES_HUMAN "human"
#define SPECIES_IPC "ipc"
#define SPECIES_JELLYPERSON "jelly"
#define SPECIES_LUMINESCENT "lum"
#define SPECIES_SLIMEPERSON "slime"
#define SPECIES_STARGAZER "stargazer"
#define SPECIES_LIZARD "lizard"
#define SPECIES_ASHWALKER "ashlizard"
#define SPECIES_MONKEY "monkey"
#define SPECIES_MOTH "moth"
#define SPECIES_OOZELING "oozeling"
#define SPECIES_PLASMAMAN "plasmaman"
#define SPECIES_PODPERSON "pod"
#define SPECIES_PUMPKINPERSON "pumpkin_man"
#define SPECIES_SHADOWPERSON "shadow"
#define SPECIES_SKELETON "skeleton"
#define SPECIES_SNAILPERSON "snail"
#define SPECIES_SUPERSOILDER "supersoldier"
#define SPECIES_VAMPIRE "vampire"

//Defines for Golem Species IDs
#define SPECIES_GOLEM_ADAMANTINE "adamantine_golem"
#define SPECIES_GOLEM_ALLOY "alloy_golem"
#define SPECIES_GOLEM_BANANIUM "bananium_golem"
#define SPECIES_GOLEM_BLUESPACE "bluespace_golem"
#define SPECIES_GOLEM_BONE "bone_golem"
#define SPECIES_GOLEM_BRONZE "bronze_golem"
#define SPECIES_GOLEM_CAPITALIST "capitalist_golem"
#define SPECIES_GOLEM_CARDBOARD "cardboard_golem"
#define SPECIES_GOLEM_CLOCKWORK "clockwork_golem"
#define SPECIES_GOLEM_CLOCKWORK_SERVANT "clockwork golem servant"
#define SPECIES_GOLEM_CLOTH "cloth_golem"
#define SPECIES_GOLEM_COPPER "copper_golem"
#define SPECIES_GOLEM_DIAMOND "diamond_golem"
#define SPECIES_GOLEM_DURATHREAD "durathread_golem"
#define SPECIES_GOLEM_GLASS "glass_golem"
#define SPECIES_GOLEM_GOLD "gold_golem"
#define SPECIES_GOLEM_IRON "iron_golem"
#define SPECIES_GOLEM_LEATHER "leather_golem"
#define SPECIES_GOLEM_PLASMA "plasma_golem"
#define SPECIES_GOLEM_PLASTEEL "plasteel_golem"
#define SPECIES_GOLEM_PLASTIC "plastic_golem"
#define SPECIES_GOLEM_PLASTITANIUM "plastitanium_golem"
#define SPECIES_GOLEM_RUNIC "cult_golem"
#define SPECIES_GOLEM_SAND "sand_golem"
#define SPECIES_GOLEM_SILVER "silver_golem"
#define SPECIES_GOLEM_SNOW "snow_golem"
#define SPECIES_GOLEM_SOVIET "soviet_golem"
#define SPECIES_GOLEM_TITANIUM "titanium_golem"
#define SPECIES_GOLEM_URANIUM "uranium_golem"
#define SPECIES_GOLEM_WOOD "wood_golem"

//Species bitflags, used for species_restricted. If this somehow ever gets above 23 Bee has larger problems.
#define FLAG_HUMAN (1<<0)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/species/debug
name = "CODER DISASTER"
id = "debug"
id = SPECIES_DEBUG
bodyflag = FLAG_DEBUG_SPECIES
changesource_flags = MIRROR_BADMIN
sexes = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/species/dullahan
name = "\improper Dullahan"
id = "dullahan"
id = SPECIES_DULLAHAN
max_bodypart_count = 5 //No head
default_color = "FFFFFF"
species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
Expand Down Expand Up @@ -73,7 +73,7 @@
/obj/item/organ/tongue/dullahan/handle_speech(datum/source, list/speech_args)
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(H.dna.species.id == "dullahan")
if(H.dna.species.id == SPECIES_DULLAHAN)
var/datum/species/dullahan/D = H.dna.species
if(isobj(D.myhead.loc))
var/obj/O = D.myhead.loc
Expand Down Expand Up @@ -103,7 +103,7 @@

if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(H.dna.species.id == "dullahan")
if(H.dna.species.id == SPECIES_DULLAHAN)
var/datum/species/dullahan/D = H.dna.species
D.update_vision_perspective(H)

Expand Down Expand Up @@ -133,7 +133,7 @@
/obj/item/dullahan_relay/Destroy()
if(!QDELETED(owner))
var/mob/living/carbon/human/H = owner
if(H.dna.species.id == "dullahan")
if(H.dna.species.id == SPECIES_DULLAHAN)
var/datum/species/dullahan/D = H.dna.species
D.myhead = null
owner.gib()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/datum/species/ethereal
name = "\improper Ethereal"
id = "ethereal"
id = SPECIES_ETHEREAL
attack_verb = "burn"
attack_sound = 'sound/weapons/etherealhit.ogg'
miss_sound = 'sound/weapons/etherealmiss.ogg'
Expand Down
Loading