diff --git a/_maps/configs/independent_shetland.json b/_maps/configs/independent_shetland.json index a1d88413bc18..3923bed47db5 100644 --- a/_maps/configs/independent_shetland.json +++ b/_maps/configs/independent_shetland.json @@ -22,11 +22,6 @@ "officer": true, "slots": 1 }, - "Lieutenant": { - "outfit": "/datum/outfit/job/lieutenant", - "officer": true, - "slots": 1 - }, "First Mate": { "outfit": "/datum/outfit/job/head_of_personnel", "officer": true, diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 67d686bd4faa..4bdc4813bf69 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -641,7 +641,6 @@ /obj/item/clothing/head/beret/hop, /obj/item/radio/headset/heads/head_of_personnel, /obj/item/clothing/glasses/sunglasses/big, -/obj/item/clothing/suit/toggle/lieutenant, /obj/item/clothing/suit/toggle/lawyer/burgundy, /obj/item/clothing/suit/toggle/lawyer/navy, /obj/item/clothing/head/hopcap, diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 062e8a8f61f3..68fcd724dc7b 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -64,7 +64,6 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/effect/landmark/start/lieutenant, /turf/open/floor/plasteel/dark, /area/ship/bridge) "aG" = ( @@ -1240,18 +1239,21 @@ /obj/machinery/button/door{ id = "amogusdoors"; name = "Blast Door Control"; - pixel_x = 5; - pixel_y = 5 + pixel_x = 6; + pixel_y = 7 }, /obj/structure/table/reinforced, /obj/machinery/button/door{ id = "amoguswindows"; name = "Window Lockdown"; - pixel_x = -5; - pixel_y = -5 + pixel_x = -7; + pixel_y = 7 }, /obj/effect/turf_decal/corner/opaque/neutral/half, /obj/item/radio/intercom/directional/north, +/obj/item/phone{ + pixel_y = -4 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "mG" = ( @@ -1395,16 +1397,22 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/port) "oB" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{ - dir = 4 - }, -/obj/item/phone, -/obj/item/megaphone/command{ - pixel_x = 10 - }, /obj/machinery/airalarm/directional/south, -/turf/open/floor/plasteel/dark, +/obj/structure/closet/secure_closet{ + icon_state = "hop"; + name = "\proper first officer's locker"; + req_access_txt = "57" + }, +/obj/item/clothing/under/rank/command/head_of_personnel, +/obj/item/clothing/under/rank/command/head_of_personnel/skirt, +/obj/item/clothing/suit/armor/vest/hop, +/obj/item/clothing/head/beret/hop, +/obj/item/gun/energy/e_gun/mini, +/obj/item/clothing/shoes/laceup, +/obj/item/radio/headset/headset_com/alt, +/obj/item/storage/box/ids, +/obj/item/storage/briefcase, +/turf/open/floor/carpet/blue, /area/ship/bridge) "oC" = ( /obj/structure/cable{ @@ -1615,15 +1623,18 @@ "qE" = ( /obj/machinery/light/small/directional/south, /obj/structure/table/reinforced, -/obj/effect/turf_decal/corner/opaque/neutral/half{ - dir = 1 - }, /obj/item/paper_bin, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, +/obj/item/megaphone/command{ + pixel_x = 10 + }, +/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "qJ" = ( @@ -3621,11 +3632,22 @@ icon_state = "0-2" }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/closet/secure_closet/true_lieutenant, /obj/machinery/light_switch{ pixel_x = 11; pixel_y = 23 }, +/obj/structure/closet/secure_closet{ + icon_state = "cap"; + name = "\proper captain's locker"; + req_access_txt = "20" + }, +/obj/item/clothing/under/rank/command/captain/suit, +/obj/item/clothing/under/rank/command/captain/skirt, +/obj/item/storage/backpack/captain, +/obj/item/radio/headset/heads/captain/alt, +/obj/item/clothing/gloves/color/captain, +/obj/item/gun/energy/e_gun, +/obj/item/clothing/shoes/laceup, /turf/open/floor/carpet/blue, /area/ship/bridge) "KN" = ( @@ -4063,12 +4085,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/ship/medical) -"OD" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/ship/bridge) "OE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -6769,9 +6785,9 @@ dl LL TY Ft -OD +aw Lr -OD +aw xq TY LL diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm index c91299ae62ba..4ee6ad18467c 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm @@ -1095,10 +1095,6 @@ /obj/item/clothing/suit/hooded/wintercoat/captain, /obj/item/clothing/under/rank/command/captain/nt, /obj/item/clothing/under/rank/command/captain/nt/skirt, -/obj/item/clothing/suit/toggle/lieutenant{ - desc = "Threadbare and uncharacteristically casual for Nanotrasen. Probably rebadged surplus from some colonial militia."; - name = "tattered captain's jacket" - }, /obj/item/clothing/shoes/laceup, /obj/item/clothing/head/caphat/nt, /obj/item/stock_parts/cell/gun, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm index 1f0322ae6a5c..39fb0590bc12 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm @@ -3391,10 +3391,6 @@ /obj/item/clothing/under/rank/command/captain/nt, /obj/item/clothing/head/caphat/nt, /obj/item/clothing/shoes/laceup, -/obj/item/clothing/suit/toggle/lieutenant{ - desc = "Threadbare and uncharacteristically casual for Nanotrasen. Probably rebadged surplus from some colonial militia."; - name = "tattered captain's jacket" - }, /obj/item/clothing/glasses/sunglasses, /obj/effect/turf_decal/borderfloor{ dir = 1 diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 740397c662ad..576f6ac4b2ad 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -4337,7 +4337,6 @@ /obj/item/clothing/under/rank/security/officer/military/eng, /obj/item/clothing/suit/jacket/leather/duster, /obj/item/clothing/suit/jacket/miljacket, -/obj/item/clothing/head/beret/lt, /obj/item/clothing/mask/bandana/skull, /obj/item/clothing/suit/armor/vest/marine, /obj/item/instrument/piano_synth/headphones/spacepods{ @@ -9392,7 +9391,6 @@ /obj/item/clothing/under/rank/security/officer/military/eng, /obj/item/clothing/suit/jacket/leather/duster, /obj/item/clothing/suit/jacket/miljacket, -/obj/item/clothing/head/beret/lt, /obj/item/clothing/suit/armor/vest/marine, /obj/item/instrument/piano_synth/headphones/spacepods{ pixel_x = -5; diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 58d4fdb918a3..c8df06b6bd75 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -3009,7 +3009,6 @@ /obj/item/clothing/shoes/jackboots, /obj/item/clothing/suit/jacket/miljacket, /obj/item/clothing/suit/jacket/leather/duster/command, -/obj/item/clothing/head/beret/lt, /obj/item/storage/backpack/messenger/com, /obj/item/storage/backpack/satchel/cap, /obj/item/storage/backpack/captain, diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 8ef68e3bfd0b..19d092156405 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -117,16 +117,6 @@ max_items = 2 max_w_class = WEIGHT_CLASS_BULKY -/datum/component/storage/concrete/pockets/holster/lt/Initialize() - original_parent = parent - . = ..() - can_hold = typecacheof(list( - /obj/item/gun/energy/e_gun/adv_stopping, - /obj/item/gun/energy/e_gun/mini, - /obj/item/gun/energy/disabler, - /obj/item/stock_parts/cell/gun - )) - /datum/component/storage/concrete/pockets/holster/nukie/Initialize() original_parent = parent . = ..() diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 00dfda5879f5..c8332e1dd0cd 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -219,10 +219,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Brig Physician" icon_state = "Brig Physician" -/obj/effect/landmark/start/lieutenant - name = "SolGov Representative" //WS Edit - SolGov Rep - icon_state = "SolGov Representative" //WS Edit - SolGov Rep - //Department Security spawns /obj/effect/landmark/start/depsec diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 3b2d44d9d838..37613679e628 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -239,8 +239,3 @@ name = "brig physician PDA" default_cartridge = /obj/item/cartridge/medical icon_state = "pda-brig_phys" - -/obj/item/pda/lieutenant - name = "lieutenant PDA" - default_cartridge = /obj/item/cartridge/hos - icon_state = "pda-h" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e37cd1859094..36b1090fd7e0 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -411,20 +411,6 @@ GLOBAL_LIST_INIT(channel_tokens, list( desc = "A headset allowing the wearer to communicate with medbay and service." icon_state = "med_headset" -/obj/item/radio/headset/heads/lieutenant - name = "lieutenant's headset" - desc = "A lieutenant's headset." - icon_state = "com_headset" - -/obj/item/radio/headset/heads/lieutenant/alt - name = "lieutenant's bowman headset" - desc = "A lieutenant's headset. Protects ears from flashbangs." - icon_state = "com_headset_alt" - -/obj/item/radio/headset/heads/lieutenant/alt/ComponentInitialize() - . = ..() - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - /obj/item/radio/headset/heads/rd name = "\proper the research director's headset" desc = "Headset of the fellow who keeps society marching towards technological singularity." 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 27a9e423110b..66b803e7d041 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -378,43 +378,3 @@ new /obj/item/clothing/suit/toggle/labcoat/brig_phys(src) new /obj/item/clothing/suit/armor/vest/security/brig_phys(src) new /obj/item/clothing/head/beret/sec/brig_phys(src) - -/obj/structure/closet/secure_closet/lieutenant - name = "SolGov official's locker" - req_access = list(ACCESS_SOLGOV) - icon_state = "solgov" - -/obj/structure/closet/secure_closet/lieutenant/PopulateContents() - ..() - new /obj/item/clothing/head/beret/solgov(src) - new /obj/item/storage/briefcase(src) - new /obj/item/storage/firstaid/regular(src) - new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/suit/armor/vest/bulletproof/solgov(src) - new /obj/item/clothing/suit/armor/solgov_trenchcoat(src) - new /obj/item/clothing/accessory/waistcoat/solgov(src) - new /obj/item/clothing/shoes/laceup(src) - -/obj/structure/closet/secure_closet/true_lieutenant - name = "\proper lieutenant's locker" - req_access = list(ACCESS_HEADS) - icon_state = "blueshield" - -/obj/structure/closet/secure_closet/true_lieutenant/PopulateContents() - ..() - new /obj/item/clothing/head/beret/lt(src) - new /obj/item/storage/briefcase(src) - new /obj/item/storage/firstaid/regular(src) - new /obj/item/storage/belt/security/full(src) - new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/suit/armor/vest/lieutenant(src) - new /obj/item/clothing/suit/toggle/lieutenant(src) - new /obj/item/clothing/suit/armor/lieutenant_trenchcoat(src) - new /obj/item/clothing/accessory/holster/lieutenant(src) - new /obj/item/clothing/shoes/jackboots(src) - new /obj/item/clothing/head/beret/lt(src) - new /obj/item/clothing/head/beret/black(src) - new /obj/item/clothing/under/rank/command(src) - new /obj/item/clothing/under/rank/command/skirt(src) - new /obj/item/clothing/under/rank/command/nt(src) - new /obj/item/clothing/under/rank/command/nt/skirt(src) diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 63553ca12af7..7f83603e7f01 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -189,12 +189,6 @@ armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25) strip_delay = 90 -/obj/item/clothing/head/beret/lt - name = "officer beret" - desc = "A showy lieutenants's beret. Smells of spilled coffee and crushed dreams." - icon_state = "beret_com" - armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 10, "rad" = 10, "bio" = 5, "rad" = 5, "fire" = 5, "rad" = 30) - // SolGov /obj/item/clothing/head/beret/solgov diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index eb994b528c6b..ba38a4a9240b 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -212,12 +212,6 @@ mask = /obj/item/clothing/mask/gas/clown_hat gloves = /obj/item/clothing/gloves/color/plasmaman/clown -/datum/outfit/plasmaman/lieutenant //WS edit plasmaman customization - name = "Lt. Plasma" - head = /obj/item/clothing/head/helmet/space/plasmaman/security/lieutenant - uniform = /obj/item/clothing/under/plasmaman/lieutenant - gloves = /obj/item/clothing/gloves/combat - /datum/outfit/plasmaman/solgov //WS edit sgr name = "Plasmasolgov" head = /obj/item/clothing/head/helmet/space/plasmaman/solgov diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 82ad3aae38d6..db8c198ec06d 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -382,35 +382,6 @@ W.registered_name = H.real_name W.update_label() -/datum/outfit/job/lieutenant - name = "Lieutenant" - job_icon = "lieutenant" - //jobtype = /datum/job/lieutenant - - id = /obj/item/card/id/silver - head = /obj/item/clothing/head/beret/lt - uniform = /obj/item/clothing/under/rank/command - alt_uniform = /obj/item/clothing/under/rank/command - suit = /obj/item/clothing/suit/toggle/lieutenant - alt_suit = /obj/item/clothing/suit/armor/lieutenant_trenchcoat - dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/jackboots - ears = /obj/item/radio/headset/heads/lieutenant/alt - glasses = /obj/item/clothing/glasses/hud/health/sunglasses - belt = /obj/item/pda/lieutenant - - implants = list(/obj/item/implant/mindshield) - - backpack = /obj/item/storage/backpack/security - satchel = /obj/item/storage/backpack/satchel/sec - duffelbag = /obj/item/storage/backpack/duffelbag/sec - courierbag = /obj/item/storage/backpack/messenger/sec - - backpack_contents = list( - /obj/item/gun/energy/e_gun/adv_stopping = 1 - ) - /datum/outfit/job/hos/inteq_honorable name = "Inteq Honorable vanguard" head = /obj/item/clothing/head/beret/sec/hos/inteq/honorable diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 9f7afba9fb4b..43dc5a5dd8d0 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -360,9 +360,3 @@ desc = "An envirosuit helmet made for the sanctioned plasmaman." icon_state = "secmed_envirohelm" item_state = "secmed_envirohelm" - -/obj/item/clothing/head/helmet/space/plasmaman/security/lieutenant //WS edit plasmaman customization - name = "lieutenants envirosuit helmet" - desc = "an envirosuit helmet made for the sentinel plasmaman." - icon_state = "lt_envirohelm" - item_state = "lt_envirohelm" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 9a6e0687ccb5..10f4d5bfbd2d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -397,12 +397,6 @@ icon_state = "armor_rouma_montagne" item_state = "rouma_montagne_coat" -/obj/item/clothing/suit/armor/vest/lieutenant - name = "lieutenant's armor" - desc = "An armored vest with a lieutenant's insignia imprinted on it." - icon_state = "armor_blueshield" - item_state = "blueshield" - /obj/item/clothing/suit/armor/vest/bulletproof/solgov name = "\improper Sonnensoldner gambison" desc = "A standard armor vest fielded for SolGov's Sonnensoldners." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index c9c0edd2def8..17bb0329cfef 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -234,27 +234,6 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS -//Lieutenant -/obj/item/clothing/suit/armor/lieutenant_trenchcoat - name = "lieutenant's trenchcoat" - desc = "A design taken from a war over 500 years ago. Makes you look like a badass." - icon_state = "armor_blueshield_trenchcoat" - item_state = "trenchcoat_blueshield" - blood_overlay_type = "coat" - armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) - body_parts_covered = CHEST|GROIN|ARMS|HANDS - cold_protection = CHEST|LEGS|ARMS - heat_protection = CHEST|LEGS|ARMS - -/obj/item/clothing/suit/toggle/lieutenant - name = "lieutenant's coat" - desc = "Surplus from some military. You finally have your own coat." - icon_state = "blueshield_coat" - item_state = "blueshield_coat" - allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton) - armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - body_parts_covered = CHEST|GROIN|ARMS|HANDS - //SolGov suits /obj/item/clothing/suit/solgov diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 34942fb6ff8c..7bb36a9086b4 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -464,10 +464,7 @@ name = "detective's shoulder holster" pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/detective -/obj/item/clothing/accessory/holster/lieutenant - name = "lieutenant's shoulder holster" - desc = "A modified shoulder holster designed to fit a small egun and power cells." - pocket_storage_component_path = /datum/component/storage/concrete/pockets/holster/lt + /obj/item/clothing/accessory/holster/detective/Initialize() . = ..() diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm index 9d1ceda58127..59b83eb7e3e5 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -152,15 +152,3 @@ icon_state = "mime_enviroskirt" item_state = "mime_enviroskirt" -/obj/item/clothing/under/plasmaman/lieutenant //WS edit plasmaman customization - name = "lieutenants envirosuit" - desc = "A navy blue envirosuit with chlorophyll green trimmings." - icon_state = "lt_envirosuit" - item_state = "lt_envirosuit" - -/obj/item/clothing/under/plasmaman/lieutenant/skirt //WS edit plasmaman customization - name = "lieutenants enviroskirt" - desc = "A navy blue envirosuit with chlorophyll green trimmings and a poofy skirt, just as blue to match." - icon_state = "lt_enviroskirt" - item_state = "lt_enviroskirt" - diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 8edb11ba91cc..231c62eb2895 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -111,35 +111,7 @@ body_parts_covered = CHEST|GROIN|ARMS supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION -//Lieutenant - -/obj/item/clothing/under/rank/command - desc = "A standard command jumpsuit in the colours of the Lieutenant." - name = "\improper lieutenant jumpsuit" - icon_state = "lt" - can_adjust = FALSE - -/obj/item/clothing/under/rank/command/skirt - desc = "A command jumpskirt in the colours of the Lieutenant." - name = "\improper lieutenant jumpskirt" - icon_state = "lt_skirt" - body_parts_covered = CHEST|GROIN|ARMS - can_adjust = FALSE - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - -/obj/item/clothing/under/rank/command/nt - desc = "A standard command jumpsuit in the colours of the Lieutenant." - name = "\improper lieutenant blue jumpsuit" - icon_state = "lt_nt" - item_state = "b_suit" - -/obj/item/clothing/under/rank/command/nt/skirt - desc = "A command jumpskirt in the colours of the Lieutenant." - name = "\improper lieutenant blue jumpskirt" - icon_state = "lt_nt_skirt" - body_parts_covered = CHEST|GROIN|ARMS - supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION - +//Minuteman /obj/item/clothing/under/rank/command/minutemen name = "colonial minutemen officer uniform" desc = "A uniform used by officers of the Colonial Minutemen." diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index e38e758cf71e..0e53b00c1670 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -123,4 +123,4 @@ suit = /obj/item/clothing/suit/jacket/leather/duster glasses = /obj/item/clothing/glasses/hud/spacecop accessory = /obj/item/clothing/accessory/holster - head = /obj/item/clothing/head/beret/lt + head = /obj/item/clothing/head/beret/command diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 888f0c74235f..ec9afd777f2c 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -166,9 +166,6 @@ if("Clown") O = new /datum/outfit/plasmaman/clown - if("Lieutenant") //WS edit plasmaman customization - O = new /datum/outfit/plasmaman/lieutenant //WS edit plasmaman customization - if("SolGov Representative") //WS edit sgr O = new /datum/outfit/plasmaman/solgov