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

Merge pull request #14147 from SabreML/Cling-bugfixes-1

Browse Source 
A couple of cling bodyswap bugfixes
This commit is contained in:
variableundefined
2020-08-28 19:24:33 -04:00
committed by GitHub
parent e494f0ca6b acc28f9910
commit b728a3dc49
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/powers/swap_form.dm
+6 -1
View File
@@ -18,12 +18,15 @@
if((NOCLONE || SKELETON || HUSK) in target.mutations)
to_chat(user, "<span class='warning'>DNA of [target] is ruined beyond usability!</span>")
return
if(!istype(target) || issmall(target) || (NO_DNA in target.dna.species.species_traits))
if(!istype(target) || !target.mind || issmall(target) || (NO_DNA in target.dna.species.species_traits))
to_chat(user, "<span class='warning'>[target] is not compatible with this ability.</span>")
return
if(target.mind.changeling)
to_chat(user, "<span class='warning'>We are unable to swap forms with another changeling!</span>")
return
if(target.has_brain_worms() || user.has_brain_worms())
to_chat(user, "<span class='warning'>A foreign presence repels us from this body!</span>")
return
return 1
/datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user)
@@ -63,6 +66,8 @@
target.add_language("Changeling")
user.remove_language("Changeling")
user.regenerate_icons()
if(target.stat == DEAD && target.suiciding) //If Target committed suicide, unset flag for User
target.suiciding = 0
for(var/power in lingpowers)
var/datum/action/changeling/S = power