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

Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220

Browse Source 
[MIRROR] Fixes pocket items being deleted when monkeyizing
This commit is contained in:
LetterJay
2018-06-03 16:19:36 -05:00
committed by GitHub
parent 46790245f9 ac196fb155
commit 8bc642c6bd
9 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/inventory.dm
+1 -1
View File
@@ -379,7 +379,7 @@
/mob/living/proc/unequip_everything()
var/list/items = list()
items |= get_equipped_items()
items |= get_equipped_items(TRUE)
for(var/I in items)
dropItemToGround(I)
drop_all_held_items()
code/modules/mob/transform_procs.dm
+3 -3
View File
@@ -23,7 +23,7 @@
CH.cavity_item = null
if(tr_flags & TR_KEEPITEMS)
var/Itemlist = get_equipped_items()
var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W)
@@ -174,7 +174,7 @@
//now the rest
if (tr_flags & TR_KEEPITEMS)
var/Itemlist = get_equipped_items()
var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)
@@ -495,7 +495,7 @@
SSblackbox.record_feedback("amount", "gorillas_created", 1)
var/Itemlist = get_equipped_items()
var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items
for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE)