From 3853f34941d7d881dc629a1c335d31a39a3eac9e Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Wed, 3 Feb 2016 16:37:19 -0500 Subject: [PATCH] Makes the new security badges holobadges --- code/datums/supplypacks.dm | 8 +++--- .../crates_lockers/closets/secure/security.dm | 7 +++-- .../clothing/under/accessories/badges.dm | 28 ++++++++++++++----- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a7b9dc0309..6256888118 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1724,8 +1724,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/clothing/suit/storage/forensics/blue, /obj/item/clothing/under/det/corporate, /obj/item/clothing/under/det/corporate, - /obj/item/clothing/accessory/badge/detective, - /obj/item/clothing/accessory/badge/detective, + /obj/item/clothing/accessory/badge/holo/detective, + /obj/item/clothing/accessory/badge/holo/detective, /obj/item/clothing/gloves/black, /obj/item/clothing/gloves/black) cost = 20 @@ -1775,7 +1775,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/clothing/glasses/sunglasses/sechud, /obj/item/taperoll/police, /obj/item/device/hailer, - /obj/item/clothing/accessory/badge/warden, + /obj/item/clothing/accessory/badge/holo/warden, /obj/item/weapon/storage/box/flashbangs, /obj/item/weapon/storage/belt/security, /obj/item/weapon/reagent_containers/spray/pepper, @@ -1801,7 +1801,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/weapon/storage/belt/security, /obj/item/device/flash, /obj/item/device/hailer, - /obj/item/clothing/accessory/badge/hos, + /obj/item/clothing/accessory/badge/holo/hos, /obj/item/clothing/accessory/holster/waist, /obj/item/weapon/melee/telebaton, /obj/item/weapon/shield/riot/tele, 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 f5f36858fc..1a6005ba46 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -125,7 +125,8 @@ new /obj/item/taperoll/police(src) new /obj/item/weapon/shield/riot(src) new /obj/item/weapon/shield/riot/tele(src) - new /obj/item/clothing/accessory/badge/hos(src) + new /obj/item/weapon/storage/box/holobadge/hos(src) + new /obj/item/clothing/accessory/badge/holo/hos(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) @@ -169,7 +170,7 @@ new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) - new /obj/item/clothing/accessory/badge/warden(src) + new /obj/item/clothing/accessory/badge/holo/warden(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) @@ -277,7 +278,7 @@ new /obj/item/clothing/suit/storage/det_trench/grey(src) new /obj/item/clothing/suit/storage/forensics/blue(src) new /obj/item/clothing/suit/storage/forensics/red(src) - new /obj/item/clothing/accessory/badge/detective(src) + new /obj/item/clothing/accessory/badge/holo/detective(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/det(src) new /obj/item/clothing/head/det/grey(src) diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 2813ded7c0..b78b0ffac3 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -97,20 +97,34 @@ ..() return -/obj/item/clothing/accessory/badge/warden - name = "warden's badge" +/obj/item/clothing/accessory/badge/holo/warden + name = "warden's holobadge" desc = "A silver corporate security badge. Stamped with the words 'Warden.'" icon_state = "silverbadge" slot_flags = SLOT_TIE | SLOT_BELT -/obj/item/clothing/accessory/badge/hos - name = "head of security's badge" +/obj/item/clothing/accessory/badge/holo/hos + name = "head of security's holobadge" desc = "An immaculately polished gold security badge. Labeled 'Head of Security.'" icon_state = "goldbadge" slot_flags = SLOT_TIE | SLOT_BELT -/obj/item/clothing/accessory/badge/detective - name = "detective's badge" +/obj/item/clothing/accessory/badge/holo/detective + name = "detective's holobadge" desc = "An immaculately polished gold security badge on leather. Labeled 'Detective.'" icon_state = "marshalbadge" - slot_flags = SLOT_TIE | SLOT_BELT \ No newline at end of file + slot_flags = SLOT_TIE | SLOT_BELT + +/obj/item/weapon/storage/box/holobadge/hos + name = "holobadge box" + desc = "A box claiming to contain holobadges." + New() + new /obj/item/clothing/accessory/badge/holo(src) + new /obj/item/clothing/accessory/badge/holo(src) + new /obj/item/clothing/accessory/badge/holo/warden(src) + new /obj/item/clothing/accessory/badge/holo/detective(src) + new /obj/item/clothing/accessory/badge/holo/detective(src) + new /obj/item/clothing/accessory/badge/holo/hos(src) + new /obj/item/clothing/accessory/badge/holo/cord(src) + ..() + return \ No newline at end of file