Merge branch 'beta-dev' of https://github.com/CeladonSS13/Shiptest in…

…to beta-dev
CeladonSS13 · Sep 15, 2024 · 250cc19 · 250cc19
2 parents b3ec110 + 6a06747
commit 250cc19
Show file tree

Hide file tree

Showing 31 changed files with 2,543 additions and 1,555 deletions.
diff --git a/_maps/_mod_celadon/configs/inteq_executer.json b/_maps/_mod_celadon/configs/inteq_executer.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Executer-Class laser experiment",
+	"map_name": "Executer-class Laser Experiment",
 	"faction": "/datum/faction/inteq",
 	"prefix": "IRMV",
 	"description": "Боевой фрегат класса Палач. Данный корабль обладает большим количеством лазерного вооружения из-за кооперации с Нанотрейзен при создании данного корабля.",

diff --git a/_maps/_mod_celadon/configs/solfed_lightning_bolt.json b/_maps/_mod_celadon/configs/solfed_lightning_bolt.json
@@ -28,7 +28,7 @@
 		},
 		"Assault": {
 			"outfit": "/datum/outfit/job/solgov/bolt/security",
-			"slots": 2
+			"slots": 1
 		},
 		"Stormtrooper": {
 			"outfit": "/datum/outfit/job/solgov/bolt/security",

diff --git a/_maps/_mod_celadon/outpost/elysium_ice.dmm b/_maps/_mod_celadon/outpost/elysium_ice.dmm
@@ -4714,19 +4714,12 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/outpost/crew/cryo)
 "jA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/junction/flip{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
@@ -4738,6 +4731,9 @@
 	},
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned/cargo_one{
 	light_color = "#1B1D2E";
 	light_range = 2

diff --git a/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm b/_maps/_mod_celadon/outpost/nanotrasen_asteroid.dmm
@@ -525,12 +525,6 @@
 	},
 /turf/open/floor/carpet,
 /area/outpost/crew/library)
-"cb" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-12"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "cc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/warning{
@@ -905,9 +899,7 @@
 /turf/open/floor/plasteel/dark,
 /area/outpost/security)
 "dx" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-38"
-	},
+/obj/structure/lattice/clockwork,
 /turf/open/space/basic,
 /area/outpost/external)
 "dA" = (
@@ -2026,12 +2018,6 @@
 	},
 /turf/open/floor/plasteel/sepia,
 /area/outpost/crew/canteen)
-"hH" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-3"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "hI" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 1
@@ -14373,12 +14359,6 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel,
 /area/outpost/operations)
-"YE" = (
-/obj/effect/decal/fakelattice{
-	icon_state = "lattice-11"
-	},
-/turf/open/space/basic,
-/area/outpost/external)
 "YF" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/coffee{
@@ -27329,7 +27309,7 @@ Zp
 sN
 vV
 vV
-cb
+dx
 Ft
 OP
 wH
@@ -27516,8 +27496,8 @@ Zp
 HY
 Ft
 dx
-YE
-hH
+dx
+dx
 DD
 kc
 sn
@@ -27703,8 +27683,8 @@ Zp
 HY
 HY
 Ft
-hH
-hH
+dx
+dx
 nP
 wB
 vf