From 31bd9104bb0d88e08e317b1e2b41b79d49df65e7 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 13 Jul 2019 06:42:09 +0200 Subject: [PATCH] Ports "Adds blueshirt items to sectech and defines them better." --- code/modules/clothing/head/helmet.dm | 2 ++ code/modules/clothing/suits/armor.dm | 4 +++- code/modules/clothing/under/jobs/security.dm | 1 + code/modules/vending/security.dm | 9 +++++++-- modular_citadel/code/game/machinery/vending.dm | 8 ++------ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8ffcc6eea7..f4b4e4a96d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -54,6 +54,8 @@ tint = 2 /obj/item/clothing/head/helmet/blueshirt + name = "blue helmet" + desc = "A reliable, blue tinted helmet reminding you that you still owe that engineer a beer." icon_state = "blueshift" item_state = "blueshift" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index eb30488999..5eec159462 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -37,6 +37,8 @@ slowdown = 1 /obj/item/clothing/suit/armor/vest/blueshirt + name = "large armor vest" + desc = "A large, yet comfortable piece of armor, protecting you from some threats." icon_state = "blueshift" item_state = "blueshift" @@ -59,7 +61,7 @@ flags_inv = 0 strip_delay = 80 unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak") - + /obj/item/clothing/suit/armor/vest/warden name = "warden's jacket" desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets." diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index b8858fdf1a..6f9e77b09f 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -142,6 +142,7 @@ */ /obj/item/clothing/under/rank/security/blueshirt + name = "blue shirt and tie" desc = "I'm a little busy right now, Calhoun." icon_state = "blueshift" item_state = "blueshift" diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 7e90a5ce18..aaa1cf3b6f 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -14,8 +14,13 @@ /obj/item/flashlight/seclite = 4, /obj/item/restraints/legcuffs/bola/energy = 7) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, - /obj/item/storage/fancy/donut_box = 2) - premium = list(/obj/item/coin/antagtoken = 1) + /obj/item/storage/fancy/donut_box = 2, + /obj/item/ssword_kit = 1) + premium = list(/obj/item/coin/antagtoken = 1, + /obj/item/clothing/head/helmet/blueshirt = 1, + /obj/item/clothing/suit/armor/vest/blueshirt = 1, + /obj/item/clothing/under/rank/security/blueshirt = 1, + /obj/item/ssword_kit = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index bdca91b0e6..12c29f7d98 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -1,7 +1,3 @@ -/obj/machinery/vending/security - contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/ssword_kit = 1) - premium = list(/obj/item/coin/antagtoken = 1, /obj/item/ssword_kit = 1) - /obj/machinery/vending/medical products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, @@ -27,11 +23,11 @@ /obj/item/storage/hypospraykit/o2 = 2, /obj/item/storage/hypospraykit/brute = 2, /obj/item/reagent_containers/glass/bottle/vial/small = 5) - + /obj/machinery/vending/wardrobe/chap_wardrobe premium = list(/obj/item/toy/plush/plushvar = 1, /obj/item/toy/plush/narplush = 1) - + #define STANDARD_CHARGE 1 #define CONTRABAND_CHARGE 2 #define COIN_CHARGE 3