Skip to content

Commit

Permalink
The CentCom-ening: Shiptest Edition (#2321)
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


![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/9a51d6b2-04cc-4a6b-ad22-602b57f07a22)
Ports the following pull requests:
* tgstation/tgstation#57023
* tgstation/tgstation#60414
* tgstation/tgstation#63029
* tgstation/tgstation#65794
* tgstation/tgstation#70226

This takes out the wintercoats out of misc.dm into their own file, and
adds a CentCom Wardrobe into the CentCom map.

<!-- 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
Adminbus. Some minor clean up is always appreciated.

<!-- 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: PositiveEntropy, tf-4
add: Adds the CentVend inside Central Command! You're now able to vend
Central Command clothing items for all your commanding needs!
add: Nanotrasen has added a new outfit for Special Ops Officers to
enjoy, instead of a simple leather jacket: The CentCom Officer's Coat!
add: Re-adds the CentCom Official's suit, making it the default clothing
option for CentCom Officials! The turtlenecks have instead been made to
be the standard ERT uniform.
imageadd: Thanks to a collaboration between the frontier sector and the
core sector, the parade jackets now boast new and varied apperances for
all to enjoy, with a new parade jacket releasing for the Head of
Security!
imageadd: In no short effort than the finest of tailors, the captain's
hat, the centcom hat, the captain's jumpsuit and the captain's carapace
now have finer gold trims and the finest quality leather available,
making them more vibrant for all!
expansion: To utilize the new variants, simply alt-click a parade
jacket, or a centcom commander coat. You can also obtain a Head of
Security parade jacket by simply accessing the Head of Security's
closet!
imageadd: In no short effort of our best tailors, every Central Command
outfit have been either redesigned or reshaded! All of them!
/: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
meemofcourse authored Sep 13, 2023
1 parent 822393b commit 88a554d
Show file tree
Hide file tree
Showing 31 changed files with 325 additions and 199 deletions.
2 changes: 1 addition & 1 deletion _maps/deprecated/Ruins/oldAIsat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
"bU" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/chair,
/obj/item/clothing/under/rank/centcom/officer,
/obj/item/clothing/under/rank/centcom/official,
/obj/item/restraints/handcuffs,
/obj/effect/decal/remains/human,
/turf/open/floor/plating/airless,
Expand Down
3 changes: 1 addition & 2 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9186,8 +9186,6 @@
/turf/open/floor/plasteel/dark,
/area/ctf)
"hYc" = (
/obj/structure/destructible/cult/tome,
/obj/item/book/codex_gigas,
/obj/machinery/airalarm/directional/east,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
Expand All @@ -9199,6 +9197,7 @@
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 8
},
/obj/machinery/vending/wardrobe/cent_wardrobe,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"hZs" = (
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/security/head_of_security/parade/female, //WS Edit - Better Command Uniforms
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/melee/baton/abductor,
/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
/obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/officer,
/obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom/official,
/obj/item/clothing/suit/space/hardsuit/ert, /obj/item/clothing/suit/space/hardsuit/ert/sec,
/obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med,
/obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
Expand All @@ -119,7 +119,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/head_of_personnel,
/obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/engineering/chief_engineer,
/obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/commander,
/obj/item/clothing/under/rank/centcom/official, /obj/item/clothing/under/rank/centcom/commander,
/obj/item/melee/classic_baton/telescopic, /obj/item/card/id/silver, /obj/item/card/id/gold,
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
new /obj/item/book/granter/spell/mimery_guns(src)

/obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents()
new /obj/item/clothing/under/rank/centcom/officer(src)
new /obj/item/clothing/under/rank/centcom/official(src)
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/radio/headset/headset_cent/empty(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
/datum/outfit/nanotrasenbridgeofficercorpse
name = "Bridge Officer Corpse"
ears = /obj/item/radio/headset/heads/head_of_personnel
uniform = /obj/item/clothing/under/rank/centcom/officer
uniform = /obj/item/clothing/under/rank/centcom/official
suit = /obj/item/clothing/suit/armor/vest/bulletproof
shoes = /obj/item/clothing/shoes/sneakers/black
glasses = /obj/item/clothing/glasses/sunglasses
Expand Down
17 changes: 17 additions & 0 deletions code/modules/clothing/head/berets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@
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
name = "\improper SolGov beret"
desc = "A beret with SolGov's emblem emblazoned on it. Colored in SolGov blue."
Expand All @@ -215,6 +217,8 @@
icon_state = "beret_terragovplain"
item_state = "beret_terragovplain"

// Inteq

/obj/item/clothing/head/beret/sec/inteq
name = "inteq beret"
desc = "A comfortable looking brown beret with a badge of the golden shield of the IRMG. Denotes the wearer as part of the IRMG."
Expand All @@ -234,6 +238,8 @@
item_state = "inteq_honorable_beret"
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)

// Frontier

/obj/item/clothing/head/beret/sec/frontier
name = "\improper Frontiersmen beret"
desc = "A scratchy olive green beret, worn by Frontiersmen who want to look good while intimidating freighter crew."
Expand All @@ -243,3 +249,14 @@
name = "\improper Frontiersmen officer beret"
desc = "A scratchy olive green beret emblazoned with the Frontiersmen insignia, worn by Frontiersmen who want to look good while intimidating freighter captains."
icon_state = "frontier_officer_beret"


// CentCom

/obj/item/clothing/head/beret/centcom_formal
name = "\improper CentCom Formal Beret"
desc = "Sometimes, a compromise between fashion and defense needs to be made. Thanks to Nanotrasen's most recent nano-fabric durability enhancements, this time, it's not the case."
icon_state = "beret_badge"
greyscale_colors = "#46b946#f2c42e"
armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "fire" = 100, "acid" = 90)
strip_delay = 10 SECONDS
13 changes: 11 additions & 2 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 80

/obj/item/clothing/head/centcom_cap
name = "\improper CentCom commander cap"
icon_state = "centcom_cap"
desc = "Worn by the finest of CentCom commanders. Inside the lining of the cap, lies two faint initials."
item_state = "that"
flags_inv = 0
armor = list("melee" = 30, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = (8 SECONDS)

/obj/item/clothing/head/spacepolice
name = "space police cap"
desc = "A blue cap for patrolling the daily beat."
Expand Down Expand Up @@ -364,7 +373,7 @@

/obj/item/clothing/head/frenchberet
name = "french beret"
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage military conflict, for some reason."
desc = "A quality beret, infused with the aroma of chain-smoking, wine-swilling Parisians. You feel less inclined to engage in military conflict, for some reason."
icon_state = "beret"
dynamic_hair_suffix = ""

Expand Down Expand Up @@ -444,7 +453,7 @@

/obj/item/clothing/head/coordinator
name = "coordinator cap"
desc = "A cap for a party ooordinator, stylish!."
desc = "A cap for a party coordinator, stylish!."
icon_state = "capcap"
item_state = "that"
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
item_state = "gas_cap"
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/mask/gas/atmos/centcom
name = "\improper CentCom gas mask"
desc = "Oooh, gold and green. Fancy! This should help as you sit in your office."
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "gas_centcom"
item_state = "gas_centcom"
resistance_flags = FIRE_PROOF | ACID_PROOF

// **** Welding gas mask ****

/obj/item/clothing/mask/gas/welding
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/outfits/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "ERT Common"

mask = /obj/item/clothing/mask/gas/sechailer
uniform = /obj/item/clothing/under/rank/centcom/officer
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/combat/swat
gloves = /obj/item/clothing/gloves/combat
ears = /obj/item/radio/headset/headset_cent/alt
Expand Down Expand Up @@ -160,7 +160,7 @@
/datum/outfit/centcom/centcom_official
name = "CentCom Official"

uniform = /obj/item/clothing/under/rank/centcom/officer
uniform = /obj/item/clothing/under/rank/centcom/official
shoes = /obj/item/clothing/shoes/sneakers/black
gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/headset_cent
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
ears = /obj/item/radio/headset/headset_cent/commander
glasses = /obj/item/clothing/glasses/eyepatch
mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
head = /obj/item/clothing/head/centhat
head = /obj/item/clothing/head/centcom_cap
belt = /obj/item/gun/ballistic/revolver/mateba
r_pocket = /obj/item/lighter
l_pocket = /obj/item/ammo_box/a357
Expand Down
15 changes: 8 additions & 7 deletions code/modules/clothing/spacesuits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ Contains:
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/head/helmet/space/beret
name = "officer's beret"
name = "CentCom officer's beret"
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
icon_state = "beret_badge"
greyscale_colors = "#397F3F#FFCE5B"
dynamic_hair_suffix = "+generic"
dynamic_fhair_suffix = "+generic"
flags_inv = 0
Expand All @@ -68,12 +69,12 @@ Contains:
resistance_flags = FIRE_PROOF | ACID_PROOF

/obj/item/clothing/suit/space/officer
name = "officer's jacket"
desc = "An armored, space-proof jacket used in special operations."
icon = 'icons/obj/clothing/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/suit.dmi'
icon_state = "detective"
item_state = "det_suit"
name = "CentCom officer's coat"
desc = "An armored, space-proof coat used in special operations."
icon = 'icons/obj/clothing/suits/armor.dmi'
mob_overlay_icon = 'icons/mob/clothing/suits/armor.dmi'
icon_state = "centcom_coat"
item_state = "centcom"
blood_overlay_type = "coat"
slowdown = 0
flags_inv = 0
Expand Down
13 changes: 13 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -512,3 +512,16 @@
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS

/obj/item/clothing/suit/toggle/armor/vest/centcom_formal
name = "\improper CentCom formal coat"
desc = "A stylish coat given to CentCom Commanders. Perfect for sending ERTs to suicide missions with style!"
icon_state = "centcom_formal"
item_state = "centcom"
body_parts_covered = CHEST|GROIN|ARMS
armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)
togglename = "buttons"

/obj/item/clothing/suit/toggle/armor/vest/centcom_formal/Initialize()
. = ..()
allowed = GLOB.security_wintercoat_allowed
Loading

0 comments on commit 88a554d

Please sign in to comment.