diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index d8b4d6906a4..a604e2359f6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -35,6 +35,7 @@ new /obj/item/clothing/head/beret/eng(src) new /obj/item/weapon/door_remote/chief_engineer(src) new /obj/item/weapon/rpd(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/ce(src) /obj/structure/closet/secure_closet/engineering_electrical diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 2805d0c0c51..7a2db96cf4a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -173,6 +173,7 @@ new /obj/item/weapon/reagent_containers/hypospray/CMO(src) new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src) new /obj/item/weapon/door_remote/chief_medical_officer(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/cmo(src) /obj/structure/closet/secure_closet/animal diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 7e1b6d83091..7868ceb3e41 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -71,6 +71,7 @@ new /obj/item/device/flash(src) new /obj/item/device/laser_pointer(src) new /obj/item/weapon/door_remote/research_director(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/rd(src) /obj/structure/closet/secure_closet/research_reagents diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 36ff8dc2455..58efbfe9790 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -31,6 +31,7 @@ new /obj/item/weapon/storage/belt/rapier(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/door_remote/captain(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/cap(src) /obj/structure/closet/secure_closet/hop @@ -56,6 +57,7 @@ new /obj/item/device/flash(src) new /obj/item/clothing/accessory/petcollar(src) new /obj/item/weapon/door_remote/civillian(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/hop(src) /obj/structure/closet/secure_closet/hop2 @@ -120,6 +122,7 @@ new /obj/item/taperoll/police(src) new /obj/item/weapon/gun/energy/gun/hos(src) new /obj/item/weapon/door_remote/head_of_security(src) + new /obj/item/weapon/reagent_containers/food/drinks/mug/hos(src) /obj/structure/closet/secure_closet/warden diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index 0fb6591aa29..a319028bfcc 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -80,13 +80,53 @@ path = /obj/item/weapon/cartridge/mob_hunt_game cost = 2 +////////////////////// +// Mugs // +////////////////////// + /datum/gear/mug display_name = "random coffee mug" description = "A randomly colored coffee mug. You'll need to supply your own beverage though." path = /obj/item/weapon/reagent_containers/food/drinks/mug + sort_category = "Mugs" /datum/gear/novelty_mug display_name = "novelty coffee mug" description = "A random novelty coffee mug. You'll need to supply your own beverage though." path = /obj/item/weapon/reagent_containers/food/drinks/mug/novelty - cost = 2 \ No newline at end of file + cost = 2 + sort_category = "Mugs" + +/datum/gear/mug/department + subtype_path = /datum/gear/mug/department + sort_category = "Mugs" + subtype_cost_overlap = FALSE + +/datum/gear/mug/department/eng + display_name = "engineer coffee mug" + description = "An engineer's coffee mug, emblazoned in the colors of the Engineering department." + allowed_roles = list("Chief Engineer", "Station Engineer", "Mechanic", "Life Support Specialist") + path = /obj/item/weapon/reagent_containers/food/drinks/mug/eng + +/datum/gear/mug/department/med + display_name = "doctor coffee mug" + description = "A doctor's coffee mug, emblazoned in the colors of the Medical department." + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") + path = /obj/item/weapon/reagent_containers/food/drinks/mug/med + +/datum/gear/mug/department/sci + display_name = "scientist coffee mug" + description = "A scientist's coffee mug, emblazoned in the colors of the Science department." + allowed_roles = list("Research Director", "Scientist", "Roboticist") + path = /obj/item/weapon/reagent_containers/food/drinks/mug/sci + +/datum/gear/mug/department/sec + display_name = "officer coffee mug" + description = "An officer's coffee mug, emblazoned in the colors of the Security department." + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot", "Brig Physician", "Internal Affairs Agent") + path = /obj/item/weapon/reagent_containers/food/drinks/mug/sec + +/datum/gear/mug/department/serv + display_name = "crewmember coffee mug" + description = "A crewmember's coffee mug, emblazoned in the colors of the Service department." + path = /obj/item/weapon/reagent_containers/food/drinks/mug/serv diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm index 25a1c133f86..083f9add109 100644 --- a/code/modules/food_and_drinks/drinks/drinks/mugs.dm +++ b/code/modules/food_and_drinks/drinks/drinks/mugs.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/mugs.dmi' icon_state = "mug" var/novelty = FALSE + var/preset = FALSE /obj/item/weapon/reagent_containers/food/drinks/mug/novelty name = "novelty coffee mug" @@ -13,6 +14,8 @@ /obj/item/weapon/reagent_containers/food/drinks/mug/New() ..() + if(preset) + return if(novelty) var/novelty_select = pick("peace", "fire", "best", "worst", "insult", "pda", "rad", "tide", "happy", "pills", "rainbow") switch(novelty_select) @@ -68,4 +71,68 @@ else icon_state = pick("mug_black", "mug_white", "mug_red", "mug_blue", "mug_green", "mug_pink") +/obj/item/weapon/reagent_containers/food/drinks/mug/eng + name = "engineer's mug" + desc = "A mug engineered to hold your beverage... IN SPACE!" + icon_state = "mug_eng" + preset = TRUE +/obj/item/weapon/reagent_containers/food/drinks/mug/med + name = "doctor's mug" + desc = "A mug that can hold the cure for what ails you!" + icon_state = "mug_med" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/sci + name = "scientist's mug" + desc = "Nothing fuels research like a coffee mug... or grant money!" + icon_state = "mug_sci" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/sec + name = "officer's mug" + desc = "The perfect partner for a sprinkled donut or stunbaton!" + icon_state = "mug_sec" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/serv + name = "crewmember's mug" + desc = "Serve your thirst better than you serve the rest of the crew!" + icon_state = "mug_serv" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/ce + name = "chief engineer's mug" + desc = "Broken and welded back together countless times, just like the station! Probably microwave safe." + icon_state = "mug_ce" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/hos + name = "head of security's mug" + desc = "If only your officers were as robust as this coffee's flavor!" + icon_state = "mug_hos" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/rd + name = "research director's mug" + desc = "Energy tech level: 99" + icon_state = "mug_rd" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/cmo + name = "chief medical officer's mug" + desc = "Fill it with something to keep you awake while you try to keep the crew alive." + icon_state = "mug_cmo" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/hop + name = "head of personnel's mug" + desc = "Are the stains on the bottom coffee or ink?" + icon_state = "mug_hop" + preset = TRUE + +/obj/item/weapon/reagent_containers/food/drinks/mug/cap + name = "captain's mug" + desc = "An inscription on the side reads \"Best Captain 2559\"... The last time the station had a worthy captain." + icon_state = "mug_cap" + preset = TRUE diff --git a/icons/obj/mugs.dmi b/icons/obj/mugs.dmi index ec248991c50..4a3441ec8ce 100644 Binary files a/icons/obj/mugs.dmi and b/icons/obj/mugs.dmi differ