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

shiptest-ss13 · Oct 3, 2023 · e566278 · e566278
2 parents 0bde552 + 20c29e4
commit e566278
Show file tree

Hide file tree

Showing 65 changed files with 10,996 additions and 5,672 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/deprecated/Ruins/forgottenship.dmm b/_maps/deprecated/Ruins/forgottenship.dmm
@@ -420,7 +420,7 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "150"
 	},
-/obj/item/clothing/suit/space/hardsuit/cybersun,
+,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "bB" = (

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)