Merge branch 'master' into weforgottheanesthetic

shiptest-ss13 · Aug 27, 2024 · 92ec9b1 · 92ec9b1
2 parents dba910f + 90ea65c
commit 92ec9b1
Show file tree

Hide file tree

Showing 303 changed files with 11,606 additions and 1,095 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -393,7 +393,7 @@
 	pixel_x = 9;
 	pixel_y = -1
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
+/obj/item/gun/ballistic/automatic/assault/cm82{
 	pixel_y = 7;
 	pixel_x = -9
 	},

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -1066,7 +1066,7 @@
 /turf/open/floor/wood,
 /area/ruin)
 "Ok" = (
-/turf/open/acid/whitesands,
+/turf/open/water/acid/whitesands,
 /area/overmap_encounter/planetoid/sand/explored)
 "Ov" = (
 /obj/item/clothing/head/cowboy{

diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
@@ -40,9 +40,13 @@
 			"outfit": "/datum/outfit/job/inteq/security",
 			"slots": 1
 		},
+		"Corpsman": {
+			"outfit": "/datum/outfit/job/inteq/paramedic",
+			"slots": 1
+		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/inteq/assistant",
-			"slots": 4
+			"slots": 4 
 		}
 	},
 	"enabled": true

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
 		},

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -1084,11 +1084,11 @@
 /area/centcom/control)
 "apm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/gun/ballistic/automatic/marksman/gal/inteq{
+/obj/item/gun/ballistic/automatic/marksman/f4/inteq{
 	pixel_x = -4;
 	pixel_y = -2
 	},