mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-11 10:22:13 +00:00
revert bag dumping changes
This commit is contained in:
@@ -369,10 +369,9 @@
|
|||||||
//Tries to dump content
|
//Tries to dump content
|
||||||
/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
|
/datum/component/storage/proc/dump_content_at(atom/dest_object, mob/M)
|
||||||
var/atom/A = parent
|
var/atom/A = parent
|
||||||
var/atom/dump_destination = dest_object.get_dumping_location(dest_object)
|
var/atom/dump_destination = dest_object.get_dumping_location()
|
||||||
if(M.CanReach(A) && dump_destination && M.CanReach(dump_destination))
|
if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
|
||||||
if(check_locked(null, M, TRUE))
|
if(check_locked(null, M, TRUE))
|
||||||
to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
|
|
||||||
return FALSE
|
return FALSE
|
||||||
if(dump_destination.storage_contents_dump_act(src, M))
|
if(dump_destination.storage_contents_dump_act(src, M))
|
||||||
playsound(A, "rustle", 50, 1, -5)
|
playsound(A, "rustle", 50, 1, -5)
|
||||||
|
|||||||
@@ -911,8 +911,7 @@
|
|||||||
user.active_storage.ui_show(user)
|
user.active_storage.ui_show(user)
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
///Get the best place to dump the items contained in the source storage item?
|
/atom/proc/get_dumping_location(obj/item/storage/source,mob/user)
|
||||||
/atom/proc/get_dumping_location()
|
|
||||||
return null
|
return null
|
||||||
|
|
||||||
//This proc is called on the location of an atom when the atom is Destroy()'d
|
//This proc is called on the location of an atom when the atom is Destroy()'d
|
||||||
|
|||||||
@@ -381,7 +381,7 @@
|
|||||||
/obj/machinery/door/morgue
|
/obj/machinery/door/morgue
|
||||||
icon = 'icons/obj/doors/doormorgue.dmi'
|
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
|
return null
|
||||||
|
|
||||||
/obj/machinery/door/proc/lock()
|
/obj/machinery/door/proc/lock()
|
||||||
|
|||||||
@@ -5,6 +5,9 @@
|
|||||||
w_class = WEIGHT_CLASS_NORMAL
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
var/component_type = /datum/component/storage/concrete
|
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)
|
/obj/item/storage/Initialize(mapload)
|
||||||
. = ..()
|
. = ..()
|
||||||
PopulateContents()
|
PopulateContents()
|
||||||
|
|||||||
@@ -237,7 +237,7 @@
|
|||||||
if(!anchored || current_size >= STAGE_FIVE)
|
if(!anchored || current_size >= STAGE_FIVE)
|
||||||
step_towards(src,S)
|
step_towards(src,S)
|
||||||
|
|
||||||
/obj/get_dumping_location()
|
/obj/get_dumping_location(datum/component/storage/source,mob/user)
|
||||||
return get_turf(src)
|
return get_turf(src)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -133,7 +133,7 @@
|
|||||||
new mineral(loc)
|
new mineral(loc)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/structure/falsewall/get_dumping_location()
|
/obj/structure/falsewall/get_dumping_location(obj/item/storage/source,mob/user)
|
||||||
return null
|
return null
|
||||||
|
|
||||||
/obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine.
|
/obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine.
|
||||||
|
|||||||
@@ -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.
|
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 ..()
|
return ..()
|
||||||
|
|
||||||
/obj/structure/grille/get_dumping_location()
|
/obj/structure/grille/get_dumping_location(datum/component/storage/source,mob/user)
|
||||||
return null
|
return null
|
||||||
|
|
||||||
/obj/structure/grille/broken // Pre-broken grilles for map placement
|
/obj/structure/grille/broken // Pre-broken grilles for map placement
|
||||||
|
|||||||
@@ -567,7 +567,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
|
|||||||
take_damage(round(exposed_volume / 100), BURN, 0, 0)
|
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
|
return null
|
||||||
|
|
||||||
/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller)
|
/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller)
|
||||||
|
|||||||
@@ -278,7 +278,7 @@
|
|||||||
if(.)
|
if(.)
|
||||||
ChangeTurf(/turf/closed/wall/clockwork)
|
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
|
return null
|
||||||
|
|
||||||
/turf/closed/wall/acid_act(acidpwr, acid_volume)
|
/turf/closed/wall/acid_act(acidpwr, acid_volume)
|
||||||
|
|||||||
Reference in New Issue
Block a user