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

Merge branch 'master' into upstream-merge-29923

Browse Source
This commit is contained in:
LetterJay
2017-08-28 09:19:44 -05:00
committed by GitHub
parent 739d5c70a7 27750d91d6
commit defab9c7fc
1507 changed files with 70692 additions and 85572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/transform_procs.dm
+4 -4
View File
@@ -9,7 +9,7 @@
if (tr_flags & TR_KEEPIMPLANTS)
for(var/X in implants)
var/obj/item/weapon/implant/IMP = X
var/obj/item/implant/IMP = X
stored_implants += IMP
IMP.removed(src, 1, 1)
@@ -83,7 +83,7 @@
//re-add implants to new mob
if (tr_flags & TR_KEEPIMPLANTS)
for(var/Y in implants)
var/obj/item/weapon/implant/IMP = Y
var/obj/item/implant/IMP = Y
IMP.implant(O, null, 1)
//re-add organs to new mob. this order prevents moving the mind to a brain at any point
@@ -155,7 +155,7 @@
if (tr_flags & TR_KEEPIMPLANTS)
for(var/X in implants)
var/obj/item/weapon/implant/IMP = X
var/obj/item/implant/IMP = X
stored_implants += IMP
IMP.removed(src, 1, 1)
@@ -238,7 +238,7 @@
//re-add implants to new mob
if (tr_flags & TR_KEEPIMPLANTS)
for(var/Y in implants)
var/obj/item/weapon/implant/IMP = Y
var/obj/item/implant/IMP = Y
IMP.implant(O, null, 1)
if(tr_flags & TR_KEEPORGANS)