From 0fceaa84802ba319073df357b59f995167fbc374 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 9 Dec 2025 15:49:25 -0700 Subject: [PATCH] [MIRROR] Some more suit fixes (#12084) Co-authored-by: Cameron Lennox --- .../modules/clothing/spacesuits/void/ert_vr.dm | 1 - code/modules/clothing/suits/armor_vr.dm | 6 ++---- code/modules/clothing/suits/hooded_vr.dm | 14 -------------- code/modules/clothing/suits/jobs_vr.dm | 9 --------- .../modules/clothing/suits/miscellaneous_vr.dm | 18 ------------------ .../vore/fluffstuff/custom_clothes_vr.dm | 3 --- 6 files changed, 2 insertions(+), 49 deletions(-) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 656f1147ca..ecc381df2d 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -7,7 +7,6 @@ slowdown = 0.5 siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN) //this thing can autoadapt - icon = 'icons/inventory/suit/item.dmi' default_worn_icon = 'icons/inventory/suit/mob.dmi' w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials breach_threshold = 16 //Extra Thicc diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index 4e24dd4ad4..67a126b2dd 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -69,12 +69,10 @@ icon_state = "ge_armorcent" /obj/item/clothing/suit/storage/vest/wardencoat/alt2 - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' + icon_state = "warden_jacket_old" /obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' + icon_state = "hostrench_old" // Armor Versions Here /obj/item/clothing/suit/armor/combat/crusader diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 22cbb2cfee..79965228f5 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -5,8 +5,6 @@ /obj/item/clothing/suit/storage/hooded/techpriest name = "tech priest robe" desc = "Praise be to the Omnissiah." - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "techpriest" hoodtype = /obj/item/clothing/head/hood/techpriest armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 25, bio = 50, rad = 25) @@ -91,8 +89,6 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/talon name = "Talon winter coat" desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV Talon." - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "taloncoat" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon @@ -108,8 +104,6 @@ /obj/item/clothing/suit/storage/hooded/foodcostume/hotdog //Belly filler uniform :^). name = "hotdog costume" desc = "A giant hotdog costume, comes with authentic artificial hotdog scent." - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "hotdog" item_state_slots = list(slot_r_hand_str = "hotdog", slot_l_hand_str = "hotdog") hoodtype = /obj/item/clothing/head/hood_vr/hotdog_hood @@ -117,8 +111,6 @@ /obj/item/clothing/suit/storage/hooded/foodcostume/turnip //Honey wake up, new vorny jail uniform just dropped. name = "turnip costume" desc = "A giant turnip costume, extra padding helps the wearer stand in the same spot for hours." - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "turnip" item_state_slots = list(slot_r_hand_str = "turnip", slot_l_hand_str = "turnip") hoodtype = /obj/item/clothing/head/hood_vr/turnip_hood @@ -128,8 +120,6 @@ /obj/item/clothing/suit/storage/hooded/hoodie name = "hoodie" desc = "A warm jacket, now featuring a hood!" - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "hoodie_plain" item_state_slots = list(slot_r_hand_str = "grey_hoodie", slot_l_hand_str = "grey_hoodie") body_parts_covered = CHEST|ARMS|LEGS @@ -168,8 +158,6 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/centcom name = "centcom winter coat" desc = "A cozy winter coat, covered in green fur and the colors of CentCom. Armored for extra protection." - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "coatcentcom" armor = list(melee = 40, bullet = 45, laser = 45, energy = 35, bomb = 40, bio = 25, rad = 25, fire = 35, acid = 50) //there is no cc armor here to base it off so, here's the values from the original cc coat hoodtype = /obj/item/clothing/head/hood/winter/centcom @@ -182,8 +170,6 @@ /obj/item/clothing/suit/storage/hooded/toggle/colorable name = "hoodie" desc = "A rather plain hoodie. If you can't find it in your closet, chances are your significant other is borrowing it." - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "choodie" hoodtype = /obj/item/clothing/head/hood/toggleable/colorable open = FALSE diff --git a/code/modules/clothing/suits/jobs_vr.dm b/code/modules/clothing/suits/jobs_vr.dm index 15716bf722..3b361b2d02 100644 --- a/code/modules/clothing/suits/jobs_vr.dm +++ b/code/modules/clothing/suits/jobs_vr.dm @@ -2,27 +2,18 @@ /obj/item/clothing/suit/storage/cargo name = "cargo jacket" desc = "A jacket typically assigned to cargo technicians when it's chilly in cargonia." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cargo_jacket" // QM Coat /obj/item/clothing/suit/storage/qm name = "\improper QM coat" desc = "A coat typically assigned to quartermasters when it's chilly in cargonia." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "qm_coat" //Atmos-coloured hazard vest /obj/item/clothing/suit/storage/hazardvest/atmos name = "light blue hazard vest" desc = "A high-visibility vest used in work zones. This one is in the colors of atmospherics!" - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "hazard_a" item_state = "hazard_a" item_icons = list( diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index f573a52018..10a488a89c 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -4,16 +4,12 @@ /obj/item/clothing/suit/chiton name = "chiton" desc = "A traditional piece of clothing from Greece." - icon = 'icons/inventory/suit/item.dmi' icon_state = "chiton" - icon_override = 'icons/inventory/suit/mob.dmi' /obj/item/clothing/suit/oversize name = "oversized t-shirt" desc = "This ain't your daddy's shirt! Well, it might be..." - icon = 'icons/inventory/suit/item.dmi' icon_state = "oversize" - icon_override = 'icons/inventory/suit/mob.dmi' //HERE BE TAUR RELATED CLOTHES @@ -96,17 +92,11 @@ /obj/item/clothing/suit/storage/det_trench/alt name = "sleek modern coat" desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunksleek" /obj/item/clothing/suit/storage/det_trench/alt2 name = "sleek modern coat (long)" desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunksleek_long" /obj/item/clothing/suit/storage/det_trench/alt/black @@ -119,8 +109,6 @@ /obj/item/clothing/suit/storage/toggle/hoodie/talon name = "Talon hoodie" desc = "A warm, blue sweatshirt bearing ITV Talon markings." - icon = 'icons/inventory/suit/item.dmi' - icon_override = 'icons/inventory/suit/mob.dmi' icon_state = "talonhoodie" item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue") @@ -128,18 +116,12 @@ /obj/item/clothing/suit/storage/bladerunner name = "leather coat" desc = "An old leather coat. Has probably seen things you wouldn't believe." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "bladerunner_coat" // Cyberpunk 'orange' vest /obj/item/clothing/suit/cyberpunk name = "cyberpunk vest" desc = "A red vest with golden streaks. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai." - - icon = 'icons/inventory/suit/item.dmi' - default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "cyberpunk" armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index f14804816f..530ec9b67b 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -158,8 +158,6 @@ /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat name = "long fur coat" desc = "A sophisticated long coat made of fur." - - icon = 'icons/inventory/suit/mob.dmi' icon_state = "russofurcoat" default_worn_icon = 'icons/inventory/suit/mob.dmi' @@ -1104,7 +1102,6 @@ Departamental Swimsuits, for general use /obj/item/clothing/suit/storage/trek/ds9 name = "Padded Overcoat" desc = "The overcoat worn by all officers of the 2380s." - icon = 'icons/inventory/suit/item.dmi' default_worn_icon = 'icons/inventory/suit/mob.dmi' icon_state = "trek_ds9_coat" body_parts_covered = CHEST|ARMS