shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3226 from Citadel-Station-13/upstream-merge-31324

Browse Source 
[MIRROR] Minor refactor to storage items
This commit is contained in:
LetterJay
2017-10-08 16:22:40 -04:00
committed by GitHub
parent f046f4f15b a31b438fd5
commit f6bfbaa192
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/storage/fancy.dm
View File

@@ -58,7 +58,9 @@
/obj/item/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
fancy_open = TRUE
return ..()
. = ..()
//Recall update icon with the fancy item snowflake arg (ugh)
update_icon(1)
/*
* Donut Box

40
code/game/objects/items/storage/storage.dm
View File

@@ -359,35 +359,43 @@
return 1
//Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
//Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted
/obj/item/storage/proc/remove_from_storage(obj/item/W, atom/new_location)
if(!istype(W))
return 0
if(istype(src, /obj/item/storage/fancy))
var/obj/item/storage/fancy/F = src
F.update_icon(1)
for(var/mob/M in can_see_contents())
if(M.client)
M.client.screen -= W
//Cache this as it should be reusable down the bottom, will not apply if anyone adds a sleep to dropped
//or moving objects, things that should never happen
var/list/seeing_mobs = can_see_contents()
for(var/mob/M in seeing_mobs)
M.client.screen -= W
if(ismob(loc))
var/mob/M = loc
W.dropped(M)
W.layer = initial(W.layer)
W.plane = initial(W.plane)
W.forceMove(new_location)
for(var/mob/M in can_see_contents())
if(new_location)
W.forceMove(new_location)
//Reset the items values
W.layer = initial(W.layer)
W.plane = initial(W.plane)
W.mouse_opacity = initial(W.mouse_opacity)
if(W.maptext)
W.maptext = ""
//We don't want to call this if the item is being destroyed
W.on_exit_storage(src)
else
//Being destroyed, just move to nullspace now (so it's not in contents for the icon update)
W.moveToNullspace()
for(var/mob/M in seeing_mobs)
orient2hud(M)
show_to(M)
if(W.maptext)
W.maptext = ""
W.on_exit_storage(src)
update_icon()
W.mouse_opacity = initial(W.mouse_opacity)
return 1
/obj/item/storage/deconstruct(disassembled = TRUE)