Skip to content

Commit

Permalink
Syndicate Jacket Fix (#2602)
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

Fixes the hos jacket not being visible then kills the varedited
syndicate jacket!
Fixes #2143
<!-- 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

The Syndicate captain vest has replaced this much better
<!-- 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: Syndicate Jacket
fix: Hos Jacket Invisibility
/: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
FalloutFalcon authored Dec 28, 2023
1 parent d12132e commit 1b3aa7e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
3 changes: 0 additions & 3 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
},
/obj/item/storage/belt/sabre,
/obj/item/reagent_containers/glass/beaker/unholywater,
/obj/item/clothing/suit/armor/hos/trenchcoat{
name = "syndicate jacket"
},
/obj/item/clothing/mask/gas/syndicate,
/turf/open/floor/wood/walnut,
/area/ship/crew/dorm)
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3146,9 +3146,6 @@
},
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/under/syndicate/officer,
/obj/item/clothing/suit/armor/vest/security/hos{
name = "Syndicate jacket"
},
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/clothing/shoes/jackboots,
Expand Down
15 changes: 7 additions & 8 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
/obj/item/clothing/suit/armor/vest/security/warden
name = "warden's jacket"
desc = "A black armored jacket with silver shoulder designations and '/Warden/' stitched into one of the chest pockets."

icon_state = "armor_warden"
item_state = "armor"
body_parts_covered = CHEST|GROIN|ARMS
Expand Down Expand Up @@ -144,13 +143,13 @@
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/vest/capcarapace/syndicate
name = "syndicate captain's vest"
desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer."
name = "Syndicate captain's vest"
desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking Syndicate officer."
icon_state = "carapace_syndie"

/obj/item/clothing/suit/armor/vest/capcarapace/cybersun
name = "cybersun captain's haori"
desc = "An extraordinarily fashionable haori, utilized by cybersun captains. Weaved with armored fabric to protect the user from gunshots."
name = "Cybersun captain's haori"
desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots."
icon_state = "cybersunhaori"

/obj/item/clothing/suit/armor/vest/capcarapace/alt
Expand All @@ -161,12 +160,12 @@

/obj/item/clothing/suit/armor/vest/capcarapace/captunic
name = "captain's parade coat"
desc = "Worn by a Captain to show their class."
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"
name = "Colonial Minutemen general coat"
desc = "A very fancy coat used by generals of the Colonial Minutemen."
icon_state = "carapace_minutemen"
item_state = "carapace_minutemen"
Expand Down Expand Up @@ -489,7 +488,7 @@
/obj/item/clothing/suit/armor/vest/security/hos
name = "head of security's jacket"
desc = "This piece of clothing was specifically designed for asserting superior authority."
icon_state = "hosjacket"
icon_state = "armor_hosjacket"
body_parts_covered = CHEST|ARMS

/obj/item/clothing/suit/armor/vest/security/brig_phys
Expand Down
2 changes: 0 additions & 2 deletions code/modules/shuttle/shuttle_rotate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate

/************************************Structure rotate procs************************************/

//WS Edit Begin - Smartwire Revert Do not TG MARG this
/obj/structure/cable/shuttleRotate(rotation, params)
params &= ~ROTATE_DIR
. = ..()
Expand All @@ -61,7 +60,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
d1 = d2
d2 = temp
update_appearance()
//WS Edit End - Smartwire Revert Do not TG MARG this

//Fixes dpdir on shuttle rotation
/obj/structure/disposalpipe/shuttleRotate(rotation, params)
Expand Down

0 comments on commit 1b3aa7e

Please sign in to comment.