mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
complete and total revert of adam changes to tinfoil hat code (#34485)
* complete and total revert of adam changes to tinfoil hat code * forgot some changes * fix map * this map stuff isnt even related to my changes but whatever * quotes * revert map changes to avoid merge conflict for upcoming refactor * newline
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
/mob/living/carbon/human/proc/handle_disabilities()
|
||||
if(stat == DEAD)
|
||||
return
|
||||
if(disabilities & ELECTROSENSE && !dna.GetSEState(JAMSIGNALSBLOCK))
|
||||
if(disabilities & ELECTROSENSE)
|
||||
var/affect_chance = 30
|
||||
var/affected = FALSE
|
||||
if(head && istype(head,/obj/item/clothing/head/tinfoil))
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
isRemoteObserve = 0
|
||||
|
||||
//Does he have psy resist?
|
||||
if(!can_mind_interact(remoteview_target.mind))
|
||||
if(M_PSY_RESIST in remoteview_target.mutations)
|
||||
to_chat(src, "<span class='warning'>Your mind is shut out!</span>")
|
||||
isRemoteObserve = 0
|
||||
|
||||
|
||||
@@ -1368,11 +1368,8 @@ var/list/has_died_as_golem = list()
|
||||
|
||||
var/all_switch = TRUE
|
||||
for(var/mob/living/T in telepathic_target)
|
||||
if(istype(T) && can_mind_interact(T.mind))
|
||||
to_chat(T,"<span class='mushroom'>You feel <b>[M]</b>'s thoughts: \"[message]\"</span>")
|
||||
else
|
||||
to_chat(M,"<span class='notice'>[T] cannot sense your telepathy.</span>")
|
||||
continue
|
||||
if(istype(T) && M.can_mind_interact(T))
|
||||
to_chat(T,"<span class='mushroom'>You feel <b>[M]</b>'s thoughts: </span><span class='mushroom'>[message]</span>")
|
||||
if(all_switch)
|
||||
all_switch = FALSE
|
||||
if(T != M)
|
||||
|
||||
Reference in New Issue
Block a user