diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index e29e08b937e..1c3776eb9ae 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -939,18 +939,7 @@ if(!ishuman(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.", confidential = TRUE) return - //let's keep it simple - //milk to plasmemes and skeletons, meat to lizards, electricity bars to ethereals, cookies to everyone else - var/cookiealt = /obj/item/food/cookie - if(isskeleton(H)) - cookiealt = /obj/item/reagent_containers/food/condiment/milk - else if(isplasmaman(H)) - cookiealt = /obj/item/reagent_containers/food/condiment/milk - else if(isethereal(H)) - cookiealt = /obj/item/food/energybar - else if(islizard(H)) - cookiealt = /obj/item/food/meat/slab - var/obj/item/new_item = new cookiealt(H) + var/obj/item/new_item = new H.dna.species.species_cookie(H) if(H.put_in_hands(new_item)) H.update_inv_hands() else diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c3f9e1de95c..4507ad5c5d3 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -211,6 +211,9 @@ GLOBAL_LIST_EMPTY(features_by_species) ///Bitflag that controls what in game ways something can select this species as a spawnable source, such as magic mirrors. See [mob defines][code/__DEFINES/mobs.dm] for possible sources. var/changesource_flags = NONE + ///Unique cookie given by admins through prayers + var/species_cookie = /obj/item/food/cookie + ///For custom overrides for species ass images var/icon/ass_image diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index e4a97328772..0e4176a5266 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -17,6 +17,7 @@ damage_overlay_type = "" //We are too cool for regular damage overlays species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR, FACEHAIR, HAS_FLESH, HAS_BONE) // i mean i guess they have blood so they can have wounds too changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + species_cookie = /obj/item/food/energybar species_language_holder = /datum/language_holder/ethereal sexes = FALSE //no fetish content allowed toxic_food = NONE 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 2e695aa2e84..9347f55f7d8 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -22,6 +22,7 @@ heatmod = 0.67 payday_modifier = 0.75 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + species_cookie = /obj/item/food/meat/slab attack_verb = "slash" attack_effect = ATTACK_EFFECT_CLAW attack_sound = 'sound/weapons/slash.ogg' diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 5d34c91b2b3..3f6cbc1fa79 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -31,6 +31,7 @@ disliked_food = FRUIT | CLOTH liked_food = VEGETABLES changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC + species_cookie = /obj/item/reagent_containers/food/condiment/milk outfit_important_for_life = /datum/outfit/plasmaman species_language_holder = /datum/language_holder/skeleton 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 302f06f052b..67b0712254e 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -36,6 +36,7 @@ wings_icons = list("Skeleton") //They can technically be in an ERT changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN + species_cookie = /obj/item/reagent_containers/food/condiment/milk species_language_holder = /datum/language_holder/skeleton bodypart_overrides = list(