From 90bcd5602ca31f8f48618ca6fd1b136886f75ad0 Mon Sep 17 00:00:00 2001 From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:34:22 -0600 Subject: [PATCH 1/4] Disables the ss13_construct json (#1811) Let's free up some unneeded CI usage since we're getting memory issues. --- _maps/_basemap.dm | 8 ++++---- _maps/{ss13_construct.json => ss13_construct.txt} | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) rename _maps/{ss13_construct.json => ss13_construct.txt} (97%) diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index af66d10c10673..33ab986f84d1d 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -4,28 +4,28 @@ #ifndef LOWMEMORYMODE #ifdef ALL_MAPS - #include "map_files\Birdshot\birdshot.dmm" + //#include "map_files\Birdshot\birdshot.dmm" BUBBER EDIT - UNUSED #include "map_files\debug\multiz.dmm" #include "map_files\debug\runtimestation.dmm" #include "map_files\Deltastation\DeltaStation2.dmm" #include "map_files\IceBoxStation\IceBoxStation.dmm" #include "map_files\MetaStation\MetaStation.dmm" #include "map_files\Mining\Lavaland.dmm" - #include "map_files\NorthStar\north_star.dmm" + //#include "map_files\NorthStar\north_star.dmm" BUBBER EDIT - UNUSED #include "map_files\tramstation\tramstation.dmm" // SKYRAT EDIT ADDITON START - Compiling our modular maps too! #include "map_files\VoidRaptor\VoidRaptor.dmm" #include "map_files\NSVBlueshift\Blueshift.dmm" #include "map_files\KiloStation\KiloStation.dmm" // SKYRAT EDIT END - #include "map_files\wawastation\wawastation.dmm" + //#include "map_files\wawastation\wawastation.dmm" BUBBER EDIT - UNUSED // BUBBER EDIT ADDITION START #include "map_files\biodome\biodome.dmm" #include "map_files\LimaStation\LimaStation.dmm" #include "map_files\moonstation\moonstation.dmm" #include "map_files\KiloStation\KiloStation.dmm" #include "map_files\BoxStation\BoxStation.dmm" - #include "map_files\ss13construct\ss13_construct.dmm" + // #include "map_files\ss13construct\ss13_construct.dmm" // BUBBER EDIT ADDITION END #ifdef CIBUILDING diff --git a/_maps/ss13_construct.json b/_maps/ss13_construct.txt similarity index 97% rename from _maps/ss13_construct.json rename to _maps/ss13_construct.txt index e1ead45cdc13b..625916affc2fb 100644 --- a/_maps/ss13_construct.json +++ b/_maps/ss13_construct.txt @@ -1,3 +1,4 @@ +CONVERTED TO .txt { "version": 1, "map_name": "SS13 Construct", From 590ae9b74591ca0db56e2125cf383daaa7199b5b Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:26:33 +0200 Subject: [PATCH 2/4] Fixes the single compiletime warn and collosus flaky error (#1813) ## About The Pull Request closes #1677 ## Why It's Good For The Game Bugfix good ## Changelog N/A - not player facing --- code/modules/bitrunning/components/avatar_connection.dm | 4 ++-- .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 66493f22198f8..342150797e475 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -60,8 +60,8 @@ var/datum/action/avatar_domain_info/action = new(help_datum) action.Grant(avatar) - var/client/our_client = avatar.client - var/alias = null// BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + //var/client/our_client = avatar.client // BUBBER EDIT + var/alias = null // BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) if(alias && avatar.real_name != alias) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index a9c109b81a3c6..3ce473aa814ca 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -125,7 +125,7 @@ dir_shots.Trigger(target = target) // BUBBER EDIT START - ACTUALLY LOOSE THE TARGET var/mob/living/living_target = target - if(!istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) + if(istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) LoseTarget() return // BUBBER EDIT END From a9dc24d97899526175af974eb1cba556c7b8931e Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:53:24 +0200 Subject: [PATCH 3/4] Ninja bomb and quirk fix (#1815) ## About The Pull Request The bomb objective is now available from 30 active pop. Quirks no longer load on ninjas ## Why It's Good For The Game Having your entombed/paraplegic character spawn in as ninja isn't very fun. Also, we decided to add slightly more destructive shit, so the bomb is one step toward that. fixes #1701 ## Changelog :cl: balance: The ninja bomb objective is now available from 30 pop fix: Ninja no longer spawns with quirks, making you not to randomly die and have a fighting chance /:cl: --- code/__DEFINES/~skyrat_defines/antagonists.dm | 2 +- code/modules/antagonists/space_ninja/space_ninja.dm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/__DEFINES/~skyrat_defines/antagonists.dm b/code/__DEFINES/~skyrat_defines/antagonists.dm index 226549b4b5e4e..05c05d4d8325e 100644 --- a/code/__DEFINES/~skyrat_defines/antagonists.dm +++ b/code/__DEFINES/~skyrat_defines/antagonists.dm @@ -17,7 +17,7 @@ #define GOLDENEYE_REQUIRED_KEYS_MAXIMUM 3 /// Population requirement for bomb objectives (ninja c4, locate weakpoint, etc.) objectives to appear -#define BOMB_POP_REQUIREMENT 80 +#define BOMB_POP_REQUIREMENT 30 //BUBBER EDIT: Original 80 // Borer evolution defines // The three primary paths that eventually diverge diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm index 4fd68c3865e2d..3fcbc914040e8 100644 --- a/code/modules/antagonists/space_ninja/space_ninja.dm +++ b/code/modules/antagonists/space_ninja/space_ninja.dm @@ -118,7 +118,6 @@ operative.dna.update_dna_identity() operative.dna.species.pre_equip_species_outfit(null, operative) operative.regenerate_icons() - SSquirks.AssignQuirks(operative, operative.client, TRUE, TRUE, null, FALSE, operative) equip_space_ninja(owner.current) owner.current.add_quirk(/datum/quirk/freerunning) From 88943911eb72b901dd2f92482fde0bff5c4a3f8f Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:54:07 +0200 Subject: [PATCH 4/4] Automatic changelog for PR #1815 [ci skip] --- html/changelogs/AutoChangeLog-pr-1815.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1815.yml diff --git a/html/changelogs/AutoChangeLog-pr-1815.yml b/html/changelogs/AutoChangeLog-pr-1815.yml new file mode 100644 index 0000000000000..f8072999ceb64 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1815.yml @@ -0,0 +1,5 @@ +author: "Majkl-J" +delete-after: True +changes: + - balance: "The ninja bomb objective is now available from 30 pop" + - bugfix: "Ninja no longer spawns with quirks, making you not to randomly die and have a fighting chance" \ No newline at end of file