Makes pulse demons not affected by bee stings or thrown pies (#36222)

* Makes pulse demons not affected by bee stings or thrown pies

* DON'T MAKE IT FALSE BY DEFAULT!

* sane refactor

---------

Co-authored-by: SECBATON-GRIFFON <>
This commit is contained in:
SECBATON GRIFFON
2024-03-27 16:48:04 +00:00
committed by GitHub
parent df4401fc69
commit 35156bf62d
5 changed files with 15 additions and 1 deletions

View File

@@ -390,7 +390,7 @@ var/list/astral_projections = list()
now_pushing = 1 //prevents pushing atoms
//keeps track of whether we're in "ghost" form or "slightly less ghost" form
var/tangibility = FALSE
tangibility = FALSE
//the cultist's original body
var/mob/living/anchor

View File

@@ -223,6 +223,10 @@ var/global/objects_thrown_when_explode = FALSE
/obj/item/throw_impact(atom/impacted_atom, speed, mob/user)
..()
if(isliving(impacted_atom))
var/mob/living/L = impacted_atom
if(!L.tangibility)
return 1
if(isturf(impacted_atom))
var/turf/T = impacted_atom
if(objects_thrown_when_explode || (T.arcanetampered && T.arcanetampered != user))

View File

@@ -84,3 +84,4 @@
var/blood_color2 //color of this creature's blood for gibbing purposes (humanoids have their own species-defined values)
var/flesh_color2 //color of this creature's flesh for meat purposes (humanoids have their own species-defined values)
var/tangibility = 1 //can this mob be interacted with things hitting it and etc?

View File

@@ -639,6 +639,10 @@ var/bee_mobs_count = 0
return
if (!Adjacent(target))
return
if(isliving(target))
var/mob/living/L = target
if(!L.tangibility)
return
var/mob/living/carbon/human/M = target
var/sting_prob = 100
if(istype(M))

View File

@@ -27,6 +27,7 @@
flying = 1
size = SIZE_TINY
density = 0 //people walk over you isntead of bumping
tangibility = 0
attacktext = "electrocutes"
attack_sound = "sparks"
@@ -327,6 +328,10 @@
/mob/living/simple_animal/hostile/pulse_demon/vine_protected()
return 1
/mob/living/simple_animal/hostile/pulse_demon/hitby(atom/movable/AM, speed, dir, list/hit_whitelist)
if(!is_under_tile())
visible_message("<span class ='notice'>\the [AM] goes right through \the [src]!</span>")
// Unless...
/mob/living/simple_animal/hostile/pulse_demon/Crossed(atom/movable/AM)
. = ..()