From 2765558d2183c5e62cc27ab06fcafe48e27c6197 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 18:42:22 -0600 Subject: [PATCH 1/4] mm jacket? --- code/modules/clothing/suits/armor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 9a6e0687ccb5..c924e4568ec2 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -495,7 +495,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 From ba30c3b28be533c823ce33635bc570a2fc626ff0 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 19:20:25 -0600 Subject: [PATCH 2/4] snuffs out its life --- _maps/shuttles/syndicate/syndicate_aegis.dmm | 3 --- _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm | 3 --- code/modules/clothing/suits/armor.dm | 12 ++++++------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index dd29db498f95..2f79a3e98c9f 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -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) diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 2e797a41fb9d..3da232da75dc 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -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, diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c924e4568ec2..3d78c17db36b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -144,13 +144,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 @@ -161,12 +161,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" From 18b74657069707f2a6cfc27a477202fde3fc97fc Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Mon, 18 Dec 2023 20:33:22 -0600 Subject: [PATCH 3/4] random space --- code/modules/clothing/suits/armor.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 3d78c17db36b..d38d3dbbc481 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -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 From fd23ca0f9a9bbc03c567012be4dc7746ed786b4b Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Sun, 24 Dec 2023 14:45:06 -0600 Subject: [PATCH 4/4] checks failed for no reason --- code/modules/shuttle/shuttle_rotate.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index 4cb5d0c65268..d0b4b49a92f6 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -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 . = ..() @@ -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)