TGS Test Merge (#5887)

cmss13-devs · Mar 6, 2024 · 5874496 · 5874496
2 parents c3bcd4c + 80a2f1f
commit 5874496
Show file tree

Hide file tree

Showing 7 changed files with 6,992 additions and 5 deletions.
diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm
@@ -12,3 +12,6 @@
 
 /datum/lazy_template/ert/weyland_station
 	map_name = "weyland_ert_station"
+
+/datum/lazy_template/ert/pizza_station
+	map_name = "pizza_ert_station"
diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm
@@ -8,6 +8,7 @@
 	objectives = "Make sure you get a tip!"
 	shuttle_id = MOBILE_SHUTTLE_ID_ERT_SMALL
 	name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza
+	home_base = /datum/lazy_template/ert/pizza_station
 	probability = 1
 
 /datum/emergency_call/pizza/create_member(datum/mind/M, turf/override_spawn_loc)

diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm
@@ -113,6 +113,10 @@
 	name = "UPP Station"
 	icon_state = "green"
 
+/area/adminlevel/ert_station/pizza_station
+	name = "Pizza Galaxy"
+	icon_state = "red"
+
 /area/adminlevel/ert_station/clf_station
 	name = "CLF Station"
 	icon_state = "white"

diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm
@@ -1378,6 +1378,17 @@
 /obj/structure/flora/jungle/vines/heavy,
 /turf/open/gm/dirt,
 /area/adminlevel/ert_station/clf_station)
+"Ia" = (
+/obj/structure/bed/chair{
+	dir = 4
+	},
+/obj/structure/machinery/power/apc/antag{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken3"
+	},
+/area/adminlevel/ert_station/clf_station)
 "Ie" = (
 /turf/open/gm/dirtgrassborder{
 	dir = 1;
@@ -3006,7 +3017,7 @@ zO
 Ch
 ZI
 ZI
-MQ
+Ia
 mw
 mw
 LQ