Merge remote-tracking branch 'upstream/master' into clipper-boat

shiptest-ss13 · Sep 1, 2024 · 5753f0e · 5753f0e
2 parents deae346 + 7810e23
commit 5753f0e
Show file tree

Hide file tree

Showing 383 changed files with 11,971 additions and 4,620 deletions.
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2417,7 +2417,7 @@
 /obj/item/toy/plush/moth/firewatch,
 /obj/item/toy/plush/lizardplushie,
 /obj/item/toy/plush/knight,
-/obj/item/toy/prize/mauler,
+/obj/item/toy/prize/touro,
 /obj/item/toy/talking/AI,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/rockplanet/shippingdockwarehouse)

diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
@@ -21,7 +21,7 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Bridge Crew": {
+		"Helmsman": {
 			"outfit": "/datum/outfit/job/gezena/assistant/bridge",
 			"slots": 1
 		},
@@ -37,7 +37,7 @@
 			"outfit": "/datum/outfit/job/gezena/assistant",
 			"slots": 2
 		},
-		"Marine Sergeant": {
+		"Marine Lieutenant": {
 			"outfit": "/datum/outfit/job/gezena/hos",
 			"slots": 1
 		},