From f90bd5a427d1d3e46a929a91e2791c5f8ee0f17d Mon Sep 17 00:00:00 2001 From: Fhaxaris Date: Sun, 31 May 2020 18:39:42 -0500 Subject: [PATCH] pink belt fix attempt #2 (#51327) h --- code/game/objects/items/devices/PDA/PDA.dm | 1 + code/game/objects/items/devices/scanners.dm | 1 + code/game/objects/items/melee/misc.dm | 2 ++ code/game/objects/items/pinpointer.dm | 1 + code/game/objects/items/stunbaton.dm | 1 + 5 files changed, 6 insertions(+) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index e9aa15f5ef1..b1475772c5b 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -17,6 +17,7 @@ GLOBAL_LIST_EMPTY(PDAs) icon = 'icons/obj/pda.dmi' icon_state = "pda" inhand_icon_state = "electronic" + worn_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' item_flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c8a51715653..c83dfcd48f9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -82,6 +82,7 @@ GENE SCANNER icon = 'icons/obj/device.dmi' icon_state = "health" inhand_icon_state = "healthanalyzer" + worn_icon_state = "healthanalyzer" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' desc = "A hand-held body scanner capable of distinguishing vital signs of the subject." diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 040e540a568..98dd8794274 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -167,6 +167,7 @@ icon = 'icons/obj/items_and_weapons.dmi' icon_state = "classic_baton" inhand_icon_state = "classic_baton" + worn_icon_state = "classic_baton" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' slot_flags = ITEM_SLOT_BELT @@ -325,6 +326,7 @@ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' inhand_icon_state = null + worn_icon_state = null slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL item_flags = NONE diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index b14842360d0..b4d2733bdee 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -8,6 +8,7 @@ slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_SMALL inhand_icon_state = "electronic" + worn_icon_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' throw_speed = 3 diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 1c7799d3b2f..b6ed8f8f322 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -4,6 +4,7 @@ icon_state = "stunbaton" inhand_icon_state = "baton" + worn_icon_state = "baton" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'