From 4ed3ac7b3d31d124aa18c5e19964e4ffceff6c7a Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 26 Sep 2018 14:27:28 -0500 Subject: [PATCH] Purges Icon_override --- code/game/objects/items.dm | 2 - code/modules/clothing/glasses/vg_glasses.dm | 10 +-- code/modules/clothing/head/cit_hats.dm | 2 +- code/modules/clothing/head/vg_hats.dm | 42 +++++------ code/modules/clothing/masks/vg_masks.dm | 6 +- code/modules/clothing/shoes/vg_shoes.dm | 34 ++++----- code/modules/clothing/suits/vg_suits.dm | 24 +++--- code/modules/clothing/under/vg_under.dm | 74 +++++++++---------- .../mob/living/carbon/human/update_icons.dm | 21 +++--- .../items/devices/radio/shockcollar.dm | 2 +- .../code/modules/clothing/under/trek_under.dm | 10 +-- .../modules/clothing/under/turtlenecks.dm | 2 +- .../code/modules/clothing/under/under.dm | 6 +- .../modules/custom_loadout/custom_items.dm | 46 ++++++------ 14 files changed, 139 insertions(+), 142 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 01fd0e78f3..54aea7f641 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -101,8 +101,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/last_force_string_check = 0 var/tip_timer - var/icon_override //CIT CHANGE - adds icon_override var. Will be removed with #4322 - var/trigger_guard = TRIGGER_GUARD_NONE //Grinder vars diff --git a/code/modules/clothing/glasses/vg_glasses.dm b/code/modules/clothing/glasses/vg_glasses.dm index 58df3102ce..449b34b22e 100644 --- a/code/modules/clothing/glasses/vg_glasses.dm +++ b/code/modules/clothing/glasses/vg_glasses.dm @@ -6,21 +6,21 @@ name = "purple sunglasses" icon_state = "sun_purple" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi' /obj/item/clothing/glasses/sunglasses/star name = "star-shaped sunglasses" desc = "Novelty sunglasses, both lenses are in the shape of a star." icon_state = "sun_star" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi' /obj/item/clothing/glasses/sunglasses/rockstar name = "red star-shaped sunglasses" desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones." icon_state = "sun_star_silver" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi' /obj/item/clothing/glasses/gglasses name = "Green Glasses" @@ -28,7 +28,7 @@ icon_state = "gglasses" item_state = "gglasses" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi' /obj/item/clothing/glasses/welding/superior name = "superior welding goggles" @@ -36,7 +36,7 @@ icon_state = "rwelding-g" item_state = "rwelding-g" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/glasses.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/glasses.dmi' actions_types = list(/datum/action/item_action/toggle) flash_protect = 2 tint = 1 diff --git a/code/modules/clothing/head/cit_hats.dm b/code/modules/clothing/head/cit_hats.dm index 8cdfe807c8..7b0e68264f 100644 --- a/code/modules/clothing/head/cit_hats.dm +++ b/code/modules/clothing/head/cit_hats.dm @@ -4,4 +4,4 @@ icon = 'modular_citadel/icons/obj/clothing/cit_hats.dmi' icon_state = "hunter" item_state = "hunter_worn" - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' diff --git a/code/modules/clothing/head/vg_hats.dm b/code/modules/clothing/head/vg_hats.dm index be57619a7a..efeb5291db 100644 --- a/code/modules/clothing/head/vg_hats.dm +++ b/code/modules/clothing/head/vg_hats.dm @@ -12,7 +12,7 @@ max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT strip_delay = 80 dog_fashion = null - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/helmet/aviatorhelmet name = "Aviator Helmet" @@ -21,7 +21,7 @@ item_state = "aviator_helmet" icon_state = "aviator_helmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/helmet/biker name = "Biker's Helmet" @@ -29,7 +29,7 @@ armor = list(melee = 25, bullet = 15, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0) icon_state = "biker_helmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR /obj/item/clothing/head/helmet/richard @@ -38,7 +38,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) icon_state = "richard" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR /obj/item/clothing/head/helmet/megahelmet @@ -47,7 +47,7 @@ icon_state = "megahelmet" item_state = "megahelmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' siemens_coefficient = 1 /obj/item/clothing/head/helmet/protohelmet @@ -56,7 +56,7 @@ icon_state = "protohelmet" item_state = "protohelmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' siemens_coefficient = 1 /obj/item/clothing/head/helmet/megaxhelmet @@ -65,7 +65,7 @@ icon_state = "megaxhelmet" item_state = "megaxhelmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/helmet/joehelmet name = "Sniper Helmet" @@ -74,7 +74,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR item_state = "joehelmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/helmet/doomguy name = "Doomguy's helmet" @@ -83,7 +83,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR item_state = "doom" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0) /obj/item/clothing/head/helmet/neorussian @@ -92,7 +92,7 @@ icon_state = "nr_helmet" item_state = "nr_helmet" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/stalhelm @@ -101,7 +101,7 @@ icon_state = "stalhelm" item_state = "stalhelm" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/panzer name = "Panzer Cap" @@ -109,7 +109,7 @@ icon_state = "panzercap" item_state = "panzercap" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/naziofficer name = "Officer Cap" @@ -117,7 +117,7 @@ icon_state = "officercap" item_state = "officercap" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/russobluecamohat @@ -133,7 +133,7 @@ icon_state = "russofurhat" item_state = "russofurhat" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/squatter_hat name = "slav squatter hat" @@ -141,7 +141,7 @@ item_state = "squatter_hat" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' desc = "Cyka blyat." - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/snake name = "snake head" @@ -149,7 +149,7 @@ icon_state = "snakehead" item_state = "snakehead" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/mummy_rags name = "mummy rags" @@ -158,7 +158,7 @@ item_state = "mummy" item_color = "mummy" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS /obj/item/clothing/head/clownpiece @@ -167,7 +167,7 @@ icon_state = "clownpiece" item_state = "clownpiece" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/mitre name = "mitre" @@ -175,7 +175,7 @@ icon_state = "mitre" item_state = "mitre" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/head/tinfoil name = "tinfoil hat" @@ -183,7 +183,7 @@ icon_state = "foilhat" item_state = "paper" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' siemens_coefficient = 2 /obj/item/clothing/head/celtic @@ -192,4 +192,4 @@ icon_state = "celtic_crown" item_state = "celtic_crown" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' diff --git a/code/modules/clothing/masks/vg_masks.dm b/code/modules/clothing/masks/vg_masks.dm index 712a023651..7de27fb780 100644 --- a/code/modules/clothing/masks/vg_masks.dm +++ b/code/modules/clothing/masks/vg_masks.dm @@ -3,18 +3,18 @@ desc = "Some pranksters are truly magical." icon_state = "wizzclown" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi' /obj/item/clothing/mask/chapmask name = "venetian mask" desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut." icon_state = "chapmask" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi' /obj/item/clothing/mask/neorussian name = "neo-Russian mask" desc = "Somehow, it makes you act and look way more polite than usual." icon_state = "nr_mask" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/masks.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/masks.dmi' diff --git a/code/modules/clothing/shoes/vg_shoes.dm b/code/modules/clothing/shoes/vg_shoes.dm index f867b537c7..d5308c85db 100644 --- a/code/modules/clothing/shoes/vg_shoes.dm +++ b/code/modules/clothing/shoes/vg_shoes.dm @@ -5,7 +5,7 @@ icon_state = "leather" item_color = "leather" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/magboots/deathsquad desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle." @@ -13,7 +13,7 @@ icon_state = "DS-magboots0" magboot_state = "DS-magboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF /obj/item/clothing/shoes/magboots/atmos @@ -21,7 +21,7 @@ name = "atmospherics magboots" icon_state = "atmosmagboots0" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' magboot_state = "atmosmagboots" resistance_flags = FIRE_PROOF @@ -30,95 +30,95 @@ desc = "Simon's Shoes." icon_state = "simonshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/kneesocks name = "kneesocks" desc = "A pair of girly knee-high socks." icon_state = "kneesock" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/jestershoes name = "Jester Shoes" desc = "As worn by the clowns of old." icon_state = "jestershoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/aviatorboots name = "Aviator Boots" desc = "Boots suitable for just about any occasion." icon_state = "aviator_boots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/libertyshoes name = "Liberty Shoes" desc = "Freedom isn't free, neither were these shoes." icon_state = "libertyshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/megaboots name = "DRN-001 Boots" desc = "Large armored boots, very weak to large spikes." icon_state = "megaboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/protoboots name = "Prototype Boots" desc = "Functionally identical to the DRN-001 model's boots, but in red." icon_state = "protoboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/megaxboots name = "Maverick Hunter boots" desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike." icon_state = "megaxboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/joeboots name = "Sniper Boots" desc = "Nearly identical to the Prototype's boots, except in black." icon_state = "joeboots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/doomguy name = "Doomguy's boots" desc = "If you look closely, you might see skull fragments still buried in these boots." icon_state = "doom" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/rottenshoes name = "rotten shoes" desc = "These shoes seem perfect for sneaking around." icon_state = "rottenshoes" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/sandal/slippers name = "magic slippers" icon_state = "slippers" desc = "For the wizard that puts comfort first. Who's going to laugh?" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/slippers_worn name = "worn bunny slippers" desc = "Fluffy..." icon_state = "slippers_worn" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' /obj/item/clothing/shoes/jackboots/neorussian name = "neo-Russian boots" desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit." icon_state = "nr_boots" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/head.dmi' \ No newline at end of file + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/head.dmi' \ No newline at end of file diff --git a/code/modules/clothing/suits/vg_suits.dm b/code/modules/clothing/suits/vg_suits.dm index da06e85392..2c97653637 100644 --- a/code/modules/clothing/suits/vg_suits.dm +++ b/code/modules/clothing/suits/vg_suits.dm @@ -8,7 +8,7 @@ armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20) siemens_coefficient = 0.5 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/armor/xcomsquaddie/dredd name = "Judge Armor" @@ -16,7 +16,7 @@ icon_state = "dredd-suit" item_state = "dredd-suit" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/armor/xcomarmor @@ -29,7 +29,7 @@ slowdown = 1 siemens_coefficient = 0.5 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/armor/vest/neorussian name = "neo-Russian vest" @@ -37,7 +37,7 @@ icon_state = "nr_vest" item_state = "nr_vest" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/armor/doomguy name = "Doomguy's armor" @@ -48,7 +48,7 @@ slowdown = 0 armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0) icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/kaminacape @@ -57,7 +57,7 @@ icon_state = "kaminacape" body_parts_covered = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/officercoat name = "Officer's Coat" @@ -80,7 +80,7 @@ allowed = list(/obj/item/gun) body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/doshjacket name = "Plasterer's Jacket" @@ -88,7 +88,7 @@ icon_state = "doshjacket" body_parts_covered = CHEST|GROIN|ARMS icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/maidapron name = "Apron" @@ -96,7 +96,7 @@ icon_state = "maidapron" body_parts_covered = CHEST|GROIN icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/clownpiece name = "small fairy wings" @@ -104,14 +104,14 @@ icon_state = "clownpiece" body_parts_covered = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/clownpiece/flying name = "small fairy wings" desc = "Some small and translucid insect-like wings. Looks like these are the real deal!" icon_state = "clownpiece-fly" icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' /obj/item/clothing/suit/raincoat name = "Raincoat" @@ -119,6 +119,6 @@ icon_state = "raincoat" body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/suit.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' diff --git a/code/modules/clothing/under/vg_under.dm b/code/modules/clothing/under/vg_under.dm index f9b521cade..64bf75d5ac 100644 --- a/code/modules/clothing/under/vg_under.dm +++ b/code/modules/clothing/under/vg_under.dm @@ -5,7 +5,7 @@ item_color = "stripper_p" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/stripper_green @@ -15,7 +15,7 @@ item_color = "stripper_g" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' @@ -27,7 +27,7 @@ item_color = "bride_orange" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/wedding/bride_purple @@ -38,7 +38,7 @@ item_color = "bride_purple" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/wedding/bride_blue @@ -49,7 +49,7 @@ item_color = "bride_blue" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/wedding/bride_red @@ -60,7 +60,7 @@ item_color = "bride_red" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/wedding/bride_white @@ -71,7 +71,7 @@ item_color = "bride_white" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/mankini @@ -81,7 +81,7 @@ item_color = "mankini" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /* /obj/item/clothing/under/psysuit @@ -92,7 +92,7 @@ item_color = "psysuit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/officeruniform @@ -103,7 +103,7 @@ item_color = "officeruniform" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/soldieruniform @@ -114,7 +114,7 @@ item_color = "soldieruniform" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' */ /obj/item/clothing/under/squatter_outfit @@ -125,7 +125,7 @@ item_color = "squatteroutfit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/russobluecamooutfit @@ -136,7 +136,7 @@ item_color = "russobluecamo" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/stilsuit @@ -147,7 +147,7 @@ item_color = "stilsuit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/aviatoruniform @@ -158,7 +158,7 @@ item_color = "aviator_uniform" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/bikersuit @@ -168,7 +168,7 @@ item_color = "biker" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/jacketsuit @@ -179,7 +179,7 @@ item_color = "jacket" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' obj/item/clothing/under/mega @@ -190,7 +190,7 @@ obj/item/clothing/under/mega item_color = "mega" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/proto @@ -201,7 +201,7 @@ obj/item/clothing/under/mega item_color = "proto" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/megax @@ -212,7 +212,7 @@ obj/item/clothing/under/mega item_color = "megax" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/joe @@ -223,7 +223,7 @@ obj/item/clothing/under/mega item_color = "joe" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/roll @@ -234,7 +234,7 @@ obj/item/clothing/under/mega item_color = "roll" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/gokugidown @@ -245,7 +245,7 @@ obj/item/clothing/under/mega item_color = "gokugidown" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/gokugi @@ -256,7 +256,7 @@ obj/item/clothing/under/mega item_color = "gokugi" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/doomguy @@ -267,7 +267,7 @@ obj/item/clothing/under/mega item_color = "doom" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/vault13 @@ -278,7 +278,7 @@ obj/item/clothing/under/mega item_color = "v13-jumpsuit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/vault @@ -289,7 +289,7 @@ obj/item/clothing/under/mega item_color = "v-jumpsuit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/clownpiece @@ -300,7 +300,7 @@ obj/item/clothing/under/mega item_color = "clownpiece" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/cia @@ -311,7 +311,7 @@ obj/item/clothing/under/mega item_color = "cia" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/greaser @@ -321,7 +321,7 @@ obj/item/clothing/under/mega item_state = "greaser_default" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/greaser/New() @@ -350,7 +350,7 @@ obj/item/clothing/under/mega item_color = "shizunewinter" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' @@ -362,7 +362,7 @@ obj/item/clothing/under/mega item_color = "shizunenormal" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/keyholesweater @@ -373,7 +373,7 @@ obj/item/clothing/under/mega item_color = "keyholesweater" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/casualhoodie @@ -384,7 +384,7 @@ obj/item/clothing/under/mega item_color = "hoodiejeans" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' @@ -404,7 +404,7 @@ obj/item/clothing/under/mega can_adjust = 0 has_sensor = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/neorussian @@ -415,7 +415,7 @@ obj/item/clothing/under/mega item_color = "nr_uniform" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' */ /obj/item/clothing/under/rottensuit @@ -426,4 +426,4 @@ obj/item/clothing/under/mega item_color = "rottensuit" can_adjust = 0 icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6572cf4e27..9388a5d5f3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -129,10 +129,10 @@ There are several things that need to be remembered: if(dna && dna.species.sexes) var/G = (gender == FEMALE) ? "f" : "m" if(G == "f" && U.fitted != NO_FEMALE_UNIFORM) - uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE, femaleuniform = U.fitted) + uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.alternate_worn_icon) ? w_uniform.alternate_worn_icon : 'icons/mob/uniform.dmi'), isinhands = FALSE, femaleuniform = U.fitted) if(!uniform_overlay) - uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE) + uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.alternate_worn_icon) ? w_uniform.alternate_worn_icon : 'icons/mob/uniform.dmi'), isinhands = FALSE) if(OFFSET_UNIFORM in dna.species.offset_features) @@ -160,7 +160,7 @@ There are several things that need to be remembered: update_observer_view(wear_id) //TODO: add an icon file for ID slot stuff, so it's less snowflakey - id_overlay = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.icon_override) ? wear_id.icon_override : 'icons/mob/mob.dmi')) + id_overlay = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.alternate_worn_icon) ? wear_id.alternate_worn_icon : 'icons/mob/mob.dmi')) if(OFFSET_ID in dna.species.offset_features) id_overlay.pixel_x += dna.species.offset_features[OFFSET_ID][1] id_overlay.pixel_y += dna.species.offset_features[OFFSET_ID][2] @@ -195,7 +195,7 @@ There are several things that need to be remembered: var/t_state = gloves.item_state if(!t_state) t_state = gloves.icon_state - overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = ((gloves.icon_override) ? gloves.icon_override : 'icons/mob/hands.dmi')) + overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = ((gloves.alternate_worn_icon) ? gloves.alternate_worn_icon : 'icons/mob/hands.dmi')) gloves_overlay = overlays_standing[GLOVES_LAYER] if(OFFSET_GLOVES in dna.species.offset_features) gloves_overlay.pixel_x += dna.species.offset_features[OFFSET_GLOVES][1] @@ -221,7 +221,7 @@ There are several things that need to be remembered: client.screen += glasses //Either way, add the item to the HUD update_observer_view(glasses,1) if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES))) - overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = ((glasses.icon_override) ? glasses.icon_override : 'icons/mob/eyes.dmi')) + overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = ((glasses.alternate_worn_icon) ? glasses.alternate_worn_icon : 'icons/mob/eyes.dmi')) var/mutable_appearance/glasses_overlay = overlays_standing[GLASSES_LAYER] if(glasses_overlay) if(OFFSET_GLASSES in dna.species.offset_features) @@ -248,7 +248,7 @@ There are several things that need to be remembered: client.screen += ears //add it to the client's screen update_observer_view(ears,1) - overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.icon_override) ? ears.icon_override : 'icons/mob/ears.dmi')) + overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.alternate_worn_icon) ? ears.alternate_worn_icon : 'icons/mob/ears.dmi')) var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER] if(OFFSET_EARS in dna.species.offset_features) ears_overlay.pixel_x += dna.species.offset_features[OFFSET_EARS][1] @@ -273,7 +273,7 @@ There are several things that need to be remembered: if(hud_used.inventory_shown) //if the inventory is open client.screen += shoes //add it to client's screen update_observer_view(shoes,1) - overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.icon_override) ? shoes.icon_override : 'icons/mob/feet.dmi')) + overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.alternate_worn_icon) ? shoes.alternate_worn_icon : 'icons/mob/feet.dmi')) var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER] if(OFFSET_SHOES in dna.species.offset_features) shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1] @@ -281,7 +281,6 @@ There are several things that need to be remembered: overlays_standing[SHOES_LAYER] = shoes_overlay apply_overlay(SHOES_LAYER) - /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) @@ -297,7 +296,7 @@ There are several things that need to be remembered: var/t_state = s_store.item_state if(!t_state) t_state = s_store.icon_state - overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(((s_store.icon_override) ? s_store.icon_override : 'icons/mob/belt_mirror.dmi'), t_state, -SUIT_STORE_LAYER) + overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(((s_store.alternate_worn_icon) ? s_store.alternate_worn_icon : 'icons/mob/belt_mirror.dmi'), t_state, -SUIT_STORE_LAYER) var/mutable_appearance/s_store_overlay = overlays_standing[SUIT_LAYER] if(OFFSET_S_STORE in dna.species.offset_features) s_store_overlay.pixel_x += dna.species.offset_features[OFFSET_S_STORE][1] @@ -335,7 +334,7 @@ There are several things that need to be remembered: if(!t_state) t_state = belt.icon_state - overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.icon_override) ? belt.icon_override : 'icons/mob/belt.dmi')) + overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.alternate_worn_icon) ? belt.alternate_worn_icon : 'icons/mob/belt.dmi')) var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER] if(OFFSET_BELT in dna.species.offset_features) belt_overlay.pixel_x += dna.species.offset_features[OFFSET_BELT][1] @@ -359,7 +358,7 @@ There are several things that need to be remembered: client.screen += wear_suit update_observer_view(wear_suit,1) - overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.icon_override) ? wear_suit.icon_override : 'icons/mob/suit.dmi')) + overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.alternate_worn_icon) ? wear_suit.alternate_worn_icon : 'icons/mob/suit.dmi')) var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER] if(OFFSET_SUIT in dna.species.offset_features) suit_overlay.pixel_x += dna.species.offset_features[OFFSET_SUIT][1] diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index c6470ac19e..9d0757e26e 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -2,7 +2,7 @@ name = "shock collar" desc = "A reinforced metal collar. It seems to have some form of wiring near the front. Strange.." icon = 'modular_citadel/icons/obj/clothing/cit_neck.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/neck.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/neck.dmi' icon_state = "shockcollar" item_state = "shockcollar" body_parts_covered = NECK diff --git a/modular_citadel/code/modules/clothing/under/trek_under.dm b/modular_citadel/code/modules/clothing/under/trek_under.dm index 3fcb2f62d1..fb5adf3b59 100644 --- a/modular_citadel/code/modules/clothing/under/trek_under.dm +++ b/modular_citadel/code/modules/clothing/under/trek_under.dm @@ -12,7 +12,7 @@ name = "Section 31 Uniform" desc = "Oooh... right." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' - icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "" can_adjust = FALSE //to prevent you from "wearing it casually" @@ -92,7 +92,7 @@ desc = "The overcoat worn by all officers of the 2380s." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' icon_state = "trek_ds9_coat" - icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "trek_ds9_coat" body_parts_covered = CHEST|GROIN|ARMS permeability_coefficient = 0.50 @@ -136,7 +136,7 @@ desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Set phasers to awesome." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' - icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedcoat" item_state = "fedcoat" @@ -204,7 +204,7 @@ name = "Modern Federation Uniform Jacket" desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. Wearing this makes you feel like a competant commander." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' - icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' icon_state = "fedmodern" item_state = "fedmodern" body_parts_covered = CHEST|GROIN|ARMS @@ -238,7 +238,7 @@ desc = "An officer's cap that demands discipline from the one who wears it." icon = 'modular_citadel/icons/mob/clothing/trek_item_icon.dmi' icon_state = "fedcapofficer" - icon_override = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi' item_state = "fedcapofficer_mob" armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0) diff --git a/modular_citadel/code/modules/clothing/under/turtlenecks.dm b/modular_citadel/code/modules/clothing/under/turtlenecks.dm index bcd0fd46e2..2d5efcb2b1 100644 --- a/modular_citadel/code/modules/clothing/under/turtlenecks.dm +++ b/modular_citadel/code/modules/clothing/under/turtlenecks.dm @@ -44,7 +44,7 @@ body_parts_covered = CHEST|ARMS can_adjust = 1 icon = 'modular_citadel/icons/obj/clothing/turtlenecks.dmi' - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' /obj/item/clothing/under/bb_sweater/black name = "black sweater" diff --git a/modular_citadel/code/modules/clothing/under/under.dm b/modular_citadel/code/modules/clothing/under/under.dm index 94c28fb1c3..e4d521771a 100644 --- a/modular_citadel/code/modules/clothing/under/under.dm +++ b/modular_citadel/code/modules/clothing/under/under.dm @@ -10,7 +10,7 @@ desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle." icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi' icon_state = "secskirt" - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' item_state = "r_suit" item_color = "secskirt" @@ -19,7 +19,7 @@ desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security." icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi' icon_state = "hosskirt" - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' item_state = "gy_suit" item_color = "hosskirt" @@ -37,7 +37,7 @@ desc = "" icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi' icon_state = "lewdcap" - icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi' + alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi' item_state = "lewdcap" item_color = "lewdcap" can_adjust = FALSE diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index 8848e89cef..1f59019cc6 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -23,7 +23,7 @@ desc = "The design on this seems a little too familiar." icon = 'icons/obj/custom.dmi' icon_state = "infcloak" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "infcloak" w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -33,7 +33,7 @@ desc = "A soft black collar that seems to stretch to fit whoever wears it." icon = 'icons/obj/custom.dmi' icon_state = "infcollar" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "infcollar" item_color = null tagname = null @@ -64,7 +64,7 @@ icon = 'icons/obj/custom.dmi' icon_state = "zombscarf" desc = "A fashionable collar" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_color = "zombscarf" dog_fashion = /datum/dog_fashion/head @@ -73,7 +73,7 @@ desc = "An oddly special looking coat." icon = 'icons/obj/custom.dmi' icon_state = "labred" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "labred" /obj/item/clothing/suit/toggle/labcoat/labredblack @@ -81,7 +81,7 @@ desc = "An oddly special looking coat." icon = 'icons/obj/custom.dmi' icon_state = "labredblack" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "labredblack" /obj/item/toy/plush/carrot @@ -99,7 +99,7 @@ name = "carrot cloak" desc = "A cloak in the shape and color of a carrot!" icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "carrotcloak" item_state = "carrotcloak" w_class = WEIGHT_CLASS_SMALL @@ -111,7 +111,7 @@ icon = 'icons/obj/custom.dmi' icon_state = "satchel_carrot" item_state = "satchel_carrot" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' /obj/item/storage/backpack/satchel/carrot/Initialize() . = ..() @@ -134,7 +134,7 @@ icon = 'icons/obj/custom.dmi' icon_state = "festive" item_state = "festive" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -142,7 +142,7 @@ name = "Alboroto Rosa mask" icon = 'icons/obj/custom.dmi' icon_state = "lucharzigfie" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "lucharzigfie" /obj/item/clothing/head/hardhat/reindeer/fluff @@ -185,7 +185,7 @@ desc = "You would swear this was in your nightmares after eating too many veggies." icon = 'icons/obj/custom.dmi' icon_state = "hos-g" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "hos-g" body_parts_covered = CHEST|GROIN|ARMS|LEGS @@ -201,7 +201,7 @@ desc = "Smells like reactor four." icon = 'icons/obj/custom.dmi' item_state = "stalker" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "stalker" /obj/item/reagent_containers/food/drinks/flask/steel @@ -216,7 +216,7 @@ desc = "It's a collar..." icon = 'icons/obj/custom.dmi' icon_state = "petcollar-stripe" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "petcollar-stripe" tagname = null @@ -225,7 +225,7 @@ desc = "Just looking at this makes you want to sing." icon = 'icons/obj/custom.dmi' icon_state = "singer" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "singer" item_color = "singer" fitted = NO_FEMALE_UNIFORM @@ -235,7 +235,7 @@ /obj/item/clothing/shoes/sneakers/pink icon = 'icons/obj/custom.dmi' icon_state = "pink" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "pink" /obj/item/clothing/neck/tie/bloodred @@ -243,13 +243,13 @@ desc = "A neosilk clip-on tie. This one has a black S on the tipping and looks rather unique." icon = 'icons/obj/custom.dmi' icon_state = "bloodredtie" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' /obj/item/clothing/suit/puffydress name = "Puffy Dress" desc = "A formal puffy black and red Victorian dress." icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "puffydress" item_state = "puffydress" body_parts_covered = CHEST|GROIN|LEGS @@ -261,7 +261,7 @@ item_state = "vermillion" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' /obj/item/clothing/under/bb_sweater/black/naomi name = "worn black sweater" @@ -300,7 +300,7 @@ name = "Kiara's Sabre" desc = "This blade looks as dangerous as its owner." icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "darksabre" item_state = "darksabre" lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi' @@ -313,7 +313,7 @@ name = "Ornate Sheathe" desc = "An ornate and rather sinister looking sabre sheathe." icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "darksheath" item_state = "darksheath" w_class = WEIGHT_CLASS_BULKY @@ -332,7 +332,7 @@ name = "Dark Armor" desc = "A dark, non-functional piece of armor sporting a red and black finish." icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "darkcarapace" item_state = "darkcarapace" blood_overlay_type = "armor" @@ -345,7 +345,7 @@ desc = "This cloak doesn't seem too special." icon = 'icons/obj/custom.dmi' icon_state = "wintergreencloak" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "wintergreencloak" w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|GROIN|LEGS|ARMS @@ -361,7 +361,7 @@ desc = "An oddly special looking coat." icon = 'icons/obj/custom.dmi' icon_state = "rdcoat" - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' item_state = "rdcoat" /obj/item/custom/leechjar @@ -393,7 +393,7 @@ /obj/item/clothing/shoes/lucky name = "Lucky Jackboots" icon = 'icons/obj/custom.dmi' - icon_override = 'icons/mob/custom_w.dmi' + alternate_worn_icon = 'icons/mob/custom_w.dmi' desc = "Comfy Lucky Jackboots with the word Luck on them." item_state = "luckyjack" icon_state = "luckyjack"