diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 2f03c257af..a7b9dc0309 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1724,6 +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/gloves/black, /obj/item/clothing/gloves/black) cost = 20 @@ -1738,6 +1740,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/clothing/head/helmet, /obj/item/weapon/cartridge/security, /obj/item/clothing/accessory/badge/holo, + /obj/item/clothing/accessory/badge/holo/cord, /obj/item/device/radio/headset/headset_sec, /obj/item/weapon/storage/belt/security, /obj/item/device/flash, @@ -1772,6 +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/weapon/storage/box/flashbangs, /obj/item/weapon/storage/belt/security, /obj/item/weapon/reagent_containers/spray/pepper, @@ -1797,6 +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/holster/waist, /obj/item/weapon/melee/telebaton, /obj/item/weapon/shield/riot/tele, diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 297ac1d4b1..f794e7a6a3 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -93,3 +93,19 @@ New() ..() new /obj/item/weapon/grenade/flashbang/clusterbang(src) + +/obj/item/weapon/storage/lockbox/medal + name = "lockbox of medals" + desc = "A lockbox filled with commemorative medals, it has the NanoTrasen logo stamped on it." + req_access = list(access_heads) + storage_slots = 7 + + New() + ..() + new /obj/item/clothing/accessory/medal/conduct(src) + new /obj/item/clothing/accessory/medal/bronze_heart(src) + new /obj/item/clothing/accessory/medal/nobel_science(src) + new /obj/item/clothing/accessory/medal/silver/valor(src) + new /obj/item/clothing/accessory/medal/silver/security(src) + new /obj/item/clothing/accessory/medal/gold/captain(src) + new /obj/item/clothing/accessory/medal/gold/heroism(src) \ No newline at end of file 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 7e74224156..f5f36858fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -23,6 +23,7 @@ new /obj/item/clothing/suit/storage/vest(src) new /obj/item/weapon/cartridge/captain(src) new /obj/item/clothing/head/helmet/swat(src) + new /obj/item/weapon/storage/lockbox/medal(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/heads/captain(src) new /obj/item/device/radio/headset/heads/captain/alt(src) @@ -124,6 +125,7 @@ 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/flashbangs(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) @@ -167,6 +169,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/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) @@ -274,6 +277,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/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/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 51cbe7baa4..3725fccd30 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -179,7 +179,7 @@ /obj/item/clothing/accessory/medal/gold/heroism name = "medal of exceptional heroism" - desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." + desc = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff." //Scarves diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 7c605bbcf3..2813ded7c0 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -48,7 +48,7 @@ /obj/item/clothing/accessory/badge/holo/cord icon_state = "holobadge-cord" - slot_flags = SLOT_MASK | SLOT_TIE + slot_flags = SLOT_MASK | SLOT_TIE | SLOT_BELT /obj/item/clothing/accessory/badge/holo/attack_self(mob/user as mob) if(!stored_name) @@ -96,3 +96,21 @@ new /obj/item/clothing/accessory/badge/holo/cord(src) ..() return + +/obj/item/clothing/accessory/badge/warden + name = "warden's badge" + 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" + 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" + 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 diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 3c2ebe91d5..af2de326ab 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index be0cee0f05..2222f74a78 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 216b454d7b..cc09803419 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ