cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes a mind transfer exploit concerning holopara/guardians. (#7261)

Browse Source 
* Fixes a mind transfer exploit concerning holopara/guardians. (#60533)

Inverts the positions of the guardian/holoparasite typecheck code and the anti_magic/antag datums one.

* Fixes a mind transfer exploit concerning holopara/guardians.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-08-01 11:39:17 +01:00
committed by GitHub
co-authored by Ghom
parent 52998a3993
commit 5416eaf6f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/pointed/mind_transfer.dm
+4 -4
View File
@@ -29,15 +29,15 @@
return FALSE
var/mob/living/victim = targets[1] //The target of the spell whos body will be transferred to.
if(istype(victim, /mob/living/simple_animal/hostile/guardian))
var/mob/living/simple_animal/hostile/guardian/stand = victim
if(stand.summoner)
victim = stand.summoner
var/datum/mind/VM = victim.mind
if(victim.anti_magic_check(TRUE, FALSE) || VM.has_antag_datum(/datum/antagonist/wizard) || VM.has_antag_datum(/datum/antagonist/cult) || VM.has_antag_datum(/datum/antagonist/changeling) || VM.has_antag_datum(/datum/antagonist/rev) || victim.key[1] == "@")
if(!silent)
to_chat(user, span_warning("[victim.p_their(TRUE)] mind is resisting your spell!"))
return FALSE
if(istype(victim, /mob/living/simple_animal/hostile/guardian))
var/mob/living/simple_animal/hostile/guardian/stand = victim
if(stand.summoner)
victim = stand.summoner
//You should not be able to enter one of the most powerful side-antags as a fucking wizard.
if(istype(victim,/mob/living/simple_animal/hostile/imp/slaughter))