mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +01:00
[MIRROR] Minor detectives spawn with a candy cigarette and apple juice filled flask [MDB IGNORE] (#18564)
* Minor detectives spawn with a candy cigarette and apple juice filled flask (#72422) If a detective joins who is 20 or younger their cigarette is changed for a candy one and their flask is filled with apple juice. Also adds candy cigarettes' to the detective vendor. Minor crew members are unable to use cigarette vendors or acquire alcohol in game without effectively committing a crime, it doesn't make sense for minor detectives to spawn with them. I also think that minor characters trying to obtain narcotics can be a pretty entertaining RP starter as a overall harmless crime and something that requires interaction with other members of the crew. * Minor detectives spawn with a candy cigarette and apple juice filled flask Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user