Merge remote-tracking branch 'upstream/master' into ministore

BlueMoon-Labs · Feb 2, 2025 · a6bc01c · a6bc01c
2 parents dae41ca + 834e39f
commit a6bc01c
Show file tree

Hide file tree

Showing 146 changed files with 336,943 additions and 3,587 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/forgotten_ship.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/sol_ship.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm b/_maps/RandomRuins/SpaceRuins/BlueMoon/space_syndicate_base.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -2126,7 +2126,8 @@
 "Kf" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
-	dir = 4
+	dir = 4;
+	flags_1 = 2
 	},
 /turf/open/floor/wood{
 	icon_state = "large_wood"
@@ -2435,7 +2436,8 @@
 "QP" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks/fullupgrade{
-	dir = 4
+	dir = 4;
+	flags_1 = 2
 	},
 /turf/open/floor/wood{
 	icon_state = "large_wood"

diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -17,9 +17,10 @@
 		#include "map_files\CogStation\CogStation.dmm"
 		#include "map_files\TauStation\TauStation.dmm"
 		#include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm"
+		// BLUEMOON EDIT
+		#include "map_files\bluemoon_maps\icemoonstation.dmm"
 		// #include "modular_bluemoon\_maps\PrisonStation\PrisonStation.dmm"
 		#include "splurt_maps\map_files\4Nalstation\4Nal_station.dmm"
-
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

diff --git a/_maps/icemoonstation.dm b/_maps/icemoonstation.dm
@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/icemoonstation.json"
diff --git a/_maps/icemoonstation.json b/_maps/icemoonstation.json
@@ -0,0 +1,40 @@
+{
+	"map_name": "IceMoon Station",
+	"map_path": "map_files/bluemoon_maps",
+	"map_file": "icemoonstation.dmm",
+	"station_ruin_budget": 0,
+	"space_ruin_levels": 0,
+	"space_empty_levels": 0,
+	"shuttles": {
+		"cargo": "cargo_box",
+		"ferry": "ferry_fancy",
+		"whiteship": "whiteship_box",
+		"emergency": "emergency_box"
+	},
+	"traits": [
+		{
+			"Up": 1,
+			"Gravity": true,
+			"Baseturf": "/turf/open/lava/plasma/ice_moon",
+			"Linkage": "null",
+			"Mining": true
+		},
+		{
+			"Up": 1,
+			"Down": -1,
+			"Gravity": true,
+			"Baseturf": "/turf/open/openspace/icemoon",
+			"Linkage": "null",
+			"Mining": true
+		},
+		{
+			"Down": -1,
+			"Gravity": true,
+			"Baseturf": "/turf/open/openspace",
+			"Weather_Snowstorm": true,
+			"Linkage": "null",
+			"Mining": true
+		}
+	],
+	"minetype": "none"
+}
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -6622,7 +6622,7 @@
 "aDf" = (
 /obj/machinery/computer/secure_data,
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Arrival Checkpoint";
 	departmentType = 5;
 	pixel_y = 30
 	},
@@ -13829,7 +13829,7 @@
 	c_tag = "Security Post - Medbay"
 	},
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Medbay Checkpoint";
 	departmentType = 5;
 	pixel_y = 30
 	},
@@ -16844,7 +16844,7 @@
 	name = "Gateway Access Shutter Control";
 	pixel_x = -1;
 	pixel_y = -24;
-	req_access_txt = "31"
+	req_access_txt = "19"
 	},
 /turf/open/floor/plasteel,
 /area/command/gateway)
@@ -19450,7 +19450,7 @@
 /area/hallway/primary/central)
 "byO" = (
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Cargo Checkpoint";
 	departmentType = 5;
 	pixel_y = -30
 	},
@@ -20565,7 +20565,7 @@
 	dir = 1
 	},
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Science Checkpoint";
 	departmentType = 5;
 	pixel_y = -30
 	},
@@ -23920,8 +23920,8 @@
 	},
 /area/maintenance/port/fore)
 "bOj" = (
-/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/bot,
+/obj/structure/closet/secure_closet/medical1,
 /turf/open/floor/plasteel,
 /area/medical/virology)
 "bOk" = (
@@ -26847,7 +26847,7 @@
 /area/security/checkpoint/engineering)
 "bXP" = (
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Engineering Checkpoint";
 	departmentType = 5;
 	pixel_y = 30
 	},
@@ -37695,7 +37695,6 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/research{
-	autoclose = 0;
 	frequency = 1449;
 	id_tag = "xeno_airlock_exterior";
 	name = "Xenobiology Lab External Airlock";
@@ -40186,7 +40185,7 @@
 /area/service/hydroponics)
 "erm" = (
 /obj/machinery/button/door{
-	id = "sauna2";
+	id = "saunab";
 	name = "Cabin Bolt Control";
 	normaldoorcontrol = 1;
 	pixel_x = -32;
@@ -48268,10 +48267,17 @@
 /area/service/park)
 "iWE" = (
 /obj/structure/table/glass,
-/obj/item/paper_bin,
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 3
+	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/item/folder/white{
+	pixel_x = 7;
+	pixel_y = 2
+	},
 /turf/open/floor/plasteel,
 /area/medical/virology)
 "iWK" = (
@@ -55581,7 +55587,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/obj/machinery/computer/pandemic,
+/obj/structure/table/glass,
 /turf/open/floor/plasteel,
 /area/medical/virology)
 "mPT" = (
@@ -60597,9 +60603,9 @@
 /area/security/detectives_office/private_investigators_office)
 "pKR" = (
 /obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/green/filled/end,
-/obj/structure/closet/secure_closet/medical1,
-/turf/open/floor/plasteel/white,
+/obj/structure/closet/l3closet/virology,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
 /area/medical/virology)
 "pKV" = (
 /turf/closed/wall/r_wall,

diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
@@ -4708,7 +4708,7 @@
 	pixel_x = 24
 	},
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Arrival Checkpoint";
 	departmentType = 5;
 	name = "Security RC";
 	pixel_y = -32
@@ -6698,8 +6698,11 @@
 /turf/closed/wall,
 /area/security/brig)
 "asM" = (
-/obj/machinery/light_switch{
-	pixel_x = 24
+/obj/machinery/requests_console{
+	department = "Public Router";
+	name = "Public Router RC";
+	pixel_x = 32;
+	pixel_y = 0
 	},
 /turf/open/floor/plasteel/white,
 /area/commons/fitness/cogpool)
@@ -60188,7 +60191,7 @@
 /obj/structure/table,
 /obj/machinery/recharger,
 /obj/machinery/requests_console{
-	department = "Security";
+	department = "Cargo Checkpoint";
 	departmentType = 5;
 	name = "Security RC";
 	pixel_x = 32
@@ -67921,13 +67924,13 @@
 /area/security/prison/work)
 "rDB" = (
 /obj/machinery/requests_console{
-	department = "Public Router";
-	name = "Public Router RC";
+	department = "Engineering Router";
+	name = "Engineering Router RC";
+	pixel_y = 0;
 	pixel_x = -32
 	},
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "rEG" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/table,
@@ -68601,11 +68604,6 @@
 /area/security/prison/mess)
 "sRZ" = (
 /obj/machinery/light/small,
-/obj/machinery/requests_console{
-	department = "Engineering Router";
-	name = "Engineering Router RC";
-	pixel_y = -32
-	},
 /turf/closed/wall/r_wall,
 /area/engineering/main)
 "sSg" = (
@@ -69292,6 +69290,16 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/central/secondary)
+"uqr" = (
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
+/obj/machinery/light_switch{
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/white,
+/area/commons/fitness/cogpool)
 "uqO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/easel,
@@ -106053,7 +106061,7 @@ asx
 asM
 auN
 auN
-arN
+uqr
 aAy
 aGH
 aKj
@@ -106564,7 +106572,7 @@ aHO
 xQe
 vuq
 aHt
-rDB
+aaU
 aaU
 dQE
 aaU
@@ -107629,7 +107637,7 @@ aaa
 aaa
 aaU
 aQC
-cnK
+rDB
 bqS
 bqS
 bqS