From 0b9c9924be95dd47d53ce6ff1287e1197884b16d Mon Sep 17 00:00:00 2001 From: Mister-moon1 <109922915+Mister-moon1@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:29:24 +0100 Subject: [PATCH] fixes plasma caster onmob (#7175) # About the pull request how did this even happen also changed some sprite layering # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: plasma caster onmob fixed code: layering changed a bit /:cl: --- code/__DEFINES/human.dm | 8 ++++---- code/modules/cm_preds/yaut_weapons.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index f2d60983b74c..1fbeff73192b 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -142,10 +142,10 @@ #define SUIT_SQUAD_LAYER 28 #define GLASSES_LAYER 27 #define BELT_LAYER 26 -#define SUIT_STORE_LAYER 25 -#define BACK_LAYER 24 -#define HAIR_LAYER 23 -#define HAIR_GRADIENT_LAYER 22 +#define BACK_LAYER 25 +#define HAIR_LAYER 24 +#define HAIR_GRADIENT_LAYER 23 +#define SUIT_STORE_LAYER 22 #define FACIAL_LAYER 21 #define EARS_LAYER 20 #define FACEMASK_LAYER 19 diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index 14336cbdba04..bab4ddd003ea 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -1150,7 +1150,7 @@ /obj/item/weapon/gun/energy/yautja/plasma_caster/Initialize(mapload, spawn_empty, caster_material = "ebony") icon_state = "[base_icon_state]_[caster_material]" - item_state = "[base_icon_state]_[caster_material]" + item_state = "[base_item_state]_[caster_material]" item_state_slots[WEAR_BACK] = "[base_item_state]_off_[caster_material]" item_state_slots[WEAR_J_STORE] = "[base_item_state]_off_[caster_material]" . = ..()