bugfix: ShelterCapsuleFix (#4121)

* capsuleshelterfix * major changes * zuzya blyat * zuzya blya 2 * zyza blyat 3 * zyza blyat 4 * momo prosila
ss220-space · Feb 28, 2024 · 3175306 · 3175306
1 parent 31ba588
commit 3175306
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 25 deletions.
diff --git a/_maps/map_files/templates/shelter_1.dmm b/_maps/map_files/templates/shelter_1.dmm
@@ -4,9 +4,8 @@
 /area/survivalpod)
 "b" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (NORTH)";
+	dir = 1;
 	icon_state = "survival";
-	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -45,9 +44,9 @@
 /area/survivalpod)
 "j" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -75,6 +74,10 @@
 /obj/structure/sign/mining,
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
+"H" = (
+/obj/effect/baseturf_helper/plating,
+/turf/simulated/floor/pod,
+/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -93,7 +96,7 @@ m
 (3,1,1) = {"
 b
 d
-h
+H
 h
 n
 "}

diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm
@@ -27,9 +27,8 @@
 /area/survivalpod)
 "g" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (NORTH)";
+	dir = 1;
 	icon_state = "survival";
-	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -98,8 +97,8 @@
 /area/survivalpod)
 "q" = (
 /obj/structure/window/reinforced/survival_pod{
-	dir = 9;
-	density = 0
+	density = 0;
+	dir = 9
 	},
 /turf/simulated/floor/carpet/black,
 /area/survivalpod)
@@ -142,9 +141,9 @@
 /area/survivalpod)
 "x" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -196,6 +195,10 @@
 /obj/structure/sign/mining,
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
+"T" = (
+/obj/effect/baseturf_helper/plating,
+/turf/simulated/floor/carpet/black,
+/area/survivalpod)
 
 (1,1,1) = {"
 a
@@ -230,7 +233,7 @@ s
 t
 u
 v
-r
+T
 w
 "}
 (5,1,1) = {"

diff --git a/_maps/map_files/templates/shelter_3.dmm b/_maps/map_files/templates/shelter_3.dmm
@@ -29,9 +29,9 @@
 /area/survivalpod)
 "f" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -41,9 +41,9 @@
 /area/survivalpod)
 "g" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 1
@@ -68,8 +68,8 @@
 "l" = (
 /obj/structure/table/reinforced,
 /obj/item/lighter/zippo{
-	pixel_y = 7;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = 7
 	},
 /obj/item/lighter/zippo{
 	pixel_x = 8;
@@ -109,9 +109,8 @@
 /area/survivalpod)
 "s" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (NORTH)";
+	dir = 1;
 	icon_state = "survival";
-	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
@@ -139,9 +138,9 @@
 /area/survivalpod)
 "y" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /obj/structure/disposalpipe/junction{
 	dir = 4
@@ -232,12 +231,16 @@
 /area/survivalpod)
 "W" = (
 /obj/structure/sign/mining/survival{
-	tag = "icon-survival (EAST)";
+	dir = 4;
 	icon_state = "survival";
-	dir = 4
+	tag = "icon-survival (EAST)"
 	},
 /turf/simulated/wall/mineral/titanium/survival,
 /area/survivalpod)
+"X" = (
+/obj/effect/baseturf_helper/plating,
+/turf/simulated/floor/carpet/black,
+/area/survivalpod)
 "Z" = (
 /obj/structure/urinal{
 	pixel_y = 28
@@ -318,7 +321,7 @@ o
 t
 L
 L
-L
+X
 L
 L
 c

diff --git a/code/game/objects/effects/mapping_helpers.dm b/code/game/objects/effects/mapping_helpers.dm
@@ -21,6 +21,10 @@
 	name = "space baseturf editor"
 	baseturf = /turf/space
 
+/obj/effect/baseturf_helper/plating
+	name = "plating baseturf editor"
+	baseturf = /turf/simulated/floor/plating
+
 /obj/effect/baseturf_helper/asteroid
 	name = "asteroid baseturf editor"
 	baseturf = /turf/simulated/floor/plating/asteroid
@@ -57,6 +61,10 @@
 	name = "lavaland baseturf editor"
 	baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
 
+/obj/effect/baseturf_helper/lava_land/surface/basalt
+	name = "lavaland basalt baseturf editor"
+	baseturf = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
+
 /obj/effect/mapping_helpers
 	icon = 'icons/effects/mapping_helpers.dmi'
 	icon_state = "standart"