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

Update dna.dm

Browse Source
This commit is contained in:
LetterJay
2018-04-12 07:04:09 -05:00
committed by GitHub
parent 2aff700c14
commit dcff61724a
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/dna.dm
-6
View File
@@ -13,11 +13,6 @@
var/mob/living/holder var/mob/living/holder
/datum/dna/New(mob/living/new_holder) /datum/dna/New(mob/living/new_holder)
<<<<<<< HEAD
if(new_holder)
holder = new_holder
=======
if(istype(new_holder)) if(istype(new_holder))
holder = new_holder holder = new_holder
@@ -35,7 +30,6 @@
return ..() return ..()
>>>>>>> a6e8247... Fixes brain dna (#37132)
/datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0) /datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0)
if(!istype(destination)) if(!istype(destination))
return return