From 4b6c1abe16e10fe5d3be97021182bab2217a1641 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:44:11 -0800 Subject: [PATCH 1/5] Updates syndicate ship prefixes (#2665) ## About The Pull Request Changes the prefixes on Syndicate ships to reflect subfaction more strongly. - 2nd Battlegroup uses NGRV (New Gorlex Republic Vessel) - Hardliners use ISV (They don't have a unique registration because they aren't an organized group and aren't officially part of Cybersun. this puts them in a similar position to non-Frontiersman pirates, using ISV while not being normal independents.) - Cybersun uses CSSV (CyberSun Space Vessel) - SUNS uses SUNS (SUNS, lol) - ACLF still uses SSV - The Lugol, as GEC's only ship and an adminspawn ship, uses XSV (Experimental Space Vessel) ## Why It's Good For The Game the syndicate kind of Isn't anymore and pushing faction distinctions is good, especially between the gorlex splinters ## Changelog :cl: tweak: Changed prefixes on Syndicate ships to reflect subfaction /:cl: --- _maps/configs/syndicate_aegis.json | 2 +- _maps/configs/syndicate_cybersun_kansatsu.json | 2 +- _maps/configs/syndicate_gorlex_hyena.json | 2 +- _maps/configs/syndicate_gorlex_komodo.json | 2 +- _maps/configs/syndicate_litieguai.json | 2 +- _maps/configs/syndicate_lugol.json | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json index 9dc307f7f091..6863c4e11279 100644 --- 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 index fbde6dc608d6..a9c9fcb94349 100644 --- 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 index 4e9086139275..51b046d114b7 100644 --- 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 index 5692eaf44a14..595b61b079d9 100644 --- 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 index 887828e28176..685a53187422 100644 --- 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 index 26599d93a8ee..673d9be16ff5 100644 --- 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", From 73362102eb1900409702861556bfa5289e28d6f8 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 24 Jan 2024 21:58:19 -0600 Subject: [PATCH 2/5] Automatic changelog generation for PR #2665 [ci skip] --- html/changelogs/AutoChangeLog-pr-2665.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2665.yml diff --git a/html/changelogs/AutoChangeLog-pr-2665.yml b/html/changelogs/AutoChangeLog-pr-2665.yml new file mode 100644 index 000000000000..a025323feb59 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2665.yml @@ -0,0 +1,4 @@ +author: Apogee-dev +changes: + - {tweak: Changed prefixes on Syndicate ships to reflect subfaction} +delete-after: true From 236cbef3127759829bb5debad678e8ce15f994c2 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 24 Jan 2024 23:10:07 -0500 Subject: [PATCH 3/5] fixes crusher loot for icemoon ruin dragon not dropping a key (#2650) ## About The Pull Request adds the key to the crusher loot list since the default loot list is overridden by that ## Why It's Good For The Game Dragon lair could be locked off without admin intervention if the dragon is killed with a crusher ## Changelog :cl: fix: you can no longer lock yourself out of the icemoon dragon lair by killing the dragon with a crusher /:cl: --- _maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm index 4c8ccc99dfcb..f089a09b8fba 100644 --- 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) From 709a12c14b45d875f89dfef89bb363b9222c9485 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 24 Jan 2024 22:23:47 -0600 Subject: [PATCH 4/5] Automatic changelog generation for PR #2650 [ci skip] --- html/changelogs/AutoChangeLog-pr-2650.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2650.yml diff --git a/html/changelogs/AutoChangeLog-pr-2650.yml b/html/changelogs/AutoChangeLog-pr-2650.yml new file mode 100644 index 000000000000..be0a14f8ee04 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2650.yml @@ -0,0 +1,5 @@ +author: SomeguyManperson +changes: + - {bugfix: you can no longer lock yourself out of the icemoon dragon lair by killing + the dragon with a crusher} +delete-after: true From 286941e4258ecf39b4bc2c6562f5f6cc9a147299 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 26 Jan 2024 00:47:37 +0000 Subject: [PATCH 5/5] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-2650.yml | 5 ----- html/changelogs/AutoChangeLog-pr-2665.yml | 4 ---- html/changelogs/archive/2024-01.yml | 6 ++++++ 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2650.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-2665.yml diff --git a/html/changelogs/AutoChangeLog-pr-2650.yml b/html/changelogs/AutoChangeLog-pr-2650.yml deleted file mode 100644 index be0a14f8ee04..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2650.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: SomeguyManperson -changes: - - {bugfix: you can no longer lock yourself out of the icemoon dragon lair by killing - the dragon with a crusher} -delete-after: true diff --git a/html/changelogs/AutoChangeLog-pr-2665.yml b/html/changelogs/AutoChangeLog-pr-2665.yml deleted file mode 100644 index a025323feb59..000000000000 --- a/html/changelogs/AutoChangeLog-pr-2665.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Apogee-dev -changes: - - {tweak: Changed prefixes on Syndicate ships to reflect subfaction} -delete-after: true diff --git a/html/changelogs/archive/2024-01.yml b/html/changelogs/archive/2024-01.yml index 71fd490bb992..9ee67f626bd5 100644 --- 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