Fluffy-Frontier · AnywayFarus · Jan 15, 2025 · Dec 16, 2024 · Dec 24, 2024 · Dec 27, 2024
diff --git a/.github/guides/ISSUE_MANAGER.md b/.github/guides/ISSUE_MANAGER.md
@@ -28,8 +28,8 @@ If an issue reports a runtime, it must have the actual runtime call stack provid
  -   usr.loc: the floor (150,25,4) (/turf/open/floor/circuit)
  -   call stack:
  - Camera Net (/datum/cameranet): visibility(/list (/list), null, /list (/list), 1)
- - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/ai_eye))
- - Inactive AI Eye (/mob/eye/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
+ - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/camera/ai))
+ - Inactive AI Eye (/mob/eye/camera/ai): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
  - AI (/mob/living/silicon/ai): create eye()
  - AI (/mob/living/silicon/ai): Initialize(0, null, TagGamerGame2 (/mob/dead/new_player))
  - Atoms (/datum/controller/subsystem/atoms): InitAtom(AI (/mob/living/silicon/ai), 0, /list (/list))

diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md
@@ -2,19 +2,30 @@ Any time you make a change to the schema files, remember to increment the databa
 
 Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.
 
-The latest database version is 5.29 (5.27 for /tg/);; The query to update the schema revision table is:
+The latest database version is 5.30 (5.28 for /tg/);; The query to update the schema revision table is:
 
 ```sql
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 29);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 30);
 ```
 or
 
 ```sql
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 29);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 30);
 ```
-
 In any query remember to add a prefix to the table names if you use one.
 -----------------------------------------------------
+Version 5.28, 1 November 2024, by Ghommie
+Added `fish_progress` as the first 'progress' subtype of 'datum/award/scores'
+
+```sql
+CREATE TABLE `fish_progress` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `progress_entry` VARCHAR(32) NOT NULL,
+  `datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ckey`,`progress_entry`)
+) ENGINE=InnoDB;
+```
+-----------------------------------------------------
 Version 5.29, 26 April 2024, by zephyrtfa
 Add the ip intel table
 ```sql

diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
@@ -599,6 +599,16 @@ CREATE TABLE `achievement_metadata` (
 	PRIMARY KEY (`achievement_key`)
 ) ENGINE=InnoDB;
 
+-- Table structure for table 'x_progress'
+
+DROP TABLE IF EXISTS `fish_progress`;
+CREATE TABLE `fish_progress` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `progress_entry` VARCHAR(32) NOT NULL,
+  `datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ckey`,`progress_entry`)
+) ENGINE=InnoDB;
+
 --
 -- Table structure for table `ticket`
 --

diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
@@ -597,6 +597,16 @@ CREATE TABLE `SS13_achievement_metadata` (
 	PRIMARY KEY (`achievement_key`)
 ) ENGINE=InnoDB;
 
+-- Table structure for table 'SS13_x_progress'
+
+DROP TABLE IF EXISTS `SS13_fish_progress`;
+CREATE TABLE `fish_progress` (
+  `ckey` VARCHAR(32) NOT NULL,
+  `progress_entry` VARCHAR(32) NOT NULL,
+  `datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ckey`,`progress_entry`)
+) ENGINE=InnoDB;
+
 --
 -- Table structure for table `SS13_ticket`
 --

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hotsprings.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_hotsprings.dmm
@@ -6,14 +6,22 @@
 /turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors/unexplored)
 "c" = (
-/turf/open/water/cursed_spring,
+/turf/open/water/hot_spring/cursed,
 /area/icemoon/surface/outdoors/noteleport)
 "d" = (
 /obj/item/paper/crumpled{
 	default_raw_text = "When one falls into this hot spring, they shall forever be turned into..."
 	},
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors)
+"l" = (
+/obj/structure/chair/plastic,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
+"G" = (
+/obj/item/storage/toolbox/fishing,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
 
 (1,1,1) = {"
 b
@@ -70,7 +78,7 @@ b
 (5,1,1) = {"
 b
 a
-a
+G
 c
 c
 c
@@ -83,7 +91,7 @@ b
 (6,1,1) = {"
 b
 a
-a
+l
 c
 c
 c

diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_icewalker_lower.dmm
@@ -178,7 +178,7 @@
 	name = "thick vines";
 	opacity = 1
 	},
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "de" = (
 /obj/structure/wall_torch/spawns_lit/directional/south,
@@ -490,7 +490,7 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "lf" = (
 /obj/structure/wall_torch/spawns_lit/directional/east,
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "lg" = (
 /obj/structure/rack/wooden,
@@ -681,7 +681,7 @@
 /turf/open/misc/dirt/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "oJ" = (
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "oK" = (
 /obj/effect/turf_decal/weather/snow/corner{
@@ -869,7 +869,7 @@
 /obj/structure/chair/sofa/bamboo/right{
 	dir = 1
 	},
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "sf" = (
 /obj/structure/flora/ash/leaf_shroom,
@@ -1094,7 +1094,7 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "yD" = (
 /obj/structure/chair/sofa/bamboo/left,
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "yE" = (
 /turf/open/floor/stone/icemoon,
@@ -1802,10 +1802,10 @@
 	pixel_y = 5;
 	pixel_x = 3
 	},
-/obj/item/fish/dwarf_moonfish{
+/obj/item/fish/moonfish/dwarf{
 	pixel_x = -5
 	},
-/obj/item/fish/dwarf_moonfish{
+/obj/item/fish/moonfish/dwarf{
 	pixel_x = -2;
 	pixel_y = 8
 	},
@@ -1965,7 +1965,7 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "RE" = (
 /obj/structure/chair/sofa/bamboo/right,
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "RG" = (
 /obj/structure/closet/crate/wooden/storage_barrel,
@@ -1984,7 +1984,7 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "RO" = (
 /obj/structure/wall_torch/spawns_lit/directional/west,
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "RR" = (
 /obj/structure/stairs/wood,
@@ -2246,7 +2246,7 @@
 /obj/structure/chair/sofa/bamboo/left{
 	dir = 1
 	},
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "ZY" = (
 /obj/effect/turf_decal/siding/wood/corner{

diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_magical_hotsprings.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_magical_hotsprings.dmm
@@ -55,10 +55,10 @@
 /mob/living/basic/lightgeist{
 	light_color = "#42ECFF"
 	},
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/magic_hotsprings)
 "I" = (
-/turf/open/water/hot_spring,
+/turf/open/water/hot_spring/icemoon,
 /area/ruin/unpowered/magic_hotsprings)
 "J" = (
 /obj/structure/flora/bush/lavendergrass/style_random,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm
@@ -62,7 +62,7 @@
 /turf/open/floor/plating/lavaland_atmos,
 /area/ruin/unpowered)
 "l" = (
-/turf/open/water/lavaland_atmos,
+/turf/open/water/hot_spring/lavaland_atmos,
 /area/lavaland/surface)
 "m" = (
 /obj/machinery/door/airlock/survival_pod/glass,
@@ -118,7 +118,7 @@
 /obj/structure/chair/plastic{
 	dir = 8
 	},
-/turf/open/misc/ashplanet/wateryrock,
+/turf/open/misc/ashplanet/wateryrock/lavaland_atmos,
 /area/lavaland/surface)
 "y" = (
 /obj/structure/chair/comfy/shuttle{
@@ -129,7 +129,7 @@
 /area/ruin/unpowered)
 "z" = (
 /obj/item/book/manual/fish_catalog,
-/turf/open/misc/ashplanet/wateryrock,
+/turf/open/misc/ashplanet/wateryrock/lavaland_atmos,
 /area/lavaland/surface)
 "B" = (
 /mob/living/basic/mining/goliath,
@@ -140,7 +140,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface)
 "E" = (
-/turf/open/misc/ashplanet/wateryrock,
+/turf/open/misc/ashplanet/wateryrock/lavaland_atmos,
 /area/lavaland/surface)
 "F" = (
 /obj/effect/mob_spawn/corpse/human/cargo_tech,
@@ -175,7 +175,7 @@
 /area/ruin/powered)
 "L" = (
 /obj/item/storage/toolbox/fishing,
-/turf/open/misc/ashplanet/wateryrock,
+/turf/open/misc/ashplanet/wateryrock/lavaland_atmos,
 /area/lavaland/surface)
 "M" = (
 /obj/structure/rack,
@@ -213,7 +213,7 @@
 /area/ruin/powered)
 "U" = (
 /obj/item/bait_can/worm/premium,
-/turf/open/misc/ashplanet/wateryrock,
+/turf/open/misc/ashplanet/wateryrock/lavaland_atmos,
 /area/lavaland/surface)
 "V" = (
 /obj/structure/table/survival_pod,

diff --git a/_maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm
@@ -5681,7 +5681,7 @@
 	dir = 4
 	},
 /obj/machinery/mecha_part_fabricator{
-	dir = 8
+	drop_direction = 8
 	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/port_tarkon/developement)

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -11,7 +11,6 @@
 		#include "map_files\IceBoxStation\IceBoxStation.dmm"
 		#include "map_files\MetaStation\MetaStation.dmm"
 		#include "map_files\Mining\Lavaland.dmm"
-		#include "map_files\NorthStar\north_star.dmm"
 		#include "map_files\tramstation\tramstation.dmm"
 		#include "map_files\NebulaStation\NebulaStation.dmm"
 		#include "map_files\wawastation\wawastation.dmm"