cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 14:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11315 from farie82/Species-transformation-fix

Browse Source 
Fixes species transformations not retaining items correctly
This commit is contained in:
variableundefined
2019-05-07 16:56:21 +08:00
committed by GitHub
parent 4e094990d7 0fc58330cd
commit 6c174cdee5
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/powers/mutations.dm
-9
View File
@@ -132,15 +132,6 @@
throw_range = 0
throw_speed = 0
/obj/item/melee/arm_blade/New()
..()
if(ismob(loc))
loc.visible_message("<span class='warning'>A grotesque blade forms around [loc.name]\'s arm!</span>", "<span class='warning'>Our arm twists and mutates, transforming it into a deadly blade.</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
/obj/item/melee/arm_blade/dropped(mob/user)
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms [user.p_their()] blade into an arm!</span>", "<span class='notice'>We assimilate the blade back into our body.</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
. = ..()
/obj/item/melee/arm_blade/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
code/modules/mob/living/carbon/human/human.dm
+5 -2
View File
@@ -1331,11 +1331,13 @@
var/list/thing_to_check = list(slot_wear_mask, slot_head, slot_shoes, slot_gloves, slot_l_ear, slot_r_ear, slot_glasses, slot_l_hand, slot_r_hand)
var/list/kept_items[0]
var/list/item_flags[0]
for(var/thing in thing_to_check)
var/obj/item/I = get_item_by_slot(thing)
if(I)
kept_items[I] = thing
item_flags[I] = I.flags
I.flags = 0 // Temporary set the flags to 0
if(retain_damage)
//Create a list of body parts which are damaged by burn or brute and save them to apply after new organs are generated. First we just handle external organs.
@@ -1401,8 +1403,9 @@
else
dna.species.create_organs(src)
for(var/thing in kept_items)
for(var/obj/item/thing in kept_items)
equip_to_slot_if_possible(thing, kept_items[thing], redraw_mob = 0)
thing.flags = item_flags[thing] // Reset the flags to the origional ones
//Handle default hair/head accessories for created mobs.
var/obj/item/organ/external/head/H = get_organ("head")