Merge pull request #1216 from SaraSayomi/Snaxi-regretti

Snaxi regretti

_maps/RandomRuins/StationRuins/maint/icemaint_center/icemaint_center_boring.dmm

@@ -0,0 +1,209 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/unexplored/rivers)
+"f" = (
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"h" = (
+/turf/closed/wall/mineral/snow,
+/area/maintenance/central/frozen/lower)
+"v" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/explored)
+"C" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"V" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+
+(1,1,1) = {"
+h
+h
+h
+h
+h
+h
+h
+f
+C
+"}
+(2,1,1) = {"
+h
+v
+v
+v
+v
+v
+h
+h
+h
+"}
+(3,1,1) = {"
+h
+v
+v
+v
+v
+v
+v
+v
+v
+"}
+(4,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(12,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(13,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(14,1,1) = {"
+h
+v
+v
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+h
+h
+v
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+V
+h
+v
+a
+a
+a
+a
+a
+a
+"}

_maps/RandomRuins/StationRuins/maint/icemaint_center/icemaint_center_danger.dmm

@@ -0,0 +1,322 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/spawner/structure/window/ice,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"b" = (
+/obj/structure/chair/wood/normal,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"c" = (
+/turf/closed/wall/mineral/snow,
+/area/maintenance/central/frozen/lower)
+"d" = (
+/obj/structure/flora/stump/mushroom,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"e" = (
+/obj/structure/flora/biolumi/mine,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"f" = (
+/turf/open/floor/plasteel/stairs/left{
+	dir = 4
+	},
+/area/maintenance/central/frozen/lower)
+"g" = (
+/obj/structure/chair/wood/normal{
+	dir = 4
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"h" = (
+/obj/structure/bonfire/prelit,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"i" = (
+/obj/structure/flora/tree/spookybranch,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"k" = (
+/obj/structure/flora/tree/spookylog,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"p" = (
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"r" = (
+/turf/open/floor/plasteel/stairs/right,
+/area/maintenance/central/frozen/lower)
+"s" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/explored)
+"t" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/shoes/winterboots{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/item/clothing/shoes/winterboots{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"v" = (
+/obj/structure/flora/tree/mushroom,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"w" = (
+/obj/structure/flora/biolumi/lamp,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"A" = (
+/turf/open/floor/plasteel/stairs/medium{
+	dir = 4
+	},
+/area/maintenance/central/frozen/lower)
+"B" = (
+/obj/structure/flora/tree/spookytimexl,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"C" = (
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"D" = (
+/obj/structure/flora/biolumi/flower,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"G" = (
+/turf/open/floor/plasteel/stairs/medium,
+/area/maintenance/central/frozen/lower)
+"H" = (
+/obj/structure/chair/wood/normal{
+	dir = 8
+	},
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"K" = (
+/turf/open/floor/plasteel/stairs/left,
+/area/maintenance/central/frozen/lower)
+"M" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"N" = (
+/obj/structure/flora/rock/pile,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"Q" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/unexplored/rivers)
+"R" = (
+/obj/structure/flora/tree/pine,
+/turf/open/floor/grass/fairy/purple,
+/area/maintenance/central/frozen/lower)
+"S" = (
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"T" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"V" = (
+/obj/effect/spawner/structure/window/ice,
+/turf/open/space/basic,
+/area/maintenance/central/frozen/lower)
+"Y" = (
+/turf/open/floor/plasteel/stairs/right{
+	dir = 4
+	},
+/area/maintenance/central/frozen/lower)
+
+(1,1,1) = {"
+p
+p
+p
+p
+p
+t
+a
+S
+T
+"}
+(2,1,1) = {"
+p
+p
+p
+p
+p
+t
+a
+a
+a
+"}
+(3,1,1) = {"
+p
+p
+Y
+A
+A
+A
+A
+f
+a
+"}
+(4,1,1) = {"
+p
+K
+C
+C
+w
+C
+C
+C
+a
+"}
+(5,1,1) = {"
+p
+G
+i
+R
+C
+C
+C
+R
+a
+"}
+(6,1,1) = {"
+p
+G
+C
+C
+C
+C
+k
+C
+a
+"}
+(7,1,1) = {"
+p
+G
+C
+C
+C
+C
+v
+C
+a
+"}
+(8,1,1) = {"
+p
+G
+D
+C
+g
+C
+C
+C
+a
+"}
+(9,1,1) = {"
+p
+G
+C
+b
+h
+C
+C
+C
+a
+"}
+(10,1,1) = {"
+p
+G
+v
+C
+H
+C
+C
+d
+a
+"}
+(11,1,1) = {"
+p
+G
+C
+C
+C
+C
+e
+C
+a
+"}
+(12,1,1) = {"
+p
+G
+C
+C
+C
+C
+R
+C
+a
+"}
+(13,1,1) = {"
+p
+G
+C
+C
+R
+C
+C
+N
+a
+"}
+(14,1,1) = {"
+p
+r
+w
+C
+C
+C
+C
+B
+a
+"}
+(15,1,1) = {"
+a
+V
+V
+V
+V
+V
+V
+V
+V
+"}
+(16,1,1) = {"
+M
+c
+s
+Q
+Q
+Q
+Q
+Q
+Q
+"}

_maps/RandomRuins/StationRuins/maint/icemaint_center/icemaint_center_frosty.dmm

@@ -0,0 +1,234 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/snow,
+/area/maintenance/central/frozen/lower)
+"c" = (
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"g" = (
+/obj/machinery/door/airlock/public/glass,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"l" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/unexplored/rivers)
+"m" = (
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"o" = (
+/obj/effect/spawner/structure/window/ice,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"r" = (
+/obj/effect/decal/cleanable/semendrip,
+/turf/open/floor/plating,
+/area/maintenance/central/frozen/lower)
+"x" = (
+/obj/item/clothing/head/that{
+	desc = "It's an amish looking hat. This one is sticky with some white fluid."
+	},
+/obj/effect/decal/cleanable/semen,
+/turf/open/floor/plating,
+/area/maintenance/central/frozen/lower)
+"L" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"Q" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
+/turf/open/floor/plating/snowed/smoothed/warmer,
+/area/maintenance/central/frozen/lower)
+"S" = (
+/turf/closed/mineral/random/snow/underground,
+/area/icemoon/underground/explored)
+"Z" = (
+/turf/open/floor/plating,
+/area/maintenance/central/frozen/lower)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+g
+a
+c
+L
+"}
+(2,1,1) = {"
+a
+S
+S
+S
+o
+m
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+S
+S
+S
+o
+m
+a
+S
+S
+"}
+(4,1,1) = {"
+a
+S
+S
+S
+o
+m
+a
+l
+l
+"}
+(5,1,1) = {"
+a
+S
+S
+S
+o
+m
+a
+l
+l
+"}
+(6,1,1) = {"
+a
+S
+S
+a
+a
+g
+a
+a
+l
+"}
+(7,1,1) = {"
+a
+o
+o
+a
+r
+Z
+Z
+a
+l
+"}
+(8,1,1) = {"
+g
+m
+m
+g
+Z
+x
+r
+a
+l
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+r
+Z
+Z
+a
+l
+"}
+(10,1,1) = {"
+a
+S
+S
+a
+a
+a
+a
+a
+l
+"}
+(11,1,1) = {"
+a
+S
+S
+l
+l
+l
+l
+l
+l
+"}
+(12,1,1) = {"
+a
+S
+S
+l
+l
+l
+l
+l
+l
+"}
+(13,1,1) = {"
+a
+S
+S
+l
+l
+l
+l
+l
+l
+"}
+(14,1,1) = {"
+a
+S
+S
+l
+l
+l
+l
+l
+l
+"}
+(15,1,1) = {"
+a
+a
+S
+l
+l
+l
+l
+l
+l
+"}
+(16,1,1) = {"
+Q
+a
+S
+l
+l
+l
+l
+l
+l
+"}

_maps/smexistation.json

@@ -2,9 +2,7 @@
    "map_name":"Smexy (New Snow Taxi)",
    "map_path":"splurt_maps/map_files/Smexistation",
    "map_file":[
-      "IcemoonUnderground_Below_Splurt.dmm",
-      "IcemoonUnderground_Above_Splurt.dmm",
-      "Snaxi_Splurt.dmm"
+      "Snaxi_Splurt_v2.dmm"
    ],
    "station_ruin_budget":0,
    "space_ruin_levels":0,

code/datums/ruins/maint.dm

@@ -1034,3 +1034,59 @@
 	id = "halloween"
 	suffix = "10x10_halloween.dmm"
 	name = "Maint halloween"
+
+//Snaxi remake edits
+
+/datum/map_template/ruin/station/maint/smexi1
+	prefix = "_maps/RandomRuins/StationRuins/maint/icemaint_center/"
+
+/datum/map_template/ruin/station/maint/smexi1/icemaint_center_boring
+	id = "center_boring"
+	suffix = "icemaint_center_boring.dmm"
+	name = "Icemaint Center Boring"
+
+/datum/map_template/ruin/station/maint/smexi1/icemaint_center_danger
+	id = "center_danger"
+	suffix = "icemaint_center_danger.dmm"
+	name = "Icemaint Center Danger"
+
+/datum/map_template/ruin/station/maint/smexi1/icemaint_center_frosty
+	id = "center_frosty"
+	suffix = "icemaint_center_frosty.dmm"
+	name = "Icemaint Center Frosty"
+
+/datum/map_template/ruin/station/maint/smexi2
+	prefix = "_maps/RandomRuins/StationRuins/maint/icemaint_west/"
+
+/datum/map_template/ruin/station/maint/smexi2/icemaint_west_boring
+	id = "icemaint_west_boring"
+	suffix = "icemaint_west_boring.dmm"
+	name = "Icemaint West Boring"
+
+/datum/map_template/ruin/station/maint/smexi3
+	prefix = "_maps/RandomRuins/StationRuins/maint/icemaint_east/"
+
+/datum/map_template/ruin/station/maint/smexi3/icemaint_east_boring
+	id = "east_boring"
+	suffix = "icemaint_east_boring.dmm"
+	name = "Icemaint East Boring"
+
+/datum/map_template/ruin/station/maint/smexi3/icemaint_east_danger
+	id = "east_danger"
+	suffix = "icemaint_east_danger.dmm"
+	name = "Icemaint East Danger"
+
+/datum/map_template/ruin/station/maint/smexi3/icemaint_east_knotways
+	id = "east_knotways"
+	suffix = "icemaint_east_knotways.dmm"
+	name = "Icemaint East Knotways"
+
+/datum/map_template/ruin/station/maint/smexi3/icemaint_east_icering
+	id = "east_icering"
+	suffix = "icemaint_east_icering.dmm"
+	name = "Icemaint East Icering"
+
+/datum/map_template/ruin/station/maint/smexi3/icemaint_east_maze
+	id = "east_maze"
+	suffix = "icemaint_east_maze.dmm"
+	name = "Icemaint East Maze"

code/game/objects/effects/landmarks.dm

@@ -642,3 +642,12 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 /obj/effect/landmark/stationroom/maint/tenxten
 	template_names = list("Maint aquarium", "Maint bigconstruction", "Maint bigtheatre", "Maint deltalibrary", "Maint graffitiroom", "Maint junction", "Maint podrepairbay", "Maint pubbybar", "Maint roosterdome", "Maint sanitarium", "Maint snakefighter", "Maint vault", "Maint ward", "Maint assaultpod", "Maint maze", "Maint maze2", "Maint boxfactory",
 	"Maint sixsectorsdown", "Maint advbotany", "Maint beach", "Maint botany_apiary", "Maint gamercave", "Maint ladytesla_altar", "Maint olddiner", "Maint smallmagician", "Maint fourshops", "Maint fishinghole", "Maint fakewalls", "Maint wizard", "Maint halloween")
+
+/obj/effect/landmark/stationroom/maint/smexi1
+	template_names = list("Icemaint Center Boring", "Icemaint Center Danger", "Icemaint Center Frosty")
+
+/obj/effect/landmark/stationroom/maint/smexi2
+	template_names = list("Icemaint West Boring")
+
+/obj/effect/landmark/stationroom/maint/smexi3
+	template_names = list("Icemaint East Boring", "Icemaint East Danger", "Icemaint East Knotways", "Icemaint East Icering", "Icemaint East Maze")

modular_splurt/code/game/area/areas/station_areas.dm

@@ -120,3 +120,53 @@
 /area/ruin/unpowered/ylvaturf
 	name = "Ylva Outskirts"
 	icon_state = "spacecontent26"
+
+//V2 Snaxi
+
+/area/maintenance/central/frozen
+	name = "Maintenance Frozen Tunnel"
+	icon_state = "maintcentral"
+
+/area/maintenance/central/frozen/lower
+	name = "Lower Maintenance Frozen Tunnel"
+	icon_state = "maintcentral"
+
+/area/maintenance/central/frozen/upper
+	name = "Upper Maintenance Frozen Tunnel"
+	icon_state = "maintcentral"
+
+/area/engineering/substation/scimed
+	name = "Science Medical Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/scimed/lower
+	name = "Lower Science Medical Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/scimed/upper
+	name = "Upper Sci-Med Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/service
+	name = "Service Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/service/lower
+	name = "Lower Service Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/service/upper
+	name = "Upper Service Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/commandsec
+	name = "Command-Sec Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/commandsec/lower
+	name = "Lower Command-Sec Wing Engineering Substation"
+	icon_state = "engine"
+
+/area/engineering/substation/commandsec/upper
+	name = "Upper Command-Sec Wing Engineering Substation"
+	icon_state = "engine"