Merge pull request #9593 from Ghommie/Ghommie-cit263

Fixing gulag teleporter stripping the user of stuff it really shouldn't.
This commit is contained in:
kevinz000
2019-10-24 19:10:17 -07:00
committed by GitHub
+13 -12
View File
@@ -135,18 +135,19 @@ The console is located at computer/gulag_teleporter.dm
if(linked_reclaimer)
linked_reclaimer.stored_items[occupant] = list()
var/mob/living/mob_occupant = occupant
for(var/obj/item/W in mob_occupant)
if(!is_type_in_typecache(W, telegulag_required_items))
if(mob_occupant.temporarilyRemoveItemFromInventory(W))
if(istype(W, /obj/item/restraints/handcuffs))
W.forceMove(get_turf(src))
continue
if(linked_reclaimer)
linked_reclaimer.stored_items[mob_occupant] += W
linked_reclaimer.contents += W
W.forceMove(linked_reclaimer)
else
W.forceMove(src)
for(var/A in mob_occupant.get_equipped_items(TRUE))
var/obj/item/I = A
if(is_type_in_typecache(I, telegulag_required_items) || !mob_occupant.temporarilyRemoveItemFromInventory(I))
continue
if(istype(I, /obj/item/restraints/handcuffs))
I.forceMove(get_turf(src))
continue
if(linked_reclaimer)
linked_reclaimer.stored_items[mob_occupant] += I
linked_reclaimer.contents += I
I.forceMove(linked_reclaimer)
else
I.forceMove(src)
/obj/machinery/gulag_teleporter/proc/handle_prisoner(obj/item/id, datum/data/record/R)
if(!ishuman(occupant))