mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-10 14:44:05 +01:00
Fixes issue 159
Picking up items during lesser form transformation as changeling should (for the most part) prevent them from being deleted. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3210 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -216,9 +216,6 @@
|
||||
if (istype(W, /obj/item/weapon/implant))
|
||||
implants += W
|
||||
|
||||
for(var/obj/item/W in usr)
|
||||
usr.drop_from_slot(W)
|
||||
|
||||
usr.update_clothing()
|
||||
usr.monkeyizing = 1
|
||||
usr.canmove = 0
|
||||
@@ -237,6 +234,10 @@
|
||||
usr.dna = null
|
||||
O.changeling = usr.changeling
|
||||
|
||||
for(var/obj/item/W in usr)
|
||||
usr.drop_from_slot(W)
|
||||
|
||||
|
||||
for(var/obj/T in usr)
|
||||
del(T)
|
||||
//for(var/R in usr.organs) //redundant, let's give garbage collector work to do --rastaf0
|
||||
@@ -301,15 +302,6 @@
|
||||
for (var/obj/item/weapon/implant/I in usr) //Still preserving implants
|
||||
implants += I
|
||||
|
||||
for(var/obj/item/W in usr)
|
||||
usr.u_equip(W)
|
||||
if (usr.client)
|
||||
usr.client.screen -= W
|
||||
if (W)
|
||||
W.loc = usr.loc
|
||||
W.dropped(usr)
|
||||
W.layer = initial(W.layer)
|
||||
|
||||
usr.update_clothing()
|
||||
usr.monkeyizing = 1
|
||||
usr.canmove = 0
|
||||
@@ -323,6 +315,15 @@
|
||||
sleep(48)
|
||||
del(animation)
|
||||
|
||||
for(var/obj/item/W in usr)
|
||||
usr.u_equip(W)
|
||||
if (usr.client)
|
||||
usr.client.screen -= W
|
||||
if (W)
|
||||
W.loc = usr.loc
|
||||
W.dropped(usr)
|
||||
W.layer = initial(W.layer)
|
||||
|
||||
var/mob/living/carbon/human/O = new /mob/living/carbon/human( src )
|
||||
if (isblockon(getblock(usr.dna.uni_identity, 11,3),11))
|
||||
O.gender = FEMALE
|
||||
|
||||
Reference in New Issue
Block a user