Merge remote-tracking branch 'shiptest-ss13/master' into zt-s1

shiptest-ss13 · Oct 1, 2023 · 94bbb1a · 94bbb1a
2 parents c432494 + 1fe7a03
commit 94bbb1a
Show file tree

Hide file tree

Showing 28 changed files with 10,380 additions and 5,259 deletions.
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
diff --git a/_maps/configs/nanotrasen_skipper.json b/_maps/configs/nanotrasen_skipper.json
@@ -16,7 +16,7 @@
 	"Engineering",
 	"Mining"
 	],
-	"starting_funds": 4000,
+	"starting_funds": 4500,
 	"roundstart": true,
 	"job_slots": {
 		"Captain": {
@@ -36,13 +36,25 @@
 		"Medical Doctor": 1,
 		"Engineer": {
 			"outfit": "/datum/outfit/job/engineer/nt",
-			"slots": 3
+			"slots": 1
+		},
+		"Atmospheric Technician": {
+			"outfit": "/datum/outfit/job/atmos",
+			"slots": 1
 		},
 		"Shaft Miner": 2,
+		"Cargo Technician": {
+		"outfit": "/datum/outfit/job/cargo_tech",
+		"slots": 1
+		},
 		"Security Officer": {
 			"outfit": "/datum/outfit/job/security/nanotrasen",
 			"slots": 1
 		},
+		"Cook": {
+			"outfit": "/datum/outfit/job/cook",
+			"slots": 1
+		},
 		"Assistant": {
 			"outfit": "/datum/outfit/job/assistant",
 			"slots": 3

diff --git a/_maps/map_catalogue.txt b/_maps/map_catalogue.txt
@@ -584,7 +584,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 
 		File name ="_maps\RandomRuins\wasteruins\wasteplanet_pandora.dmm"
 		Size = (x = 18)(y = 21)(z = 1)
-		Tags = "Boss Combat Challenge", "Minor Loot" "Megafauna", "hospitable"
+		Tags = "Boss Combat Challenge", "Medium Loot" "Megafauna", "hospitable"
 
 		File name ="_maps\RandomRuins\wasteruins\wasteplanet_pod.dmm"
 		Size = (x = 8)(y = 8)(z = 1)

diff --git a/_maps/shuttles/shiptest/minutemen_corvus.dmm b/_maps/shuttles/shiptest/minutemen_corvus.dmm
@@ -525,13 +525,12 @@
 	},
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/railing{
-	dir = 1;
-	layer = 3.1
-	},
 /obj/item/tank/jetpack/carbondioxide,
 /obj/item/clothing/suit/space/hardsuit/swat,
 /obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "ka" = (
@@ -1166,7 +1165,6 @@
 /obj/effect/turf_decal/techfloor/orange,
 /obj/structure/railing/corner,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -1179,6 +1177,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 4
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "xL" = (
@@ -1400,9 +1399,9 @@
 	name = "equipment locker";
 	req_access_txt = "1"
 	},
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
+/obj/item/storage/belt/military/minutemen,
+/obj/item/storage/belt/military/minutemen,
+/obj/item/storage/belt/military/minutemen,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
@@ -2148,13 +2147,12 @@
 	},
 /obj/effect/turf_decal/box,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/railing{
-	dir = 1;
-	layer = 3.1
-	},
 /obj/item/tank/jetpack/carbondioxide,
 /obj/machinery/suit_storage_unit/inherit/industrial,
 /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen,
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "PA" = (