mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 03:55:05 +01:00
Waterbreath Trait
This commit is contained in:
@@ -28,21 +28,21 @@
|
||||
/obj/machinery/poolcontroller/invisible/sea
|
||||
name = "Sea Controller"
|
||||
desc = "A controller for the underwater portion of the sea. Players shouldn't see this."
|
||||
deep_water = TRUE
|
||||
deep_water = TRUE
|
||||
|
||||
/obj/machinery/poolcontroller/Initialize(mapload)
|
||||
var/contents_loop = linked_area
|
||||
/obj/machinery/poolcontroller/Initialize(mapload)
|
||||
var/contents_loop = linked_area
|
||||
if(!linked_area)
|
||||
contents_loop = range(srange, src)
|
||||
|
||||
for(var/turf/T in contents_loop)
|
||||
if(istype(T, /turf/simulated/floor/beach/water))
|
||||
var/turf/simulated/floor/beach/water/W = T
|
||||
W.linkedcontroller = src
|
||||
W.linkedcontroller = src
|
||||
linkedturfs += T
|
||||
else if(istype(T, /turf/unsimulated/beach/water))
|
||||
var/turf/unsimulated/beach/water/W = T
|
||||
W.linkedcontroller = src
|
||||
W.linkedcontroller = src
|
||||
linkedturfs += T
|
||||
|
||||
. = ..()
|
||||
@@ -121,7 +121,7 @@
|
||||
return //Has internals, no drowning
|
||||
if((NO_BREATHE in drownee.dna.species.species_traits) || (BREATHLESS in drownee.mutations))
|
||||
return //doesn't breathe, no drowning
|
||||
if(isskrell(drownee) || isneara(drownee))
|
||||
if(HAS_TRAIT(drownee,TRAIT_WATERBREATH))
|
||||
return //fish things don't drown
|
||||
|
||||
if(drownee.stat == DEAD) //Dead spacemen don't drown more
|
||||
|
||||
Reference in New Issue
Block a user