Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworks The Visuals Of Independent And Nanotrasen Captains #2453

Merged
merged 5 commits into from
Nov 7, 2023
+58 −52
Merged

Reworks The Visuals Of Independent And Nanotrasen Captains #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
896244b
shrivel
Imaginos16 Nov 5, 2023
69544a7
help
Imaginos16 Nov 6, 2023
fbeaad5
HELL IS REAL
Imaginos16 Nov 6, 2023
a546dd7
e
Imaginos16 Nov 6, 2023
9b310b1
I forgot some carapaces x)
Imaginos16 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions _maps/shuttles/independent/independent_beluga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@
/obj/item/clothing/head/hopcap,
/obj/item/gun/energy/e_gun/mini,
/obj/item/clothing/head/HoS/cowboy,
/obj/item/clothing/suit/jacket/leather/duster/command,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ge" = (
Expand Down Expand Up @@ -3504,10 +3505,9 @@
pixel_x = -28
},
/obj/item/clothing/under/rank/command/captain,
/obj/item/clothing/under/rank/command/lieutenant,
/obj/item/clothing/under/rank/command,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/head/beret/captain,
/obj/item/clothing/head/caphat,
Expand All @@ -3521,6 +3521,7 @@
/obj/item/areaeditor/shuttle,
/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen,
/obj/item/clothing/head/caphat/cowboy,
/obj/item/clothing/suit/armor/vest/capcarapace/captunic,
/turf/open/floor/wood/walnut,
/area/ship/bridge)
"Hv" = (
Expand Down
3 changes: 2 additions & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,8 +1552,9 @@
/obj/effect/turf_decal/corner/opaque/blue/half{
dir = 1
},
/obj/item/clothing/head/caphat/cowboy,
/obj/item/radio/intercom/wideband/directional/east,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/head/caphat/cowboy,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ka" = (
Expand Down
1 change: 1 addition & 0 deletions _maps/shuttles/independent/independent_kilo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/turf/open/floor/carpet,
/area/ship/crew)
"da" = (
Expand Down
14 changes: 9 additions & 5 deletions _maps/shuttles/independent/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@
dir = 5
},
/obj/machinery/computer/atmos_control/tank/air_tank{
sensors = list("hairon"="Heron Air Mix Tank")
sensors = list("hairon"="Heron Air Mix Tank")
},
/obj/machinery/light_switch{
pixel_y = 23
Expand Down Expand Up @@ -6617,8 +6617,6 @@
req_access_txt = "20"
},
/obj/item/clothing/neck/cloak/cap,
/obj/item/clothing/gloves/color/captain,
/obj/item/clothing/head/caphat,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/storage/backpack/captain,
/obj/item/clothing/under/rank/centcom/officer,
Expand All @@ -6640,6 +6638,8 @@
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/head/beret/centcom_formal,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/gloves/combat,
/turf/open/floor/carpet/green,
/area/ship/crew/dorm/dormtwo)
"yc" = (
Expand Down Expand Up @@ -9267,6 +9267,10 @@
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"HR" = (
/obj/item/clothing/gloves/color/captain/nt,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/law_office)
"HT" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -9707,7 +9711,7 @@
dir = 9
},
/obj/machinery/computer/atmos_control/tank/toxin_tank{
sensors = list("heron_plasm"="Heron Plasma Tank")
sensors = list("heron_plasm"="Heron Plasma Tank")
},
/obj/structure/cable{
icon_state = "0-4"
Expand Down Expand Up @@ -15962,7 +15966,7 @@ oz
Oa
QG
QG
QG
HR
QG
QG
Ge
Expand Down
2 changes: 2 additions & 0 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,8 @@
/obj/item/gun/energy/laser,
/obj/item/megaphone/command,
/obj/machinery/light/small/directional/east,
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/suit/armor/vest/capcarapace,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"fy" = (
Expand Down
4 changes: 3 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,7 +1934,7 @@
/obj/structure/railing,
/obj/machinery/computer/atmos_control/incinerator{
dir = 4;
sensors = list("gecko_burn_sensor"="Combustion Chamber")
sensors = list("gecko_burn_sensor"="Combustion Chamber")
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -3399,6 +3399,8 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/suit/armor/vest/capcarapace,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ij" = (
Expand Down
4 changes: 3 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,6 @@
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/gloves/color/captain,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/nt,
/obj/item/storage/belt/sabre,
Expand All @@ -1044,6 +1043,9 @@
desc = "An ICW-era self-destruct authorization disk. The codes on this are long past obsolete, but it's still a flagrant violation of company policy.";
name = "outdated nuclear authentication disk"
},
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/clothing/gloves/color/captain/nt,
/turf/open/floor/carpet/royalblue,
/area/ship/bridge)
"hv" = (
Expand Down
16 changes: 8 additions & 8 deletions _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,10 +1508,7 @@
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/head/hopcap,
/obj/item/clothing/head/hopcap/nt,
/obj/item/clothing/under/rank/command/head_of_personnel,
/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
/obj/item/storage/box/ids,
/obj/item/storage/box/PDAs,
/obj/item/assembly/flash/handheld,
Expand All @@ -1521,6 +1518,8 @@
pixel_y = 32
},
/obj/effect/turf_decal/siding/wood,
/obj/item/clothing/under/rank/command/head_of_personnel/nt,
/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
/turf/open/floor/wood,
/area/ship/crew/crewthree)
"lg" = (
Expand Down Expand Up @@ -1833,7 +1832,7 @@
"nu" = (
/obj/machinery/computer/atmos_control/incinerator{
dir = 4;
sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
},
/obj/structure/cable/yellow{
icon_state = "4-8"
Expand Down Expand Up @@ -5527,15 +5526,16 @@
/obj/item/storage/backpack/captain,
/obj/item/storage/belt/sabre,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat,
/obj/item/clothing/head/beret/captain,
/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/clothing/under/rank/command/captain/skirt,
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/under/rank/command/captain/parade,
/obj/item/clothing/shoes/laceup,
/obj/item/door_remote/captain,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/head/caphat/nt,
/turf/open/floor/wood,
/area/ship/crew/crewtwo)
"UN" = (
Expand Down
4 changes: 2 additions & 2 deletions code/__byond_version_compat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#endif

#if (DM_VERSION == 514 && DM_BUILD == 1589)
#error Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
#error Please consider using 514.1588.
#warn Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
#warn Please consider using 514.1588.
#endif

// Keep savefile compatibilty at minimum supported level
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
new /obj/item/clothing/under/rank/command/captain/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)
Expand Down Expand Up @@ -414,7 +414,7 @@
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/lieutenant(src)
new /obj/item/clothing/under/rank/command/lieutenant/skirt(src)
new /obj/item/clothing/under/rank/command/lieutenant/nt(src)
new /obj/item/clothing/under/rank/command/lieutenant/nt/skirt(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: 6 additions & 0 deletions code/modules/clothing/gloves/color.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,12 @@
strip_delay = 60
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)

/obj/item/clothing/gloves/color/captain/nt
desc = "Regal blue gloves, with a nice gold trim, a diamond anti-shock coating, and an integrated thermal barrier, and armoured bracers. Swanky."
name = "captain's gloves"
icon_state = "captainnt"
item_state = "egloves"

/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@

id = /obj/item/card/id/silver
head = /obj/item/clothing/head/beret/lt
uniform = /obj/item/clothing/under/rank/command/lieutenant
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
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@
icon_state = "carapace_ntformal"
item_state = "capspacesuit"

/obj/item/clothing/suit/armor/vest/capcarapace/captunic
name = "captain's parade coat"
desc = "Worn by a Captain to show their class."
icon_state = "carapace_formal"
item_state = "bio_suit"

/obj/item/clothing/suit/armor/vest/capcarapace/minutemen
name = "colonial minutemen general coat"
desc = "A very fancy coat used by generals of the Colonial Minutemen."
Expand Down
10 changes: 0 additions & 10 deletions code/modules/clothing/suits/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@
body_parts_covered = CHEST|GROIN|LEGS
permeability_coefficient = 0.5

//Captain
/obj/item/clothing/suit/captunic
name = "captain's parade tunic"
desc = "Worn by a Captain to show their class."
icon_state = "captunic"
item_state = "bio_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/assembly/flash/handheld, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)

//Chef
/obj/item/clothing/suit/toggle/chef
name = "chef's apron"
Expand Down
10 changes: 5 additions & 5 deletions code/modules/clothing/under/jobs/command.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/obj/item/clothing/under/rank/command/nt/skirt
desc = "A standard command jumpskirt."
name = "command jumpskirt"
icon_state = "cmd_skirt"
icon_state = "cmd_nt_skirt"
body_parts_covered = CHEST|GROIN|ARMS
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION

Expand Down Expand Up @@ -113,27 +113,27 @@

//Lieutenant

/obj/item/clothing/under/rank/command/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/lieutenant/skirt
/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/lieutenant/nt
/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/lieutenant/nt/skirt
/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"
Expand Down
13 changes: 2 additions & 11 deletions code/modules/jobs/job_types/captain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,18 @@

ears = /obj/item/radio/headset/nanotrasen/captain
uniform = /obj/item/clothing/under/rank/command/captain/nt
gloves = /obj/item/clothing/gloves/color/captain/nt
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/caphat/nt

/datum/outfit/job/captain/nt/heron
name = "Captain (Nanotrasen)"

uniform = /obj/item/clothing/under/rank/centcom/officer
gloves = /obj/item/clothing/gloves/combat
head = /obj/item/clothing/head/centhat
suit = /obj/item/clothing/suit/armor/vest/bulletproof

/datum/outfit/job/captain/solgov
name = "Captain (SolGov)"

ears = /obj/item/radio/headset/solgov/captain
shoes = /obj/item/clothing/shoes/laceup
suit = /obj/item/clothing/suit/toggle/solgov

/datum/outfit/job/captain/solgov/rebel
name = "Captain (Deserter)"
suit = /obj/item/clothing/suit/toggle/solgov/terragov

/datum/outfit/job/captain/pirate
name = "Captain (Pirate)"

Expand Down
Binary file modified icons/mob/clothing/hands.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/suits/armor.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/under/command.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/suits/armor.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/under/command.dmi
View file
Open in desktop
Binary file not shown.