Merge remote-tracking branch 'upstream/master' into twink-2

shiptest-ss13 · Dec 8, 2023 · bb9ed8b · bb9ed8b
2 parents 282584a + db44f42
commit bb9ed8b
Show file tree

Hide file tree

Showing 27 changed files with 2,868 additions and 2,313 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5624,8 +5624,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7308,8 +7308,8 @@
 "XC" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/aclf,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/gorlex,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)

diff --git a/_maps/configs/independent_litieguai.json → _maps/configs/syndicate_litieguai.json b/_maps/configs/independent_litieguai.json → _maps/configs/syndicate_litieguai.json
@@ -1,33 +1,34 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Li Tieguai-class Rescue Ship",
+	"prefix": "SSV",
 	"map_short_name": "Li Tieguai-class",
 	"description": "A small, nimble, and exceptionally well-built medical response vessel, the Li Tieguai is a recent addition to Cybersun’s fleet, forming a critical component of their Frontier stabilization program. Li Tieguais come equipped with high-end medical equipment, including a selection of Cybersun augments and prosthetics, as well as weaponry and armor sufficient to protect its personnel in the often-dangerous Frontier sectors, so that they can offer premium healthcare (at premium prices) in even the most dangerous of scenarios.",
 	"tags": [
 		"Medical"
 	],
-	"map_path": "_maps/shuttles/independent/independent_litieguai.dmm",
+	"map_path": "_maps/shuttles/syndicate/syndicate_litieguai.dmm",
 	"namelists": [
 		"SPACE",
 		"BEASTS",
 		"NATURAL_AGGRESSIVE"
 	],
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/captain",
+			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
 			"slots": 1
 		},
-		"Chief Medical Officer": {
-			"outfit": "/datum/outfit/job/cmo/medicaldirector",
+		"Medical Director": {
+			"outfit": "/datum/outfit/job/syndicate/cmo",
 			"officer": true,
 			"slots": 1
 		},
 		"Trauma Team Technician": {
-			"outfit": "/datum/outfit/job/paramedic/traumateam",
+			"outfit": "/datum/outfit/job/syndicate/doctor/cybersun",
 			"slots": 3
 		},
-		"Medical Intern": {
-			"outfit": "/datum/outfit/job/doctor/juniordoctor",
+		"Cybersun Medical Intern": {
+			"outfit": "/datum/outfit/job/syndicate/assistant/cybersun",
 			"slots": 3
 		}
 	},

diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm
@@ -33,7 +33,7 @@
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/neck/stripedredscarf,

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -3145,20 +3145,23 @@
 	req_access_txt = "20"
 	},
 /obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/armor/vest/security/hos{
+	name = "Syndicate jacket"
+	},
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/glasses/thermal/eyepatch,
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
-/obj/item/clothing/head/aclfcap{
+/obj/item/clothing/head/gorlexcap{
 	pixel_x = 5;
 	pixel_y = -4
 	},
 /obj/item/gun/ballistic/derringer/traitor,
 /obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/suit/gorlex,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,