Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Mermaid Water Tiles #2609

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix Mermaid Water Tiles #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ModularTegustation/fishing/code/turfs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lobotomy-corp13.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading