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

Syndicate Jacket Fix #2602

Merged
merged 5 commits into from
Dec 28, 2023
Merged

Syndicate Jacket Fix #2602

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
2765558
mm jacket?
FalloutFalcon Dec 19, 2023
ba30c3b
snuffs out its life
FalloutFalcon Dec 19, 2023
18b7465
random space
FalloutFalcon Dec 19, 2023
51387d6
Merge branch 'master' into hos-jacket
FalloutFalcon Dec 24, 2023
fd23ca0
checks failed for no reason
FalloutFalcon Dec 24, 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
3 changes: 0 additions & 3 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -495,7 +494,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
View file
Open in desktop
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