Merge pull request #11 from Kilmented/SkyratUncringedBravo

Spicy Mustard Update Ver One Point Oh

code/__DEFINES/~skyrat_defines/jobs.dm

@@ -12,4 +12,4 @@
 
 #define RESTRICTED_QUIRKS_EXCEPTIONS list("Mute" = "Signer")
 
-#define FLAVOR_TEXT_CHAR_REQUIREMENT 150
+#define FLAVOR_TEXT_CHAR_REQUIREMENT 0 //BUBBERSTATION EDIT

modular_bubbers/modules/Ashwalkers/ashwalkerunfucking.dm

@@ -1,5 +0,0 @@
-/datum/component/ash_age
-	/// the amount of minutes after each upgrade
-	var/stage_time = 5 MINUTES //I hate this
-
-

modular_bubbers/modules/Dynamic/MidroundRulesets.dm

@@ -0,0 +1,38 @@
+// It should go without saying that these are all Bubberstation edits
+/datum/dynamic_ruleset/midround/from_living/autotraitor
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/blob
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_living/blob_infection
+	repeatable = TRUE
+
+/datum/dynamic_ruleset/midround/from_ghosts/xenomorph
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/nightmare
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/abductors
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/space_ninja
+	minimum_players = 20
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/spiders
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/revenant
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_ghosts/sentient_disease
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/pirates
+	repeatable = FALSE
+
+/datum/dynamic_ruleset/midround/from_living/obsessed
+	cost = 4
+	repeatable = FALSE

modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm

@@ -33,7 +33,7 @@
 
 /datum/component/ash_age
 	/// the amount of minutes after each upgrade
-	var/stage_time = 20 MINUTES
+	var/stage_time = 10 MINUTES
 	/// the current stage of the ash
 	var/current_stage = 0
 	/// the time when upgraded/attached

tgstation.dme

@@ -5047,7 +5047,6 @@
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"
 #include "interface\skin.dmf"
-#include "modular_bubbers\modules\Ashwalkers\ashwalkerunfucking.dm"
 #include "modular_skyrat\master_files\code\_globalvars\configuration.dm"
 #include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm"
 #include "modular_skyrat\master_files\code\_globalvars\lists\chat.dm"
@@ -5362,7 +5361,6 @@
 #include "modular_skyrat\modules\ashwalkers\code\items\ash_tool.dm"
 #include "modular_skyrat\modules\ashwalkers\code\items\ash_weapon.dm"
 #include "modular_skyrat\modules\ashwalkers\code\items\ashwalker_shaman.dm"
-#include "modular_skyrat\modules\ashwalkers\code\species\Ashwalkers.dm"
 #include "modular_skyrat\modules\ashwalkers\code\species\damage_datum.dm"
 #include "modular_skyrat\modules\ashwalkers\code\turfs\icemoon_tiles.dm"
 #include "modular_skyrat\modules\assault_operatives\code\areas.dm"
@@ -6539,4 +6537,5 @@
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm"
 #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm"
 #include "modular_bubbers\modules\remove_vet_status\code\remove_vet_status.dm"
+#include "modular_bubbers\modules\Dynamic\MidroundRulesets.dm"
 // END_INCLUDE