From 3118b776067629d87993a3dd67c3f4ffa9cc4d42 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Tue, 5 Nov 2019 19:31:28 -0500 Subject: [PATCH] Revert "Navy Uniform Fix" This reverts commit 1119658377989a4a907c5ae61593a40d94b45d9b. --- _maps/map_files/cyberiad/z2.dmm | 4 ++ .../crates_lockers/closets/secure/security.dm | 3 ++ code/modules/clothing/under/miscellaneous.dm | 39 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index 757f86db381..684365ada39 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -8862,6 +8862,10 @@ pixel_y = 3 }, /obj/item/clothing/under/rank/centcom/officer, +/obj/item/clothing/under/rank/centcom/representative{ + pixel_x = 3; + pixel_y = -3 + }, /turf/unsimulated/floor{ tag = "icon-floor"; icon_state = "floor" 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 ace06e8eeed..f66987d544b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -260,6 +260,7 @@ new /obj/item/clothing/accessory/holster(src) new /obj/item/clothing/accessory/blue(src) new /obj/item/clothing/shoes/jackboots/jacksandals(src) + new /obj/item/clothing/under/rank/centcom/blueshield(src) /obj/structure/closet/secure_closet/ntrep @@ -284,6 +285,7 @@ new /obj/item/clothing/under/lawyer/oldman(src) new /obj/item/clothing/under/lawyer/black(src) new /obj/item/clothing/under/lawyer/female(src) + new /obj/item/clothing/under/rank/centcom/representative(src) new /obj/item/clothing/head/ntrep(src) new /obj/item/clothing/shoes/sandal/fancy(src) new /obj/item/storage/box/tapes(src) @@ -457,6 +459,7 @@ new /obj/item/clothing/gloves/color/white(src) new /obj/item/clothing/shoes/centcom(src) new /obj/item/clothing/under/suit_jacket/really_black(src) + new /obj/item/clothing/under/rank/centcom/magistrate(src) new /obj/item/clothing/suit/judgerobe(src) new /obj/item/clothing/head/powdered_wig(src) new /obj/item/gavelblock(src) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a164215ed6d..9e009014deb 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -112,6 +112,45 @@ item_color = "centcom" displays_id = 0 +/obj/item/clothing/under/rank/centcom/blueshield + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.S.S. Cyberiad\" on the left shoulder." + name = "\improper Nanotrasen Navy Uniform" + icon_state = "officer" + item_state = "g_suit" + item_color = "officer" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/rank/centcom/blueshield/New() + ..() + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears [station_name()] on the left shoulder." + +/obj/item/clothing/under/rank/centcom/representative + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shoulder." + name = "\improper Nanotrasen Navy Uniform" + icon_state = "officer" + item_state = "g_suit" + item_color = "officer" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/rank/centcom/representative/New() + ..() + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears [station_name()] on the left shoulder." + +/obj/item/clothing/under/rank/centcom/magistrate + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder." + name = "\improper Nanotrasen Navy Uniform" + icon_state = "officer" + item_state = "g_suit" + item_color = "officer" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/rank/centcom/magistrate/New() + ..() + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder." + /obj/item/clothing/under/rank/centcom/diplomatic desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps." name = "\improper Nanotrasen Diplomatic Uniform"