Revert to Update from Shiptest on 2024-05-07

_maps/configs/pgf_crying_sun.json

@@ -46,5 +46,5 @@
 			"slots": 3
 		}
 	},
-	"enabled":false
+	"enabled":true
 }

_maps/configs/srm_elder.json

@@ -8,7 +8,7 @@
 	],
 	"map_short_name": "Elder-class",
 	"map_path": "_maps/shuttles/roumain/srm_elder.dmm",
-	"description": "A standard issue vessel to the highest ranks of the Moffic Church. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Elder with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.",
+	"description": "A standard issue vessel to the highest ranks of the Saint-Roumain Militia. While “standard”, this class of vessel is unique to the Montagne that owns it. Each ship is designed around a central garden consisting of plants, soil, and a tree from the owning Montagnes’ home planet. As a highly religious ascetic order, the SRM supplies each Elder with supplies to farm, raise animals, and perform medicine in more “natural” ways, using herbs and plants grown in house. The ship is captained by a Montagne, who oversees a team of Hunters, and Shadows apprenticing them.",
 	"tags": [
 		"Botany",
 		"Combat",
@@ -35,5 +35,5 @@
 			"slots": 3
 		}
 	},
-	"enabled": false
+	"enabled": true
 }

_maps/configs/syndicate_aegis.json

@@ -1,9 +1,9 @@
 {
-	"prefix": "CSSV",
-	"map_name": "Seiiki-class Long Term Care Ship",
-	"map_short_name": "Seiiki-class",
+	"prefix": "SUNS",
+	"map_name": "Aegis-class Long Term Care Ship",
+	"map_short_name": "Aegis-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_aegis.dmm",
-	"description": "Approximately a third of the way through the ICW, it became apparent that the Syndicate could not muster the sheer throwaway manpower that Nanotrasen could with its swaths of mercenaries and disposable personnel. Instead, the Syndicate began to adopt a much more conservative approach to maintaining personnel, by establishing an initiative to create a host of medical vessels designed to rescue and rehabilitate the fallen. While the Li Tieguai filled the rescue role, the Seiiki-Class was to fill the rehabilitation role. Featuring a host of ‘quality of life’ features for long-term patients (a full bar, a hydroponics setup, and so on), an expansive medical bay and an array of comfort fixtures like couches and gardens, the Aegis is perfect for aspiring doctors or wounded patients.",
+	"description": "Approximately a third of the way through the ICW, it became apparent that the Syndicate could not muster the sheer throwaway manpower that Nanotrasen could with its swaths of mercenaries and disposable personnel. Instead, the Syndicate began to adopt a much more conservative approach to maintaining personnel, by establishing an initiative to create a host of medical vessels designed to rescue and rehabilitate the fallen. While the Li Tieguai filled the rescue role, the Aegis-Class was to fill the rehabilitation role. Featuring a host of ‘quality of life’ features for long-term patients (a full bar, a hydroponics setup, and so on), an expansive medical bay and an array of comfort fixtures like couches and gardens, the Aegis is perfect for aspiring doctors or wounded patients.",
 	"tags": [
 		"Botany",
 		"Medical",
@@ -12,29 +12,29 @@
 	"map_id": "syndicate_aegis",
 	"limit": 1,
 	"namelists": [
-		"CYBERSUN",
+		"SUNS",
 		"SPACE",
 		"GENERAL"
 	],
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/syndicate/captain/cybersun",
+			"outfit": "/datum/outfit/job/syndicate/captain/suns",
 			"officer": true,
 			"slots": 1
 		},
 
 		"Lead Doctor": {
-			"outfit": "/datum/outfit/job/syndicate/cmo",
+			"outfit": "/datum/outfit/job/syndicate/cmo/suns",
 			"slots": 1
 		},
 
 		"Ship Doctor":{
-			"outfit": "/datum/outfit/job/syndicate/doctor/cybersun",
+			"outfit": "/datum/outfit/job/syndicate/doctor/suns",
 			"slots": 2
 		},
 
 		"Mechanic": {
-			"outfit": "/datum/outfit/job/syndicate/engineer/cybersun",
+			"outfit": "/datum/outfit/job/syndicate/engineer/suns",
 			"slots": 1
 		},
 

_maps/configs/syndicate_cybersun_kansatsu.json

@@ -1,17 +1,17 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"prefix": "RGSV",
+	"prefix": "CSSV",
 	"namelists": [
 		"CYBERSUN",
 		"SPACE",
 		"NATURAL_AGGRESSIVE"
 	],
-	"map_name": "Soundcheck-class Scout Courier",
-	"description": "The Soundcheck-class is a Roseus Galactic remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.",
+	"map_name": "Kansatsu-class Scout Courier",
+	"description": "The Kansatsu-class is a Cybersun remodel of the old Type-S SolGov Courier, rebuilt for rapid package ferrying and light surveillance operations in the Frontier. While fairly cramped, it excels at its design goals, with rapid surveys, scouting, and espionage flowing from its presence. Syndicate deployments typically include a deployment of 5, with a recommended max of 7. This is broken down into 1 captain, an intelligence officer for coordinating the field agents, an engineer, and 2 field agents. The simplicity of the hull has led to the ship becoming a widespread indicator of Syndicate interest in locations, and some models have found their way into private purchasers' hands.",
 	"tags": [
 		"Specialist"
 	],
-	"map_short_name": "Soundcheck-class",
+	"map_short_name": "Kansatsu-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm",
 	"map_id": "cybersun_kansatsu",
 	"job_slots": {

check_regex.yaml

@@ -38,7 +38,7 @@ standards:
 
     - exactly:
           [
-              266,
+              269,
               "non-bitwise << uses",
               '(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
           ]

code/__DEFINES/guns.dm

@@ -3,7 +3,7 @@
 #define MANUFACTURER_SHARPLITE "the Sharplite Defense logo"
 #define MANUFACTURER_SHARPLITE_NEW "the Nanotrasen-Sharplite logo"
 #define MANUFACTURER_HUNTERSPRIDE "the Hunter's Pride Arms and Ammunition logo"
-#define MANUFACTURER_SOLARARMORIES "the Solarian emblem"
+#define MANUFACTURER_SOLARARMORIES "the Solarbundswaffenkammer emblem"
 #define MANUFACTURER_SCARBOROUGH "the Scarborough Arms logo"
 #define MANUFACTURER_EOEHOMA "the Eoehoma Firearms emblem"
 #define MANUFACTURER_NANOTRASEN_OLD "an outdated Nanotrasen logo"
@@ -13,8 +13,4 @@
 #define MANUFACTURER_MINUTEMAN "the Lanchester City Firearms Plant logo"
 #define MANUFACTURER_DONKCO "the Donk! Co. logo"
 #define MANUFACTURER_PGF "the Etherbor Industries emblem"
-#define MANUFACTURER_ROSEUS "the Roseus Galactic logo"
-#define MANUFACTURER_ADHOMAI "a Tajaran emblem"
-#define MANUFACTURER_LAKVAR "the letters LKV"
-#define MANUFACTURER_HEPHAESTUS "the Hephaestus Industries logo"
 #define MANUFACTURER_IMPORT "Lanchester Import Co."

code/datums/components/_component.dm

@@ -321,12 +321,10 @@
 	// all the objects that are receiving the signal get the signal this final time.
 	// AKA: No you can't cancel the signal reception of another object by doing an unregister in the same signal.
 	var/list/queued_calls = list()
-	// This should be faster than doing `var/datum/listening_datum as anything in target` as it does not implicitly copy the list
-	for(var/i in 1 to length(target))
-		var/datum/listening_datum = target[i]
-		queued_calls.Add(listening_datum, listening_datum.signal_procs[src][sigtype])
-	for(var/i in 1 to length(queued_calls) step 2)
-		. |= call(queued_calls[i], queued_calls[i + 1])(arglist(arguments))
+	for(var/datum/listening_datum as anything in target)
+		queued_calls[listening_datum] = listening_datum.signal_procs[src][sigtype]
+	for(var/datum/listening_datum as anything in queued_calls)
+		. |= call(listening_datum, queued_calls[listening_datum])(arglist(arguments))
 
 // The type arg is casted so initial works, you shouldn't be passing a real instance into this
 /**

code/datums/diseases/advance/presets.dm

@@ -16,6 +16,14 @@
 	symptoms = list(new/datum/symptom/cough)
 	..()
 
+/datum/disease/advance/necropolis
+	copy_type = /datum/disease/advance
+
+/datum/disease/advance/necropolis/New()
+	name = "Necropolis Seed"
+	symptoms = list(new/datum/symptom/necroseed)
+	..()
+
 //Randomly generated Disease, for virus crates and events
 /datum/disease/advance/random
 	name = "Experimental Disease"