Merge pull request #14791 from AnturK/mindswapfixes

Mindswap fixes
This commit is contained in:
tkdrg
2016-01-24 13:31:51 -03:00
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -43,7 +43,7 @@ Also, you never added distance checking after target is selected. I've went ahea
user << "<span class='warning'>They appear to be catatonic! Not even magic can affect their vacant mind.</span>"
return
if(target.mind.special_role in protected_roles)
if((target.mind.special_role in protected_roles) || cmptext(copytext(target.key,1,2),"@"))
user << "<span class='warning'>Their mind is resisting your spell!</span>"
return
@@ -69,6 +69,7 @@ Also, you never added distance checking after target is selected. I've went ahea
ghost.mind.transfer_to(caster)
if(ghost.key)
caster.key = ghost.key //have to transfer the key since the mind was not active
qdel(ghost)
if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here.
for(var/V in caster.mind.special_verbs)
+1 -1
View File
@@ -18,7 +18,7 @@ var/list/ai_list = list()
icon_state = "ai"
anchored = 1
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
status_flags = CANSTUN|CANPUSH
force_compose = 1 //This ensures that the AI always composes it's own hear message. Needed for hrefs and job display.
med_hud = DATA_HUD_MEDICAL_BASIC
sec_hud = DATA_HUD_SECURITY_BASIC