From d5e665bdbebc3fc1ce6f529dedb29c74e911f345 Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 23 Sep 2022 06:29:39 +1000 Subject: [PATCH] Fixes bluespace bag recursion disappearance --- code/_onclick/hud/popups_vr.dm | 1 + code/game/machinery/recharger.dm | 3 ++- code/game/objects/items/weapons/storage/backpack.dm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/_onclick/hud/popups_vr.dm b/code/_onclick/hud/popups_vr.dm index 38864717153..76e72224efe 100644 --- a/code/_onclick/hud/popups_vr.dm +++ b/code/_onclick/hud/popups_vr.dm @@ -3,6 +3,7 @@ desc = "NOTICE ME!" icon = 'icons/mob/screen1_popups.dmi' + plane = PLANE_PLAYER_HUD_ABOVE layer = INFINITY var/close_button_x_start diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index ea2854480a8..a365051af94 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -28,7 +28,8 @@ . += "[charging ? "[charging]" : "Nothing"] is in [src]." if(charging) var/obj/item/weapon/cell/C = charging.get_cell() - . += "Current charge: [C.charge] / [C.maxcharge]" + if(C) // Sometimes we get things without cells in it. + . += "Current charge: [C.charge] / [C.maxcharge]" /obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob) var/allowed = 0 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 325980756f1..50b6e9ba8cc 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -59,7 +59,7 @@ //Please don't clutter the parent storage item with stupid hacks. /obj/item/weapon/storage/backpack/holding/can_be_inserted(obj/item/W as obj, stop_messages = 0) if(istype(W, /obj/item/weapon/storage/backpack/holding)) - return 1 + return FALSE return ..() /obj/item/weapon/storage/backpack/santabag