Untagged Shell Records (#11374)

This commit is contained in:
Geeves
2021-03-15 22:36:36 +02:00
committed by GitHub
parent 06ba1a1f20
commit f1fd48c33e
5 changed files with 23 additions and 6 deletions
+1 -1
View File
@@ -148,7 +148,7 @@
age = H.age
fingerprint = md5(H.dna.uni_identity)
sex = H.gender
species = H.get_species()
species = H.get_species(FALSE, TRUE)
citizenship = H.citizenship
employer = H.employer_faction
religion = SSrecords.get_religion_record_name(H.religion)
@@ -862,13 +862,10 @@
dna.check_integrity(src)
return
/mob/living/carbon/human/get_species(var/reference = 0)
/mob/living/carbon/human/get_species(var/reference = FALSE, var/records = FALSE)
if(!species)
set_species()
if (reference)
return species
else
return species.name
return species.get_species(reference, src, records)
/mob/living/carbon/human/proc/play_xylophone()
if(!src.xylophone)
@@ -661,3 +661,9 @@
/datum/species/proc/is_naturally_insulated()
return FALSE
// the records var is so that untagged shells can appear human
/datum/species/proc/get_species(var/reference, var/mob/living/carbon/human/H, var/records)
if(reference)
return src
return name
@@ -78,6 +78,14 @@
allowed_accents = list(ACCENT_CETI, ACCENT_GIBSON, ACCENT_SOL, ACCENT_COC, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ELYRA, ACCENT_KONYAN, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_LUNA,
ACCENT_HIMEO, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_PHONG, ACCENT_SILVERSUN, ACCENT_TTS, ACCENT_EUROPA, ACCENT_EARTH)
/datum/species/machine/shell/get_species(var/reference, var/mob/living/carbon/human/H, var/records)
if(reference)
return src
// it's illegal for shells in Tau Ceti space to not have tags, so their records would have to be falsified
if(records && !H.internal_organs_by_name[BP_IPCTAG])
return "Human"
return name
/datum/species/machine/shell/get_light_color()
return
+6
View File
@@ -0,0 +1,6 @@
author: Geeves
delete-after: True
changes:
- tweak: "Untagged shells now appear as Human in their employment records."