From 59bba1c94086bab19d6863610a1d115a58084f11 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 10 Oct 2024 18:53:52 -0500 Subject: [PATCH] inherit and fix ssu --- _maps/shuttles/inteq/inteq_talos.dmm | 6 +++--- code/game/machinery/suit_storage_unit.dm | 2 +- code/game/objects/items/storage/guncases.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 71547105e161..8316ee723b05 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -5311,14 +5311,14 @@ /obj/structure/sign/poster/retro/lasergun_new{ pixel_x = -32 }, -/obj/item/storage/guncase/mapper{ +/obj/item/storage/guncase/inherit{ pixel_x = 2; pixel_y = -2 }, /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag, /obj/item/ammo_box/magazine/m12g_bulldog, /obj/item/ammo_box/magazine/m12g_bulldog, -/obj/item/storage/guncase/mapper{ +/obj/item/storage/guncase/inherit{ pixel_y = 2; pixel_x = -2 }, @@ -7412,7 +7412,7 @@ /obj/structure/rack, /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/guncase/pistol/mapper, +/obj/item/storage/guncase/pistol/inherit, /obj/item/gun/ballistic/automatic/pistol/commander/inteq, /obj/item/ammo_box/magazine/co9mm, /obj/item/ammo_box/magazine/co9mm, diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index ea6633370147..e9847a1cd862 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -659,7 +659,7 @@ else if(istype(AM, /obj/item/mod/control) && !storage) AM.forceMove(src) mod = AM - else if(istype(AM, /obj/item) && !storage) + else if(istype(AM, /obj/item) && !AM.anchored && !storage) AM.forceMove(src) storage = AM update_appearance() diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index b5c47a98086e..8b6a07ead28f 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -58,7 +58,7 @@ /// Need to double check this in a seperate pr that adds this to a few ships /// Eats the items on its tile -/obj/item/storage/guncase/mapper +/obj/item/storage/guncase/inherit grab_loc = TRUE /obj/item/storage/guncase/winchester @@ -118,7 +118,7 @@ /// Need to double check this in a seperate pr that adds this to a few ships /// Eats the items on its tile -/obj/item/storage/guncase/pistol/mapper +/obj/item/storage/guncase/pistol/inherit grab_loc = TRUE /obj/item/storage/guncase/pistol/modelh