cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes pocket items being deleted when monkeyizing (#38220)

Browse Source
This commit is contained in:
ShizCalev
2018-06-02 17:04:26 -04:00
committed by yogstation13-bot
parent 6972558847
commit ecf6a20ba4
9 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/diseases/transformation.dm
View File

@@ -55,7 +55,7 @@
if(affected_mob.notransform) if(affected_mob.notransform)
return return
affected_mob.notransform = 1 affected_mob.notransform = 1
for(var/obj/item/W in affected_mob.get_equipped_items()) for(var/obj/item/W in affected_mob.get_equipped_items(TRUE))
affected_mob.dropItemToGround(W) affected_mob.dropItemToGround(W)
for(var/obj/item/I in affected_mob.held_items) for(var/obj/item/I in affected_mob.held_items)
affected_mob.dropItemToGround(I) affected_mob.dropItemToGround(I)

2
code/game/machinery/recycler.dm
View File

@@ -180,7 +180,7 @@
// Remove and recycle the equipped items // Remove and recycle the equipped items
if(eat_victim_items) if(eat_victim_items)
for(var/obj/item/I in L.get_equipped_items()) for(var/obj/item/I in L.get_equipped_items(TRUE))
if(L.dropItemToGround(I)) if(L.dropItemToGround(I))
eat(I, sound=FALSE) eat(I, sound=FALSE)

5
code/modules/admin/verbs/debug.dm
View File

@@ -734,14 +734,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(!dresscode) if(!dresscode)
return return
var/delete_pocket
var/mob/living/carbon/human/H var/mob/living/carbon/human/H
if(isobserver(M)) if(isobserver(M))
H = M.change_mob_type(/mob/living/carbon/human, null, null, TRUE) H = M.change_mob_type(/mob/living/carbon/human, null, null, TRUE)
else else
H = M H = M
if(alert("Drop Items in Pockets? No will delete them.", "Robust quick dress shop", "Yes", "No") == "No")
delete_pocket = TRUE
SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
for (var/obj/item/I in H.get_equipped_items()) for (var/obj/item/I in H.get_equipped_items(delete_pocket))
qdel(I) qdel(I)
if(dresscode != "Naked") if(dresscode != "Naked")
H.equipOutfit(dresscode) H.equipOutfit(dresscode)

2
code/modules/admin/verbs/one_click_antag.dm
View File

@@ -290,7 +290,7 @@
/datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag) /datum/admins/proc/equipAntagOnDummy(mob/living/carbon/human/dummy/mannequin, datum/antagonist/antag)
for(var/I in mannequin.get_equipped_items()) for(var/I in mannequin.get_equipped_items(TRUE))
qdel(I) qdel(I)
if (ispath(antag, /datum/antagonist/ert)) if (ispath(antag, /datum/antagonist/ert))
var/datum/antagonist/ert/ert = antag var/datum/antagonist/ert/ert = antag

2
code/modules/antagonists/highlander/highlander.dm
View File

@@ -42,7 +42,7 @@
if(!istype(H)) if(!istype(H))
return return
for(var/obj/item/I in H.get_equipped_items()) for(var/obj/item/I in H.get_equipped_items(TRUE))
qdel(I) qdel(I)
for(var/obj/item/I in H.held_items) for(var/obj/item/I in H.held_items)
qdel(I) qdel(I)

2
code/modules/assembly/bomb.dm
View File

@@ -117,7 +117,7 @@
if(isigniter(assembly.a_left) == isigniter(assembly.a_right)) if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
return return
if((src in user.get_equipped_items()) && !user.canUnEquip(src)) if((src in user.get_equipped_items(TRUE)) && !user.canUnEquip(src))
to_chat(user, "<span class='warning'>[src] is stuck to you!</span>") to_chat(user, "<span class='warning'>[src] is stuck to you!</span>")
return return

2
code/modules/clothing/outfits/standard.dm
View File

@@ -151,7 +151,7 @@
r_hand = /obj/item/twohanded/fireaxe r_hand = /obj/item/twohanded/fireaxe
/datum/outfit/psycho/post_equip(mob/living/carbon/human/H) /datum/outfit/psycho/post_equip(mob/living/carbon/human/H)
for(var/obj/item/carried_item in H.get_equipped_items()) for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
carried_item.add_mob_blood(H)//Oh yes, there will be blood... carried_item.add_mob_blood(H)//Oh yes, there will be blood...
for(var/obj/item/I in H.held_items) for(var/obj/item/I in H.held_items)
I.add_mob_blood(H) I.add_mob_blood(H)

2
code/modules/mob/inventory.dm
View File

@@ -379,7 +379,7 @@
/mob/living/proc/unequip_everything() /mob/living/proc/unequip_everything()
var/list/items = list() var/list/items = list()
items |= get_equipped_items() items |= get_equipped_items(TRUE)
for(var/I in items) for(var/I in items)
dropItemToGround(I) dropItemToGround(I)
drop_all_held_items() drop_all_held_items()

6
code/modules/mob/transform_procs.dm
View File

@@ -23,7 +23,7 @@
CH.cavity_item = null CH.cavity_item = null
if(tr_flags & TR_KEEPITEMS) if(tr_flags & TR_KEEPITEMS)
var/Itemlist = get_equipped_items() var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items Itemlist += held_items
for(var/obj/item/W in Itemlist) for(var/obj/item/W in Itemlist)
dropItemToGround(W) dropItemToGround(W)
@@ -173,7 +173,7 @@
//now the rest //now the rest
if (tr_flags & TR_KEEPITEMS) if (tr_flags & TR_KEEPITEMS)
var/Itemlist = get_equipped_items() var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items Itemlist += held_items
for(var/obj/item/W in Itemlist) for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE) dropItemToGround(W, TRUE)
@@ -493,7 +493,7 @@
SSblackbox.record_feedback("amount", "gorillas_created", 1) SSblackbox.record_feedback("amount", "gorillas_created", 1)
var/Itemlist = get_equipped_items() var/Itemlist = get_equipped_items(TRUE)
Itemlist += held_items Itemlist += held_items
for(var/obj/item/W in Itemlist) for(var/obj/item/W in Itemlist)
dropItemToGround(W, TRUE) dropItemToGround(W, TRUE)