Skip to content

Commit

Permalink
Removes the (Independent) Lieutenant job (#2556)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes the wildly inconsistent and unmaintained whitesands relic that
is the Lieutenant job (formerly known as the Solgov Representative. Yes,
that one). Pieces of its clothing were shoved into various ships or
outfits, and it was only ever used on the Shetland which is admittedly
very dated and in need of modernizing. This should not touch the LP
Lieutenant job or the Twinkleshine Lieutenant job.
The Shetland now has a First Officer instead of a Lieutenant, and now
has two separate lockers for the FO and Captain instead of just one for
the Lieutenant. That poor, poor captain, locker-less for so long..
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

![image](https://github.com/shiptest-ss13/Shiptest/assets/95449138/d52b76b1-8821-41e6-94f3-b1d8cb997148)
This job has visible rust from its existence in the whitesands era and
tries and fails to fill in at what the First Officer job does better.
The independent captain/command resprite also broke its jumpsuit sprites
due to the type paths overlapping.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removes the Lieutenant job datum, locker and clothing
add: The Shetland now has a First Officer and lockers for both them and
the captain now
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Zevotech authored Dec 28, 2023
1 parent 0f95e8f commit ec31739
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 239 deletions.
5 changes: 0 additions & 5 deletions _maps/configs/independent_shetland.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
68 changes: 42 additions & 26 deletions _maps/shuttles/independent/independent_shetland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -6769,9 +6785,9 @@ dl
LL
TY
Ft
OD
aw
Lr
OD
aw
xq
TY
LL
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions code/datums/components/storage/concrete/pockets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
. = ..()
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions code/game/objects/items/devices/PDA/PDA_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 0 additions & 14 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 0 additions & 6 deletions code/modules/clothing/head/berets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions code/modules/clothing/outfits/plasmaman.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 0 additions & 29 deletions code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions code/modules/clothing/spacesuits/plasmamen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 0 additions & 6 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Loading

0 comments on commit ec31739

Please sign in to comment.