Rewrites Atmospherics

This commit is contained in:
Anewbe
2019-02-10 17:32:39 -06:00
committed by Novacat
parent 6d4ea26332
commit 8ed384b38c
49 changed files with 633 additions and 640 deletions

View File

@@ -46,9 +46,8 @@ var/list/blobs = list()
color = null
set_light(0)
/obj/structure/blob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0))
return TRUE
// Blob tiles are not actually dense so we need Special Code(tm).
/obj/structure/blob/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSBLOB))
return TRUE
else if(istype(mover, /mob/living))
@@ -57,12 +56,9 @@ var/list/blobs = list()
return TRUE
else if(istype(mover, /obj/item/projectile))
var/obj/item/projectile/P = mover
if(P.firer && P.firer.faction == "blob")
if(istype(P.firer) && P.firer.faction == "blob")
return TRUE
return FALSE
else
return FALSE
// return ..()
return FALSE
/obj/structure/blob/examine(mob/user)
..()
@@ -257,7 +253,7 @@ var/list/blobs = list()
if(!P)
return
if(P.firer && P.firer.faction == "blob")
if(istype(P.firer) && P.firer.faction == "blob")
return
var/damage = P.get_structure_damage() // So tasers don't hurt the blob.

View File

@@ -6,6 +6,7 @@
desc = "A solid wall of slightly twitching tendrils."
max_integrity = 100
point_return = 4
can_atmos_pass = ATMOS_PASS_NO
/obj/structure/blob/shield/core
point_return = 0