From 2cb3ffe8c415c0a5752bea902fbafa57c1ad62c7 Mon Sep 17 00:00:00 2001 From: Notamaniac Date: Thu, 15 Dec 2022 23:31:11 +0000 Subject: [PATCH 1/3] Fixes boh inhands (maybe without causing horrible runtimes) --- yogstation/code/game/objects/items/storage/backpack.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm index 6a2a5aae0509..03bf445f778f 100644 --- a/yogstation/code/game/objects/items/storage/backpack.dm +++ b/yogstation/code/game/objects/items/storage/backpack.dm @@ -6,8 +6,7 @@ var/cut = FALSE var/appears_split = FALSE -/obj/item/storage/backpack/holding/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) - state = item_state +/obj/item/storage/backpack/holding/build_worn_icon(var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) if(default_icon_file == 'icons/mob/clothing/head/head.dmi') default_icon_file = 'yogstation/icons/mob/clothing/head/head.dmi' // thats a fun dilemma.... how to keep the tg sprites when doing back but do yogs sprites when worn on head. return ..() @@ -173,10 +172,6 @@ item_flags = NO_MAT_REDEMPTION armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50) -/obj/item/disabled_boh/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) - state = "brokenpack" - return ..() - //Nick's snail shit /obj/item/storage/backpack/snail From afe2d58531cbdd4c08b874d328bcda1a528e3f00 Mon Sep 17 00:00:00 2001 From: Notamaniac Date: Fri, 16 Dec 2022 13:25:07 +0000 Subject: [PATCH 2/3] tuuurdis --- yogstation/code/game/objects/items/storage/backpack.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm index 03bf445f778f..5d42ec4220b6 100644 --- a/yogstation/code/game/objects/items/storage/backpack.dm +++ b/yogstation/code/game/objects/items/storage/backpack.dm @@ -6,7 +6,6 @@ var/cut = FALSE var/appears_split = FALSE -/obj/item/storage/backpack/holding/build_worn_icon(var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) if(default_icon_file == 'icons/mob/clothing/head/head.dmi') default_icon_file = 'yogstation/icons/mob/clothing/head/head.dmi' // thats a fun dilemma.... how to keep the tg sprites when doing back but do yogs sprites when worn on head. return ..() @@ -172,6 +171,10 @@ item_flags = NO_MAT_REDEMPTION armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50) +/obj/item/disabled_boh/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) + state = "brokenpack" + return ..() + //Nick's snail shit /obj/item/storage/backpack/snail From 4be4552a20b6b557a34020c3b2590c6cbc1d36b2 Mon Sep 17 00:00:00 2001 From: Notamaniac Date: Fri, 16 Dec 2022 13:25:19 +0000 Subject: [PATCH 3/3] Revert "tuuurdis" This reverts commit afe2d58531cbdd4c08b874d328bcda1a528e3f00. --- yogstation/code/game/objects/items/storage/backpack.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm index 5d42ec4220b6..03bf445f778f 100644 --- a/yogstation/code/game/objects/items/storage/backpack.dm +++ b/yogstation/code/game/objects/items/storage/backpack.dm @@ -6,6 +6,7 @@ var/cut = FALSE var/appears_split = FALSE +/obj/item/storage/backpack/holding/build_worn_icon(var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) if(default_icon_file == 'icons/mob/clothing/head/head.dmi') default_icon_file = 'yogstation/icons/mob/clothing/head/head.dmi' // thats a fun dilemma.... how to keep the tg sprites when doing back but do yogs sprites when worn on head. return ..() @@ -171,10 +172,6 @@ item_flags = NO_MAT_REDEMPTION armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 60, ACID = 50) -/obj/item/disabled_boh/build_worn_icon(var/state = "", var/default_layer = 0, var/default_icon_file = null, var/isinhands = FALSE, var/femaleuniform = NO_FEMALE_UNIFORM) - state = "brokenpack" - return ..() - //Nick's snail shit /obj/item/storage/backpack/snail