From c5a23266a974e35a0ec6c9501b4a75e5433df0d5 Mon Sep 17 00:00:00 2001 From: InsightfulParasite Date: Sat, 14 Dec 2024 13:42:54 -0500 Subject: [PATCH] Fix Mermaid Water Tiles ## About The Pull Request Fixes mermaid AI. Mermaid on spawn is placed on deep water tiles that are labeled as dense but coded to be non dense in order to force mobs to avoid them. Mermaids AI thinks that she is in a 3by3 wall due to this. I changed obsessing water subtype to nondense. to fix this. ## Changelog :cl: tweak: obsessing water is now non dense. /:cl: --- ModularTegustation/fishing/code/turfs.dm | 9 +++++---- lobotomy-corp13.dme | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ModularTegustation/fishing/code/turfs.dm b/ModularTegustation/fishing/code/turfs.dm index 8c3be001686c..7a30e9b72816 100644 --- a/ModularTegustation/fishing/code/turfs.dm +++ b/ModularTegustation/fishing/code/turfs.dm @@ -331,9 +331,6 @@ /obj/item/food/fish/emulsijack = 5, ) -/turf/open/water/deep/polluted/ObjSink(atom/movable/sinkin_thing) - return TRUE - /* Change this later so that it is not a subtype since the variable is in the deep type. Safe subtype isnt nessesary since it pre sets safe to TRUE when we can just set it to true individually.-IP*/ @@ -342,14 +339,18 @@ * Safe turfs, they wont sink you when you enter them */ +/turf/open/water/deep/saltwater + density = FALSE + /turf/open/water/deep/saltwater/safe/IsSafe() return TRUE /turf/open/water/deep/obsessing_water - safe = TRUE name = "Obsessing water" desc = "A strange black and teal water." icon_state = "obsessing_water" + safe = TRUE + density = FALSE loot_level1 = list( /obj/item/stack/sheet/mineral/wood = 30, /obj/item/food/grown/harebell = 35, diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index ebe6abe2945d..33e9a295f795 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -2373,8 +2373,8 @@ #include "code\modules\jobs\job_types\city\civilian.dm" #include "code\modules\jobs\job_types\city\doctor.dm" #include "code\modules\jobs\job_types\city\HHPP.dm" -#include "code\modules\jobs\job_types\city\rat.dm" #include "code\modules\jobs\job_types\city\prosthetic.dm" +#include "code\modules\jobs\job_types\city\rat.dm" #include "code\modules\jobs\job_types\city\workshop.dm" #include "code\modules\jobs\job_types\city\fixer\east.dm" #include "code\modules\jobs\job_types\city\fixer\north.dm"