From 3a83b28bae941ccd0f62cc80c72a361e8e243ad2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 1 Oct 2017 10:42:31 -0400 Subject: [PATCH 1/2] Adds the Cargo-Tech-of-the-Shift award --- code/game/objects/items/storage/lockbox.dm | 8 +++++++ .../crates_lockers/closets/secure/cargo.dm | 20 ++++++++++++++++++ code/modules/clothing/under/accessories.dm | 10 +++++++++ icons/mob/accessories.dmi | Bin 8682 -> 8763 bytes icons/obj/clothing/accessories.dmi | Bin 8441 -> 8758 bytes 5 files changed, 38 insertions(+) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 385a069c00..50898e72e1 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -177,6 +177,14 @@ for(var/i in 1 to 3) new /obj/item/clothing/accessory/medal/silver/security(src) +/obj/item/storage/lockbox/medal/cargo + name = "cargo award box" + desc = "A locked box used to store awards to be given to members of the cargo department." + req_access = list(ACCESS_QM) + +/obj/item/storage/lockbox/medal/cargo/PopulateContents() + new /obj/item/clothing/accessory/medal/ribbon/cargo(src) + /obj/item/storage/lockbox/medal/sci name = "science medal box" desc = "A locked box used to store medals to be given to members of the science department." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 77723e3e41..46067b293b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -1,6 +1,7 @@ /obj/structure/closet/secure_closet/quartermaster name = "\proper quartermaster's locker" req_access = list(ACCESS_QM) +<<<<<<< HEAD icon_state = "qm" /obj/structure/closet/secure_closet/quartermaster/PopulateContents() @@ -17,3 +18,22 @@ new /obj/item/clothing/head/soft(src) new /obj/item/device/export_scanner(src) new /obj/item/door_remote/quartermaster(src) +======= + icon_state = "qm" + +/obj/structure/closet/secure_closet/quartermaster/PopulateContents() + ..() + new /obj/item/clothing/neck/cloak/qm(src) + new /obj/item/storage/lockbox/medal/cargo/(src) + new /obj/item/clothing/under/rank/cargo(src) + new /obj/item/clothing/shoes/sneakers/brown(src) + new /obj/item/device/radio/headset/headset_cargo(src) + new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/gloves/fingerless(src) + new /obj/item/device/megaphone/cargo(src) + new /obj/item/tank/internals/emergency_oxygen(src) + new /obj/item/clothing/mask/gas(src) + new /obj/item/clothing/head/soft(src) + new /obj/item/device/export_scanner(src) + new /obj/item/door_remote/quartermaster(src) +>>>>>>> bdec5d5... Merge pull request #31130 from MrDoomBringer/Doom diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 3e6a5ad371..c5e68ebcec 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -151,6 +151,16 @@ desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." icon_state = "bronze_heart" +/obj/item/clothing/accessory/medal/ribbon + name = "ribbon" + desc = "A ribbon" + icon_state = "cargo" + item_color = "cargo" + +/obj/item/clothing/accessory/medal/ribbon/cargo + name = "\"cargo tech of the shift\" award" + desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia." + /obj/item/clothing/accessory/medal/silver name = "silver medal" desc = "A silver medal." diff --git a/icons/mob/accessories.dmi b/icons/mob/accessories.dmi index 3e73083e3ed1e5ebea01eeb07a6b3916b500d411..8e3e48230f4df3db50651700122338b61d3e09e5 100644 GIT binary patch literal 8763 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 LD#MCpjD!9U0BVRG diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index c0756a9f73df046a9b386f5252e45b7073ec93dd..4c3c0fe5ce35afc54ee9b83b3795d76b2424d513 100644 GIT binary patch literal 8758 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 From f3ae038f6c9bb6dbb517e1fcdfbde876e72a5657 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Oct 2017 15:35:27 -0500 Subject: [PATCH 2/2] Update cargo.dm --- .../crates_lockers/closets/secure/cargo.dm | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 46067b293b..4e83a709b9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -1,24 +1,6 @@ -/obj/structure/closet/secure_closet/quartermaster - name = "\proper quartermaster's locker" +/obj/structure/closet/secure_closet/quartermaster + name = "\proper quartermaster's locker" req_access = list(ACCESS_QM) -<<<<<<< HEAD - icon_state = "qm" - -/obj/structure/closet/secure_closet/quartermaster/PopulateContents() - ..() - new /obj/item/clothing/neck/cloak/qm(src) - new /obj/item/clothing/under/rank/cargo(src) - new /obj/item/clothing/shoes/sneakers/brown(src) - new /obj/item/device/radio/headset/headset_cargo(src) - new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/clothing/gloves/fingerless(src) - new /obj/item/device/megaphone/cargo(src) - new /obj/item/tank/internals/emergency_oxygen(src) - new /obj/item/clothing/mask/gas(src) - new /obj/item/clothing/head/soft(src) - new /obj/item/device/export_scanner(src) - new /obj/item/door_remote/quartermaster(src) -======= icon_state = "qm" /obj/structure/closet/secure_closet/quartermaster/PopulateContents() @@ -36,4 +18,3 @@ new /obj/item/clothing/head/soft(src) new /obj/item/device/export_scanner(src) new /obj/item/door_remote/quartermaster(src) ->>>>>>> bdec5d5... Merge pull request #31130 from MrDoomBringer/Doom