mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
small typo trait not traits
This commit is contained in:
@@ -29,11 +29,11 @@
|
|||||||
handle_fish()
|
handle_fish()
|
||||||
// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.
|
// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.
|
||||||
// soundloop.start() // CHOMPEdit: Removing soundloop for now.
|
// soundloop.start() // CHOMPEdit: Removing soundloop for now.
|
||||||
|
|
||||||
/turf/simulated/floor/water/Destroy()
|
/turf/simulated/floor/water/Destroy()
|
||||||
// soundloop.stop() // CHOMPEdit: Removing soundloop for now.
|
// soundloop.stop() // CHOMPEdit: Removing soundloop for now.
|
||||||
// QDEL_NULL(soundloop) // CHOMPEdit: Removing soundloop for now.
|
// QDEL_NULL(soundloop) // CHOMPEdit: Removing soundloop for now.
|
||||||
|
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|
||||||
/turf/simulated/floor/water/update_icon()
|
/turf/simulated/floor/water/update_icon()
|
||||||
@@ -201,7 +201,13 @@ var/list/shoreline_icon_cache = list()
|
|||||||
add_overlay(shoreline_icon_cache[cache_string])
|
add_overlay(shoreline_icon_cache[cache_string])
|
||||||
|
|
||||||
/turf/simulated/floor/water/is_safe_to_enter(mob/living/L)
|
/turf/simulated/floor/water/is_safe_to_enter(mob/living/L)
|
||||||
if(L.get_water_protection() < 1 || /datum/traits/positive/aquatic in L.species.traits) //CHOMPEDIT: Aquatic flags simulated water as safe now
|
//CHOMPEDIT: Aquatic flags simulated water as safe now
|
||||||
|
if(istype(L,/mob/living/carbon))
|
||||||
|
var /mob/living/carbon/A = L
|
||||||
|
if(/datum/trait/positive/aquatic in A.species.traits)
|
||||||
|
return TRUE
|
||||||
|
//CHOMPEDIT: Aquatic flags simulated water as safe now
|
||||||
|
if(L.get_water_protection() < 1)
|
||||||
return FALSE
|
return FALSE
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user