cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrites Atmospherics

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/blob2/blobs/base_blob.dm
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.