revert bag dumping changes

This commit is contained in:
Jerry Wester
2022-12-13 17:37:47 -07:00
parent 94bfa88ed9
commit 19428e2579
9 changed files with 12 additions and 11 deletions

View File

@@ -369,10 +369,9 @@
//Tries to dump content
/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
var/atom/A = parent
var/atom/dump_destination = dest_object.get_dumping_location(dest_object)
if(M.CanReach(A) && dump_destination && M.CanReach(dump_destination))
var/atom/dump_destination = dest_object.get_dumping_location()
if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
if(check_locked(null, M, TRUE))
to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
return FALSE
if(dump_destination.storage_contents_dump_act(src, M))
playsound(A, "rustle", 50, 1, -5)

View File

@@ -911,8 +911,7 @@
user.active_storage.ui_show(user)
return TRUE
///Get the best place to dump the items contained in the source storage item?
/atom/proc/get_dumping_location()
/atom/proc/get_dumping_location(obj/item/storage/source,mob/user)
return null
//This proc is called on the location of an atom when the atom is Destroy()'d

View File

@@ -381,7 +381,7 @@
/obj/machinery/door/morgue
icon = 'icons/obj/doors/doormorgue.dmi'
/obj/machinery/door/get_dumping_location()
/obj/machinery/door/get_dumping_location(obj/item/storage/source,mob/user)
return null
/obj/machinery/door/proc/lock()

View File

@@ -5,6 +5,9 @@
w_class = WEIGHT_CLASS_NORMAL
var/component_type = /datum/component/storage/concrete
/obj/item/storage/get_dumping_location(obj/item/storage/source,mob/user)
return src
/obj/item/storage/Initialize(mapload)
. = ..()
PopulateContents()

View File

@@ -237,7 +237,7 @@
if(!anchored || current_size >= STAGE_FIVE)
step_towards(src,S)
/obj/get_dumping_location()
/obj/get_dumping_location(datum/component/storage/source,mob/user)
return get_turf(src)
/**

View File

@@ -133,7 +133,7 @@
new mineral(loc)
qdel(src)
/obj/structure/falsewall/get_dumping_location()
/obj/structure/falsewall/get_dumping_location(obj/item/storage/source,mob/user)
return null
/obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine.

View File

@@ -273,7 +273,7 @@
C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
return ..()
/obj/structure/grille/get_dumping_location()
/obj/structure/grille/get_dumping_location(datum/component/storage/source,mob/user)
return null
/obj/structure/grille/broken // Pre-broken grilles for map placement

View File

@@ -567,7 +567,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
take_damage(round(exposed_volume / 100), BURN, 0, 0)
..()
/obj/structure/window/get_dumping_location()
/obj/structure/window/get_dumping_location(obj/item/storage/source,mob/user)
return null
/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller)

View File

@@ -278,7 +278,7 @@
if(.)
ChangeTurf(/turf/closed/wall/clockwork)
/turf/closed/wall/get_dumping_location()
/turf/closed/wall/get_dumping_location(obj/item/storage/source, mob/user)
return null
/turf/closed/wall/acid_act(acidpwr, acid_volume)