Merge branch 'master' into Thruster

shiptest-ss13 · Jan 26, 2024 · d547e84 · d547e84
2 parents 0cf48f6 + 286941e
commit d547e84
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -127,7 +127,8 @@
 "iT" = (
 /obj/structure/stone_tile/slab,
 /mob/living/simple_animal/hostile/megafauna/dragon/icemoon{
-	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair)
+	loot = list(/obj/structure/closet/crate/necropolis/dragon,/obj/item/keycard/gatedrop/drakelair);
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher,/obj/item/keycard/gatedrop/drakelair)
 	},
 /turf/open/indestructible/boss,
 /area/ruin)

diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json
@@ -1,5 +1,5 @@
 {
-	"prefix": "SSV",
+	"prefix": "SUNS",
 	"map_name": "Aegis-class Long Term Care Ship",
 	"map_short_name": "Aegis-class",
 	"map_path": "_maps/shuttles/syndicate/syndicate_aegis.dmm",

diff --git a/_maps/configs/syndicate_cybersun_kansatsu.json b/_maps/configs/syndicate_cybersun_kansatsu.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"prefix": "SSV",
+	"prefix": "CSSV",
 	"namelists": [
 		"CYBERSUN",
 		"SPACE",

diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"prefix": "SSV",
+	"prefix": "NGRV",
 	"namelists": [
 		"GORLEX",
 		"NATURAL_AGGRESSIVE",

diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json
@@ -1,5 +1,5 @@
 {
-	"prefix": "SSV",
+	"prefix": "ISV",
 	"namelists": [
 		"GORLEX",
 		"NATURAL_AGGRESSIVE",

diff --git a/_maps/configs/syndicate_litieguai.json b/_maps/configs/syndicate_litieguai.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Li Tieguai-class Rescue Ship",
-	"prefix": "SSV",
+	"prefix": "CSSV",
 	"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": [

diff --git a/_maps/configs/syndicate_lugol.json b/_maps/configs/syndicate_lugol.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "Lugol-class GEC Engineering Project",
-	"prefix": "SEV",
+	"prefix": "XSV",
 	"map_short_name": "Lugol-class",
 	"description": "The Lugol is effectively an enormous Galactic Engineers Concordat research barge, used as a test bed for refinements to power systems, new technologies, and so on. As it offers freedom from the usual constraints of working aboard vessels belonging to other Syndicate factions, Lugols are especially popular among the GEC’s more radical members. Accordingly, they have a reputation for either accomplishing the impossible or generating the equivalent of a new star when they inevitably melt down. Lugols are generally only found on the Frontier, where the collateral damage from potential accidents can be kept to a minimum and secrecy, when needed, can be better maintained.",
 	"tags": [
@@ -14,7 +14,7 @@
 	],
 	"map_path": "_maps/shuttles/syndicate/syndicate_gec_lugol.dmm",
 	"map_id": "gec_lugol",
-	"limit": 2,
+	"limit": 1,
 	"job_slots": {
 		"Project Overseer": {
 			"outfit": "/datum/outfit/job/syndicate/ce/gec",

diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml
@@ -62,3 +62,9 @@
 2024-01-23:
   SomeguyManperson:
   - bugfix: ore smelter no longer obliterates materials when smelting alloys
+2024-01-26:
+  Apogee-dev:
+  - tweak: Changed prefixes on Syndicate ships to reflect subfaction
+  SomeguyManperson:
+  - bugfix: you can no longer lock yourself out of the icemoon dragon lair by killing
+      the dragon with a crusher