diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 7eec46eb2f0..b5b38efc698 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -192,6 +192,8 @@ /obj/item/storage/lockbox/medal/med/PopulateContents() new /obj/item/clothing/accessory/medal/med_medal(src) new /obj/item/clothing/accessory/medal/med_medal2(src) + for(var/i in 1 to 3) + new /obj/item/clothing/accessory/medal/silver/emergency_services/medical(src) /obj/item/storage/lockbox/medal/sec/PopulateContents() for(var/i in 1 to 3) @@ -222,6 +224,16 @@ for(var/i in 1 to 3) new /obj/item/clothing/accessory/medal/plasma/nobel_science(src) +/obj/item/storage/lockbox/medal/engineering + name = "engineering medal box" + desc = "A locked box used to store awards to be given to members of the engineering department." + req_access = list(ACCESS_CE) + +/obj/item/storage/lockbox/medal/engineering/PopulateContents() + for(var/i in 1 to 3) + new /obj/item/clothing/accessory/medal/silver/emergency_services/engineering(src) + new /obj/item/clothing/accessory/medal/silver/elder_atmosian(src) + /obj/item/storage/lockbox/order name = "order lockbox" desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you." 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 88bbff40340..556230808bc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -13,7 +13,7 @@ new /obj/item/holosign_creator/atmos(src) new /obj/item/assembly/flash/handheld(src) new /obj/item/door_remote/chief_engineer(src) - + new /obj/item/storage/lockbox/medal/engineering(src) new /obj/item/circuitboard/machine/techfab/department/engineering(src) new /obj/item/extinguisher/advanced(src) new /obj/item/storage/photo_album/ce(src) diff --git a/code/modules/clothing/under/accessories/medals.dm b/code/modules/clothing/under/accessories/medals.dm index 90db5198ee6..cc91e286e2c 100644 --- a/code/modules/clothing/under/accessories/medals.dm +++ b/code/modules/clothing/under/accessories/medals.dm @@ -178,3 +178,29 @@ /obj/item/clothing/accessory/medal/plasma/nobel_science name = "nobel sciences award" desc = "A plasma medal which represents significant contributions to the field of science or engineering." + +/obj/item/clothing/accessory/medal/silver/emergency_services + name = "emergency services award" + desc = "A silver medal awarded to the outstanding emergency service workers of Nanotrasen, those who work tirelessly together through adversity to keep their crew safe and breathing in the harsh environments of outer space." + icon_state = "emergencyservices" + + /// Flavor text that is appended to the description. + var/insignia_desc = null + +/obj/item/clothing/accessory/medal/silver/emergency_services/Initialize(mapload) + . = ..() + if(istext(insignia_desc)) + desc += " [insignia_desc]" + +/obj/item/clothing/accessory/medal/silver/emergency_services/engineering + icon_state = "emergencyservices_engi" + insignia_desc = "The back of the medal bears an orange wrench." + +/obj/item/clothing/accessory/medal/silver/emergency_services/medical + icon_state = "emergencyservices_med" + insignia_desc = "The back of the medal bears a dark blue cross." + +/obj/item/clothing/accessory/medal/silver/elder_atmosian + name = "atmospheric mastery award" + desc = "Often referred to as the \"elder atmosian\" award, this medal is awarded to the exemplary scientists and technicians who push the boundaries and demonstrate mastery of atmospherics." + icon_state = "elderatmosian" diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 389cffe7cf2..2c6bf510724 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index 2711333118a..fdba37254eb 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ