Merge branch 'Bubberstation:master' into master

_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

_maps/ss13_construct.json → _maps/ss13_construct.txt

@@ -1,3 +1,4 @@
+CONVERTED TO .txt
 {
 	"version": 1,
 	"map_name": "SS13 Construct",

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

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)

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)

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

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"