From ecd50aaf71d152f935a0021372c7889d634c61bd Mon Sep 17 00:00:00 2001 From: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:50:11 +0200 Subject: [PATCH] Suggested stuff + security bomber jacket and renamed hard hats --- code/datums/supplypacks.dm | 2 +- code/game/machinery/vending.dm | 17 +++++++++-------- .../game/objects/items/weapons/vending_items.dm | 1 + code/modules/clothing/head/hardhat.dm | 3 +++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 3c5c3c5db07..a70a81bb285 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -910,7 +910,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/vending_refill/wallmed) containername = "medical vending crate" -/datum/supply_packs/medical/clothingvendor +/datum/supply_packs/medical/vending/clothingvendor name = "Medical Clothing Vendors Crate" cost = 20 contains = list(/obj/item/vending_refill/medidrobe, diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 30345c7d720..11f22adee40 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1796,8 +1796,9 @@ /obj/item/clothing/head/soft/sec = 4, /obj/item/clothing/head/soft/sec/corp = 4, /obj/item/clothing/suit/armor/secjacket = 4, + /obj/item/clothing/suit/jacket/pilot = 2, /obj/item/clothing/suit/hooded/wintercoat/security = 4, - /obj/item/clothing/gloves/color/black = 4, + /obj/item/clothing/gloves/color/black = 4, /obj/item/clothing/accessory/armband/sec = 6, /obj/item/clothing/shoes/laceup = 4, /obj/item/clothing/shoes/jackboots = 4, @@ -1833,7 +1834,7 @@ /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, /obj/item/reagent_containers/food/drinks/flask/detflask = 2, - /obj/item/storage/fancy/cigarettes/dromedaryco = 5) + /obj/item/storage/fancy/cigarettes/dromedaryco = 5) contraband = list(/obj/item/toy/figure/crew/detective = 1) refill_canister = /obj/item/vending_refill/detdrobe @@ -1843,18 +1844,18 @@ icon_state = "medidrobe" ads_list = list("Make those blood stains look fashionable!") vend_reply = "Thank you for using the MediDrobe!" - products = list(/obj/item/clothing/under/rank/medical/blue = 3, + products = list(/obj/item/clothing/under/rank/medical = 3, + /obj/item/clothing/under/rank/medical/skirt = 3, + /obj/item/clothing/under/rank/medical/blue = 3, /obj/item/clothing/under/rank/medical/green = 3, /obj/item/clothing/under/rank/medical/purple = 3, - /obj/item/clothing/under/rank/medical = 3, - /obj/item/clothing/under/rank/medical/skirt = 3, /obj/item/clothing/under/rank/nurse = 3, /obj/item/clothing/under/medigown = 3, + /obj/item/clothing/head/beret/med = 3, /obj/item/clothing/head/surgery/blue = 3, /obj/item/clothing/head/surgery/green = 3, /obj/item/clothing/head/surgery/purple = 3, /obj/item/clothing/head/nursehat = 3, - /obj/item/clothing/head/beret/med = 3, /obj/item/clothing/suit/hooded/wintercoat/medical = 3, /obj/item/clothing/suit/storage/fr_jacket = 3, /obj/item/clothing/suit/storage/labcoat = 3, @@ -2015,7 +2016,7 @@ /obj/item/clothing/head/hardhat/white = 2, /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/head/hardhat/dblue = 2, - /obj/item/clothing/gloves/color/black = 3, + /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/accessory/armband/engine = 3, /obj/item/clothing/shoes/laceup = 3, /obj/item/clothing/shoes/workboots = 3, @@ -2090,7 +2091,7 @@ icon_state = "hydrobe" ads_list = list("Do you love soil? Then buy our clothes!", "Get outfits to match your green thumb here!") vend_reply = "Thank you for using the HydroDrobe!" - products = list(/obj/item/clothing/under/rank/hydroponics = 3, + products = list(/obj/item/clothing/under/rank/hydroponics = 3, /obj/item/reagent_containers/glass/bucket = 3, /obj/item/clothing/suit/apron = 3, /obj/item/clothing/suit/apron/overalls = 3, diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index d4949b53679..4caab3fd918 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -178,6 +178,7 @@ /obj/item/vending_refill/genedrobe machine_name = "GeneDrobe" icon_state = "refill_clothes" + /obj/item/vending_refill/scidrobe machine_name = "SciDrobe" icon_state = "refill_clothes" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 95c4e04b3ac..a0e4e374aee 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -52,6 +52,7 @@ visible_message("[src]'s light fades and turns off.") /obj/item/clothing/head/hardhat/orange + name = "orange hard hat" icon_state = "hardhat0_orange" item_state = "hardhat0_orange" item_color = "orange" @@ -68,6 +69,7 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT /obj/item/clothing/head/hardhat/white + name = "white hard hat" icon_state = "hardhat0_white" item_state = "hardhat0_white" item_color = "white" @@ -79,6 +81,7 @@ dog_fashion = /datum/dog_fashion/head/hardhat /obj/item/clothing/head/hardhat/dblue + name = "blue hard hat" icon_state = "hardhat0_dblue" item_state = "hardhat0_dblue" item_color = "dblue"