diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 36f3af4ae7e..e492278752b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -99,13 +99,15 @@ inhand_icon_state = "det_hat" var/candy_cooldown = 0 dog_fashion = /datum/dog_fashion/head/detective + ///Path for the flask that spawns inside their hat roundstart + var/flask_path = /obj/item/reagent_containers/cup/glass/flask/det /obj/item/clothing/head/fedora/det_hat/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/fedora/detective) - new /obj/item/reagent_containers/cup/glass/flask/det(src) + new flask_path(src) /obj/item/clothing/head/fedora/det_hat/examine(mob/user) . = ..() @@ -123,6 +125,9 @@ else to_chat(user, span_warning("You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")) +/obj/item/clothing/head/fedora/det_hat/minor + flask_path = /obj/item/reagent_containers/cup/glass/flask/det/minor + //Mime /obj/item/clothing/head/beret name = "beret" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 45db504a997..46bdb3275b2 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -74,6 +74,12 @@ ) implants = list(/obj/item/implant/mindshield) +/datum/outfit/job/detective/pre_equip(mob/living/carbon/human/human, visualsOnly = FALSE) + . = ..() + if (human.age < AGE_MINOR) + mask = /obj/item/clothing/mask/cigarette/candy + head = /obj/item/clothing/head/fedora/det_hat/minor + /datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() var/obj/item/clothing/mask/cigarette/cig = H.wear_mask diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm index e770626aaf9..1a364c5b9a8 100644 --- a/code/modules/reagents/reagent_containers/cups/drinks.dm +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -463,6 +463,9 @@ icon_state = "detflask" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30) +/obj/item/reagent_containers/cup/glass/flask/det/minor + list_reagents = list(/datum/reagent/consumable/applejuice = 30) + /obj/item/reagent_containers/cup/glass/mug/britcup name = "cup" desc = "A cup with the british flag emblazoned on it." diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 70cab079d93..8e9f624caaa 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -557,7 +557,8 @@ /obj/item/clothing/glasses/regular/kim = 1, /obj/item/reagent_containers/cup/glass/flask/det = 2, /obj/item/storage/fancy/cigarettes = 5, - ) + /obj/item/storage/fancy/cigarettes/cigpack_candy = 5, + ) premium = list( /obj/item/clothing/head/flatcap = 1, )