Skip to content

Commit

Permalink
inherit and fix ssu
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 10, 2024
1 parent d293ee9 commit 59bba1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/suit_storage_unit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 59bba1c

Please sign in to comment.