"
- var/num_revs = 0
- var/num_survivors = 0
- for(var/mob/living/carbon/survivor in GLOB.alive_mob_list)
- if(survivor.ckey)
- num_survivors++
- if(survivor.mind)
- if(is_revolutionary(survivor))
- num_revs++
- if(num_survivors)
- result += "Command's Approval Rating:
[100 - round((num_revs/num_survivors)*100, 0.1)]%"
-
-
var/list/targets = list()
var/list/datum/mind/headrevs
var/list/datum/mind/revs
@@ -346,10 +468,22 @@
revs = ex_revs
else
revs = get_antag_minds(/datum/antagonist/rev, TRUE)
+
+ var/num_revs = 0
+ var/num_survivors = 0
+ for(var/mob/living/carbon/survivor in GLOB.alive_mob_list)
+ if(survivor.ckey)
+ num_survivors += 1
+ if ((survivor.mind in revs) || (survivor.mind in headrevs))
+ num_revs += 1
+
+ if(num_survivors)
+ result += "Command's Approval Rating:
[100 - round((num_revs/num_survivors)*100, 0.1)]%"
+
if(headrevs.len)
var/list/headrev_part = list()
headrev_part += ""
- headrev_part += printplayerlist(headrevs,TRUE)
+ headrev_part += printplayerlist(headrevs, !check_rev_victory())
result += headrev_part.Join("
")
if(revs.len)
@@ -408,3 +542,6 @@
/datum/team/revolution/is_gamemode_hero()
return SSticker.mode.name == "revolution"
+
+#undef DECONVERTER_STATION_WIN
+#undef DECONVERTER_REVS_WIN
diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm
index 333bca5d7c..3fd8f8b5e7 100644
--- a/code/modules/antagonists/slaughter/slaughterevent.dm
+++ b/code/modules/antagonists/slaughter/slaughterevent.dm
@@ -3,7 +3,6 @@
typepath = /datum/round_event/ghost_role/slaughter
weight = 1 //Very rare
max_occurrences = 1
- gamemode_blacklist = list("dynamic")
earliest_start = 1 HOURS
min_players = 20
diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm
index 43ac07cba9..3df7e6c0e9 100644
--- a/code/modules/antagonists/swarmer/swarmer_event.dm
+++ b/code/modules/antagonists/swarmer/swarmer_event.dm
@@ -5,6 +5,7 @@
max_occurrences = 1 //Only once okay fam
earliest_start = 30 MINUTES
min_players = 35
+ dynamic_should_hijack = TRUE
/datum/round_event/spawn_swarmer
diff --git a/code/modules/antagonists/traitor/classes/human.dm b/code/modules/antagonists/traitor/classes/human.dm
index f868d0e7e1..49881630f0 100644
--- a/code/modules/antagonists/traitor/classes/human.dm
+++ b/code/modules/antagonists/traitor/classes/human.dm
@@ -28,17 +28,11 @@
/datum/traitor_class/human/forge_single_objective(datum/antagonist/traitor/T)
.=1
var/assassin_prob = 50
- var/is_dynamic = FALSE
var/datum/game_mode/dynamic/mode
if(istype(SSticker.mode,/datum/game_mode/dynamic))
mode = SSticker.mode
- is_dynamic = TRUE
assassin_prob = max(0,mode.threat_level-20)
if(prob(assassin_prob))
- if(is_dynamic)
- var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost)
- mode.spend_threat(threat_spent)
- mode.log_threat("[T.owner.name] added [threat_spent] on an assassination target.")
var/list/active_ais = active_ais()
if(active_ais.len && prob(100/GLOB.joined_player_list.len))
var/datum/objective/destroy/destroy_objective = new
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index f0bc6e5bfc..b6fc397233 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -46,17 +46,13 @@
traitor_kind.on_process(src)
/proc/get_random_traitor_kind(var/list/blacklist = list())
- var/chaos_weight = 0
- if(istype(SSticker.mode,/datum/game_mode/dynamic))
- var/datum/game_mode/dynamic/mode = SSticker.mode
- chaos_weight = (mode.threat - 50)/50
var/list/weights = list()
for(var/C in GLOB.traitor_classes)
if(!(C in blacklist))
var/datum/traitor_class/class = GLOB.traitor_classes[C]
if(class.min_players > length(GLOB.joined_player_list))
continue
- var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
+ var/weight = LOGISTIC_FUNCTION(1.5*class.weight,0,class.chaos,0)
weights[C] = weight * 1000
var/choice = pickweight(weights, 0)
if(!choice)
diff --git a/code/modules/atmospherics/auxgm/breathing_classes.dm b/code/modules/atmospherics/auxgm/breathing_classes.dm
index 4abfab58ee..cfc82adbff 100644
--- a/code/modules/atmospherics/auxgm/breathing_classes.dm
+++ b/code/modules/atmospherics/auxgm/breathing_classes.dm
@@ -14,6 +14,12 @@
var/high_alert_category = "too_much_oxy"
var/high_alert_datum = /atom/movable/screen/alert/too_much_oxy
+/datum/breathing_class/proc/get_effective_pp(datum/gas_mixture/breath)
+ var/mol = 0
+ for(var/gas in gases)
+ mol += breath.get_moles(gas) * gases[gas]
+ return (mol/breath.total_moles()) * breath.return_pressure()
+
/datum/breathing_class/oxygen
gases = list(
GAS_O2 = 1,
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index 10f8c60386..95ebbf71d2 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -1,3 +1,5 @@
+#define RANDOM_EVENT_ADMIN_INTERVENTION_TIME 10
+
//this datum is used by the events controller to dictate how it selects events
/datum/round_event_control
var/name //The human-readable name of the event
@@ -27,6 +29,9 @@
var/triggering //admin cancellation
+ /// Whether or not dynamic should hijack this event
+ var/dynamic_should_hijack = FALSE
+
/datum/round_event_control/New()
if(config && !wizardevent) // Magic is unaffected by configs
earliest_start = CEILING(earliest_start * CONFIG_GET(number/events_min_time_mul), 1)
@@ -53,6 +58,11 @@
return FALSE
if(holidayID && (!SSevents.holidays || !SSevents.holidays[holidayID]))
return FALSE
+
+ var/datum/game_mode/dynamic/dynamic = SSticker.mode
+ if (istype(dynamic) && dynamic_should_hijack && dynamic.random_event_hijacked != HIJACKED_NOTHING)
+ return FALSE
+
return TRUE
/datum/round_event_control/wizard/canSpawnEvent(var/players_amt, var/gamemode)
@@ -62,14 +72,19 @@
return can_be_midround_wizard && ..()
return ..()
+
+
/datum/round_event_control/proc/preRunEvent()
if(!ispath(typepath, /datum/round_event))
return EVENT_CANT_RUN
+ if (SEND_GLOBAL_SIGNAL(COMSIG_GLOB_PRE_RANDOM_EVENT, src) & CANCEL_PRE_RANDOM_EVENT)
+ return EVENT_INTERRUPTED
+
triggering = TRUE
if (alert_observers)
- message_admins("Random Event triggering in 30 seconds: [name] (
CANCEL)")
- sleep(300)
+ message_admins("Random Event triggering in [RANDOM_EVENT_ADMIN_INTERVENTION_TIME] seconds: [name] (
CANCEL)")
+ sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME SECONDS)
var/gamemode = SSticker.mode.config_tag
var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE)
if(!canSpawnEvent(players_amt, gamemode))
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 41aab20a11..c009647005 100755
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -4,7 +4,7 @@
weight = 10
max_occurrences = 1
min_players = 30
- gamemode_blacklist = list("nuclear","wizard","revolution","dynamic")
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/abductor
minimum_required = 2
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 993577cb30..456bdd558e 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -2,9 +2,9 @@
name = "Alien Infestation"
typepath = /datum/round_event/ghost_role/alien_infestation
weight = 5
- gamemode_blacklist = list("dynamic")
min_players = 25
max_occurrences = 1
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/alien_infestation
announceWhen = 400
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 67cd88efdf..937fb6a062 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -6,8 +6,7 @@
earliest_start = 40 MINUTES
min_players = 35
-
- gamemode_blacklist = list("blob","dynamic") //Just in case a blob survives that long
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/blob
announceWhen = -1
diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm
index 7b4628f135..a09f0f584e 100644
--- a/code/modules/events/fugitive_spawning.dm
+++ b/code/modules/events/fugitive_spawning.dm
@@ -4,7 +4,6 @@
max_occurrences = 1
min_players = 20
earliest_start = 30 MINUTES //deadchat sink, lets not even consider it early on.
- gamemode_blacklist = list("nuclear")
/datum/round_event/ghost_role/fugitives
minimum_required = 1
diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm
index 97a10c930a..62f9c88d49 100644
--- a/code/modules/events/nightmare.dm
+++ b/code/modules/events/nightmare.dm
@@ -3,7 +3,7 @@
typepath = /datum/round_event/ghost_role/nightmare
max_occurrences = 1
min_players = 20
- gamemode_blacklist = list("dynamic")
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/nightmare
minimum_required = 1
diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm
index 6ef693a886..4ad307731e 100644
--- a/code/modules/events/operative.dm
+++ b/code/modules/events/operative.dm
@@ -3,6 +3,7 @@
typepath = /datum/round_event/ghost_role/operative
weight = 0 //Admin only
max_occurrences = 1
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/operative
minimum_required = 1
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index ac23e44b8d..5708573887 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -5,7 +5,7 @@
max_occurrences = 1
min_players = 10
earliest_start = 30 MINUTES
- gamemode_blacklist = list("nuclear")
+ dynamic_should_hijack = TRUE
#define PIRATES_ROGUES "Rogues"
// #define PIRATES_SILVERSCALES "Silverscales"
@@ -17,19 +17,18 @@
return ..()
-/datum/round_event/pirates
- startWhen = 60 //2 minutes to answer
- var/datum/comm_message/threat_msg
+/datum/round_event/pirates/start()
+ send_pirate_threat()
+
+/proc/send_pirate_threat()
+ var/pirate_type = PIRATES_ROGUES //pick(PIRATES_ROGUES, PIRATES_SILVERSCALES, PIRATES_DUTCHMAN)
+ var/datum/comm_message/threat_msg = new
var/payoff = 0
- var/payoff_min = 1000
- var/paid_off = FALSE
- var/pirate_type
+ var/payoff_min = 10000
var/ship_template
var/ship_name = "Space Privateers Association"
- var/shuttle_spawned = FALSE
-
-/datum/round_event/pirates/setup()
- pirate_type = PIRATES_ROGUES //pick(PIRATES_ROGUES, PIRATES_SILVERSCALES, PIRATES_DUTCHMAN)
+ var/initial_send_time = world.time
+ var/response_max_time = 2 MINUTES
switch(pirate_type)
if(PIRATES_ROGUES)
ship_name = pick(strings(PIRATE_NAMES_FILE, "rogue_names"))
@@ -38,11 +37,7 @@
// if(PIRATES_DUTCHMAN)
// ship_name = "Flying Dutchman"
-/datum/round_event/pirates/announce(fake)
priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", "commandreport")
- if(fake)
- return
- threat_msg = new
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
@@ -62,35 +57,27 @@
// threat_msg.title = "Business proposition"
// threat_msg.content = "Ahoy! This be the [ship_name]. Cough up [payoff] credits or you'll walk the plank."
// threat_msg.possible_answers = list("We'll pay.","We will not be extorted.")
- threat_msg.answer_callback = CALLBACK(src,.proc/answered)
+ threat_msg.answer_callback = CALLBACK(GLOBAL_PROC, .proc/pirates_answered, threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/spawn_pirates, threat_msg, ship_template, FALSE), response_max_time)
SScommunications.send_message(threat_msg,unique = TRUE)
-/datum/round_event/pirates/proc/answered()
- if(threat_msg?.answered == 1)
+/proc/pirates_answered(datum/comm_message/threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
+ if(world.time > initial_send_time + response_max_time)
+ priority_announce("Too late to beg for mercy!",sender_override = ship_name)
+ return
+ if(threat_msg && threat_msg.answered == 1)
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
if(D.adjust_money(-payoff))
priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name)
- paid_off = TRUE
return
else
priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
- else if(threat_msg?.answered == 2)
- priority_announce("You won't pay? Fine then, we'll take those credits by force!",sender_override = ship_name)
- if(!shuttle_spawned)
- spawn_shuttle()
- else
- priority_announce("Too late to beg for mercy!",sender_override = ship_name)
+ spawn_pirates(threat_msg, ship_template, TRUE)
-/datum/round_event/pirates/start()
- if(threat_msg && !threat_msg.answered)
- threat_msg.possible_answers = list("Too late")
- threat_msg.answered = 1
- if(!paid_off && !shuttle_spawned)
- spawn_shuttle()
-
-/datum/round_event/pirates/proc/spawn_shuttle()
- shuttle_spawned = TRUE
+/proc/spawn_pirates(datum/comm_message/threat_msg, ship_template, skip_answer_check)
+ if(!skip_answer_check && threat_msg?.answered == 1)
+ return
var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
shuffle_inplace(candidates)
@@ -109,12 +96,12 @@
for(var/turf/A in ship.get_affected_turfs(T))
for(var/obj/effect/mob_spawn/human/pirate/spawner in A)
if(candidates.len > 0)
- var/mob/M = candidates[1]
- spawner.create(M.ckey)
- candidates -= M
- announce_to_ghosts(M)
+ var/mob/our_candidate = candidates[1]
+ spawner.create(our_candidate.ckey)
+ candidates -= our_candidate
+ notify_ghosts("The pirate ship has an object of interest: [our_candidate]!", source=our_candidate, action=NOTIFY_ORBIT, header="Something's Interesting!")
else
- announce_to_ghosts(spawner)
+ notify_ghosts("The pirate ship has an object of interest: [spawner]!", source=spawner, action=NOTIFY_ORBIT, header="Something's Interesting!")
priority_announce("Unidentified armed ship detected near the station.")
diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm
index 7b242f1dfe..35687bb7ed 100644
--- a/code/modules/events/space_dragon.dm
+++ b/code/modules/events/space_dragon.dm
@@ -4,6 +4,7 @@
weight = 8
max_occurrences = 1
min_players = 20
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/space_dragon
minimum_required = 1
diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm
index 0a24fecd44..15d94ab130 100644
--- a/code/modules/events/space_ninja.dm
+++ b/code/modules/events/space_ninja.dm
@@ -5,6 +5,7 @@
weight = 10
earliest_start = 20 MINUTES
min_players = 15
+ dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/space_ninja
minimum_required = 1
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 855e2ccbd7..1f5becace8 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -63,6 +63,9 @@
var/list/mind_traits // Traits added to the mind of the mob assigned this job
var/list/blacklisted_quirks //list of quirk typepaths blacklisted.
+/// Should this job be allowed to be picked for the bureaucratic error event?
+ var/allow_bureaucratic_error = TRUE
+
var/display_order = JOB_DISPLAY_ORDER_DEFAULT
//If a job complies with dresscodes, loadout items will not be equipped instead of the job's outfit, instead placing the items into the player's backpack.
diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm
index d0eb690e94..38625cfd9c 100644
--- a/code/modules/jobs/job_types/ai.dm
+++ b/code/modules/jobs/job_types/ai.dm
@@ -14,6 +14,7 @@
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SILICON
display_order = JOB_DISPLAY_ORDER_AI
+ allow_bureaucratic_error = FALSE
var/do_special_check = TRUE
threat = 5
considered_combat_role = TRUE
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 329feef0d4..d3ee2a87ea 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -13,7 +13,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
tag = "mob_[next_mob_id++]"
- GLOB.mob_list += src
+ add_to_mob_list()
prepare_huds()
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index d8f41d2840..ec2dd4bc7c 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -33,6 +33,13 @@
. = ..()
+ GLOB.new_player_list += src
+
+/mob/dead/new_player/Destroy()
+ GLOB.new_player_list -= src
+
+ return ..()
+
/mob/dead/new_player/prepare_huds()
return
@@ -391,7 +398,7 @@
var/id_max = text2num(href_list["maxid"])
if( (id_max - id_min) > 100 ) //Basic exploit prevention
- //(protip, this stops no exploits)
+ //(protip, this stops no exploits)
to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.")
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index a47c27325b..5f7fb58e38 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -123,7 +123,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
animate(src, pixel_y = 2, time = 10, loop = -1)
- GLOB.dead_mob_list += src
+ add_to_dead_mob_list()
for(var/v in GLOB.active_alternate_appearances)
if(!v)
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 85c256f5b0..f38f326bc6 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -64,8 +64,8 @@
brainmob.container = src
if(!(newbrain.organ_flags & ORGAN_FAILING)) // the brain organ hasn't been beaten to death.
brainmob.stat = CONSCIOUS //we manually revive the brain mob
- GLOB.dead_mob_list -= brainmob
- GLOB.alive_mob_list += brainmob
+ brainmob.remove_from_dead_mob_list()
+ brainmob.add_to_alive_mob_list()
brainmob.reset_perspective()
brain = newbrain
@@ -102,8 +102,8 @@
brainmob.stat = DEAD
brainmob.emp_damage = 0
brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
- GLOB.alive_mob_list -= brainmob //Get outta here
- GLOB.dead_mob_list += brainmob
+ brainmob.remove_from_alive_mob_list() //Get outta here
+ brainmob.add_to_dead_mob_list()
brain.brainmob = brainmob //Set the brain to use the brainmob
brainmob = null //Set mmi brainmob var to null
if(user)
diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm
index 893d7c5103..e1eb09405a 100644
--- a/code/modules/mob/living/brain/posibrain.dm
+++ b/code/modules/mob/living/brain/posibrain.dm
@@ -159,8 +159,8 @@ GLOBAL_VAR(posibrain_notify_cooldown)
to_chat(brainmob, welcome_message)
brainmob.mind.assigned_role = new_role
brainmob.stat = CONSCIOUS
- GLOB.dead_mob_list -= brainmob
- GLOB.alive_mob_list += brainmob
+ brainmob.remove_from_dead_mob_list()
+ brainmob.add_to_alive_mob_list()
visible_message(new_mob_message)
check_success()
diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index 65e59d0e29..e98ddf5954 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -22,7 +22,7 @@
/mob/living/carbon/Moved()
. = ..()
- if(. && (movement_type & FLOATING)) //floating is easy
+ if(. && !CHECK_BITFIELD(movement_type, FLOATING)) //floating is easy
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
set_nutrition(NUTRITION_LEVEL_FED - 1) //just less than feeling vigorous
else if(nutrition && stat != DEAD)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 8464e15328..21554f25b4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1397,7 +1397,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
////////////
/datum/species/proc/handle_digestion(mob/living/carbon/human/H)
- if(HAS_TRAIT(src, TRAIT_NOHUNGER))
+ if(HAS_TRAIT(H, TRAIT_NOHUNGER))
return //hunger is for BABIES
//The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
diff --git a/code/modules/mob/living/carbon/human/species_types/xeno.dm b/code/modules/mob/living/carbon/human/species_types/xeno.dm
index e9d9aa2d5b..d3249edd96 100644
--- a/code/modules/mob/living/carbon/human/species_types/xeno.dm
+++ b/code/modules/mob/living/carbon/human/species_types/xeno.dm
@@ -14,5 +14,6 @@
skinned_type = /obj/item/stack/sheet/animalhide/xeno
exotic_bloodtype = "X*"
damage_overlay_type = "xeno"
- liked_food = MEAT
+ disliked_food = JUNKFOOD
+ liked_food = GROSS | MEAT
species_category = SPECIES_CATEGORY_ALIEN
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 2d529e976a..cbf0de51de 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -65,9 +65,9 @@
I.on_mob_death(src, gibbed)
if(mind)
mind.store_memory("Time of death: [tod]", 0)
- GLOB.alive_mob_list -= src
+ remove_from_alive_mob_list()
if(!gibbed)
- GLOB.dead_mob_list += src
+ add_to_dead_mob_list()
if(ckey)
var/datum/preferences/P = GLOB.preferences_datums[ckey]
if(P)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 12b1d82dfe..cca75f2098 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -589,8 +589,8 @@
if(full_heal)
fully_heal(admin_revive)
if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain)
- GLOB.dead_mob_list -= src
- GLOB.alive_mob_list += src
+ remove_from_dead_mob_list()
+ add_to_alive_mob_list()
suiciding = 0
stat = UNCONSCIOUS //the mob starts unconscious,
if(!eye_blind)
@@ -1289,11 +1289,11 @@
return FALSE
if(NAMEOF(src, stat))
if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life
- GLOB.dead_mob_list -= src
- GLOB.alive_mob_list += src
+ remove_from_dead_mob_list()
+ add_to_alive_mob_list()
if((stat < DEAD) && (var_value == DEAD))//Kill he
- GLOB.alive_mob_list -= src
- GLOB.dead_mob_list += src
+ remove_from_alive_mob_list()
+ add_to_dead_mob_list()
if(NAMEOF(src, health)) //this doesn't work. gotta use procs instead.
return FALSE
. = ..()
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index c60d84438c..c2bc49f9a8 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -7,6 +7,6 @@
clear_fullscreens()
//New pAI's get a brand new mind to prevent meta stuff from their previous life. This new mind causes problems down the line if it's not deleted here.
- GLOB.alive_mob_list -= src
+ remove_from_alive_mob_list()
ghostize()
qdel(src)
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index c339aa920f..ca5d3ce459 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -1,5 +1,3 @@
-#define PAI_EMP_SILENCE_DURATION 3 MINUTES
-
/mob/living/silicon/pai/blob_act(obj/structure/blob/B)
return FALSE
@@ -9,7 +7,7 @@
return
take_holo_damage(severity/2)
DefaultCombatKnockdown(severity*4)
- silent = max(silent, (PAI_EMP_SILENCE_DURATION) / SSmobs.wait / severity)
+ short_radio()
if(holoform)
fold_in(force = TRUE)
emitter_next_use = world.time + emitter_emp_cd
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 9e3b609fdd..d18494fd0d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -95,8 +95,8 @@
if(mmi.brainmob)
if(mmi.brainmob.stat == DEAD)
mmi.brainmob.stat = CONSCIOUS
- GLOB.dead_mob_list -= mmi.brainmob
- GLOB.alive_mob_list += mmi.brainmob
+ mmi.brainmob.remove_from_dead_mob_list()
+ mmi.brainmob.add_to_alive_mob_list()
mind.transfer_to(mmi.brainmob)
mmi.update_icon()
else
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 14b71b3bac..e4c087b1e1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -364,7 +364,7 @@ Difficulty: Normal
var/turf/T = get_turf(victim)
if(!istype(victim) || victim.stat == DEAD || !T || arena_cooldown > world.time)
return
- if((istype(get_area(T), /area/ruin/unpowered/hierophant) || istype(get_area(src), /area/ruin/unpowered/hierophant)) && victim != src)
+ if((istype(get_area(T), /area/ruin/lavaland/unpowered/hierophant) || istype(get_area(src), /area/ruin/lavaland/unpowered/hierophant)) && victim != src)
return
arena_cooldown = world.time + initial(arena_cooldown)
for(var/d in GLOB.cardinals)
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index e49286afef..74f5f0c2bf 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -456,7 +456,7 @@
var/dir_to_target = get_dir(get_turf(src), get_turf(L))
var/throwtarget = get_edge_target_turf(target, dir_to_target)
L.safe_throw_at(throwtarget, 10, 1, src)
- L.Paralyze(50)
+ L.drop_all_held_items()
addtimer(CALLBACK(src, .proc/reset_status), 4 + ((tiredness * tiredness_mult) / 10))
tiredness = tiredness + (gust_tiredness * tiredness_mult)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 2ed0bfa9d2..8f74d3b45f 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -1,5 +1,5 @@
/mob/Login()
- GLOB.player_list |= src
+ add_to_player_list()
lastKnownIP = client.address
computer_id = client.computer_id
log_access("Mob Login: [key_name(src)] was assigned to a [type]")
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 536eacca7d..2e2eeeb4fb 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,7 +3,7 @@
log_message("[key_name(src)] is no longer owning mob [src]([src.type])", LOG_OWNERSHIP)
SStgui.on_logout(src)
unset_machine()
- GLOB.player_list -= src
+ remove_from_player_list()
..()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 5ba4769f99..8a71bb72c4 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1,9 +1,8 @@
/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
- GLOB.mob_list -= src
- GLOB.dead_mob_list -= src
- GLOB.alive_mob_list -= src
+ remove_from_mob_list()
+ remove_from_dead_mob_list()
+ remove_from_alive_mob_list()
GLOB.all_clockwork_mobs -= src
- GLOB.mob_directory -= tag
focus = null
LAssailant = null
movespeed_modification = null
@@ -22,12 +21,11 @@
return QDEL_HINT_HARDDEL
/mob/Initialize()
- GLOB.mob_list += src
- GLOB.mob_directory[tag] = src
+ add_to_mob_list()
if(stat == DEAD)
- GLOB.dead_mob_list += src
+ add_to_dead_mob_list()
else
- GLOB.alive_mob_list += src
+ add_to_alive_mob_list()
set_focus(src)
prepare_huds()
for(var/v in GLOB.active_alternate_appearances)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index b77b9913ba..8e6226069c 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -180,3 +180,6 @@
///Override for sound_environments. If this is set the user will always hear a specific type of reverb (Instead of the area defined reverb)
var/sound_environment_override = SOUND_ENVIRONMENT_NONE
+
+/// A mock client, provided by tests and friends
+ var/datum/client_interface/mock_client
diff --git a/code/modules/mob/mob_lists.dm b/code/modules/mob/mob_lists.dm
new file mode 100644
index 0000000000..14f519ec30
--- /dev/null
+++ b/code/modules/mob/mob_lists.dm
@@ -0,0 +1,119 @@
+///Adds the mob reference to the list and directory of all mobs. Called on Initialize().
+/mob/proc/add_to_mob_list()
+ GLOB.mob_list |= src
+ GLOB.mob_directory[tag] = src
+
+///Removes the mob reference from the list and directory of all mobs. Called on Destroy().
+/mob/proc/remove_from_mob_list()
+ GLOB.mob_list -= src
+ GLOB.mob_directory -= tag
+
+///Adds the mob reference to the list of all mobs alive. If mob is cliented, it adds it to the list of all living player-mobs.
+/mob/proc/add_to_alive_mob_list()
+ GLOB.alive_mob_list |= src
+ if(client)
+ add_to_current_living_players()
+
+///Removes the mob reference from the list of all mobs alive. If mob is cliented, it removes it from the list of all living player-mobs.
+/mob/proc/remove_from_alive_mob_list()
+ GLOB.alive_mob_list -= src
+ if(client)
+ remove_from_current_living_players()
+
+
+///Adds the mob reference to the list of all the dead mobs. If mob is cliented, it adds it to the list of all dead player-mobs.
+/mob/proc/add_to_dead_mob_list()
+ GLOB.dead_mob_list |= src
+ if(client)
+ add_to_current_dead_players()
+
+///Remvoes the mob reference from list of all the dead mobs. If mob is cliented, it adds it to the list of all dead player-mobs.
+/mob/proc/remove_from_dead_mob_list()
+ GLOB.dead_mob_list -= src
+ if(client)
+ remove_from_current_dead_players()
+
+
+///Adds the cliented mob reference to the list of all player-mobs, besides to either the of dead or alive player-mob lists, as appropriate. Called on Login().
+/mob/proc/add_to_player_list()
+ SHOULD_CALL_PARENT(TRUE)
+ GLOB.player_list |= src
+ if(!SSticker?.mode)
+ return
+ if(stat == DEAD)
+ add_to_current_dead_players()
+ else
+ add_to_current_living_players()
+
+///Removes the mob reference from the list of all player-mobs, besides from either the of dead or alive player-mob lists, as appropriate. Called on Logout().
+/mob/proc/remove_from_player_list()
+ SHOULD_CALL_PARENT(TRUE)
+ GLOB.player_list -= src
+ if(!SSticker?.mode)
+ return
+ if(stat == DEAD)
+ remove_from_current_dead_players()
+ else
+ remove_from_current_living_players()
+
+
+///Adds the cliented mob reference to either the list of dead player-mobs or to the list of observers, depending on how they joined the game.
+/mob/proc/add_to_current_dead_players()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_DEAD_PLAYERS] |= src
+
+/mob/dead/observer/add_to_current_dead_players()
+ if(!SSticker?.mode)
+ return
+ if(started_as_observer)
+ SSticker.mode.current_players[CURRENT_OBSERVERS] |= src
+ return
+ return ..()
+
+/mob/dead/new_player/add_to_current_dead_players()
+ return
+
+///Removes the mob reference from either the list of dead player-mobs or from the list of observers, depending on how they joined the game.
+/mob/proc/remove_from_current_dead_players()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_DEAD_PLAYERS] -= src
+
+/mob/dead/observer/remove_from_current_dead_players()
+ if(!SSticker?.mode)
+ return
+ if(started_as_observer)
+ SSticker.mode.current_players[CURRENT_OBSERVERS] -= src
+ return
+ return ..()
+
+
+///Adds the cliented mob reference to the list of living player-mobs. If the mob is an antag, it adds it to the list of living antag player-mobs.
+/mob/proc/add_to_current_living_players()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_LIVING_PLAYERS] |= src
+ if(mind && (mind.special_role || length(mind.antag_datums)))
+ add_to_current_living_antags()
+
+///Removes the mob reference from the list of living player-mobs. If the mob is an antag, it removes it from the list of living antag player-mobs.
+/mob/proc/remove_from_current_living_players()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_LIVING_PLAYERS] -= src
+ if(LAZYLEN(mind?.antag_datums))
+ remove_from_current_living_antags()
+
+
+///Adds the cliented mob reference to the list of living antag player-mobs.
+/mob/proc/add_to_current_living_antags()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_LIVING_ANTAGS] |= src
+
+///Removes the mob reference from the list of living antag player-mobs.
+/mob/proc/remove_from_current_living_antags()
+ if(!SSticker?.mode)
+ return
+ SSticker.mode.current_players[CURRENT_LIVING_ANTAGS] -= src
diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm
index 659d9ae2c7..95ba17c733 100644
--- a/code/modules/projectiles/boxes_magazines/external/lmg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm
@@ -23,4 +23,10 @@
/obj/item/ammo_box/magazine/mm712x82/match
name = "box magazine (Match 7.12x82mm)"
+ icon_state = "a762-50"
ammo_type = /obj/item/ammo_casing/mm712x82/match
+ max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm712x82/update_icon()
+ ..()
+ icon_state = "a762-[round(ammo_count(),10)]"
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 1e6318ecba..4d394401c4 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -278,6 +278,7 @@
w_class = WEIGHT_CLASS_SMALL
require_module = 1
module_type = list(/obj/item/robot_module/miner)
+ module_flags = BORG_MODULE_MINER
var/denied_type = null
var/maximum_of_type = 1
var/cost = 30
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index 81a837504a..e3cc63c3a0 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -242,13 +242,24 @@
sleep(30)
playsound(C, 'sound/machines/defib_zap.ogg', 50, FALSE)
if(check_revivable())
+ var/tplus = world.time - C.timeofdeath
playsound(C, 'sound/machines/defib_success.ogg', 50, FALSE)
C.set_heartattack(FALSE)
+ var/oxydamage = C.getOxyLoss()
+ if(C.health < HEALTH_THRESHOLD_FULLCRIT && oxydamage)
+ var/diff = C.health - HEALTH_THRESHOLD_FULLCRIT
+ C.adjustOxyLoss(diff) //Heal their oxydamage up to hardcrit (or if less, as much as they have, since the proc has sanity)
C.revive(full_heal = FALSE, admin_revive = FALSE)
C.emote("gasp")
C.Jitter(100)
SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
- log_game("[C] has been successfully defibrillated by nanites.")
+ var/list/policies = CONFIG_GET(keyed_list/policy)
+ var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds
+ var/late = timelimit && (tplus > timelimit)
+ var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT]
+ if(policy)
+ to_chat(C, policy)
+ C.log_message("has been successfully defibrillated by nanites, [tplus] deciseconds from time of death, considered [late? "late" : "memory-intact"] revival under configured policy limits.", LOG_GAME)
else
playsound(C, 'sound/machines/defib_failed.ogg', 50, FALSE)
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index e10b05822b..5c914e3d4d 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -528,7 +528,8 @@
BZ_brain_damage_min += bz
gas_max[GAS_N2] = PP(breath, GAS_N2) + 5
- var/o2_pp = PP(breath, GAS_O2)
+ var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class]
+ var/o2_pp = class.get_effective_pp(breath)
safe_breath_min = 0.3 * o2_pp
safe_breath_max = 1.3 * o2_pp
..()
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 706a7a3910..c7f69fcaf1 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -57,8 +57,9 @@
// #include "crayons.dm"
// #include "create_and_destroy.dm"
// #include "designs.dm"
-// #include "dynamic_ruleset_sanity.dm"
+#include "dynamic_ruleset_sanity.dm"
// #include "egg_glands.dm"
+// #include "dynamic_ruleset_sanity.dm"
// #include "emoting.dm"
// #include "food_edibility_check.dm"
// #include "greyscale_config.dm"
diff --git a/code/modules/unit_tests/dynamic_ruleset_sanity.dm b/code/modules/unit_tests/dynamic_ruleset_sanity.dm
new file mode 100644
index 0000000000..837e0b235c
--- /dev/null
+++ b/code/modules/unit_tests/dynamic_ruleset_sanity.dm
@@ -0,0 +1,36 @@
+/// Verifies that roundstart dynamic rulesets are setup properly without external configuration.
+/datum/unit_test/dynamic_roundstart_ruleset_sanity
+
+/datum/unit_test/dynamic_roundstart_ruleset_sanity/Run()
+ for (var/_ruleset in subtypesof(/datum/dynamic_ruleset/roundstart))
+ var/datum/dynamic_ruleset/roundstart/ruleset = _ruleset
+
+ var/has_scaling_cost = initial(ruleset.scaling_cost)
+ var/is_lone = initial(ruleset.flags) & (LONE_RULESET | HIGH_IMPACT_RULESET)
+
+ if (has_scaling_cost && is_lone)
+ Fail("[ruleset] has a scaling_cost, but is also a lone/highlander ruleset.")
+ else if (!has_scaling_cost && !is_lone)
+ Fail("[ruleset] has no scaling cost, but is also not a lone/highlander ruleset.")
+
+/// Verifies that dynamic rulesets have unique antag_flag.
+/datum/unit_test/dynamic_unique_antag_flags
+
+/datum/unit_test/dynamic_unique_antag_flags/Run()
+ var/list/known_antag_flags = list()
+
+ for (var/datum/dynamic_ruleset/ruleset as anything in subtypesof(/datum/dynamic_ruleset))
+ if (isnull(initial(ruleset.antag_datum)))
+ continue
+
+ var/antag_flag = initial(ruleset.antag_flag)
+
+ if (isnull(antag_flag))
+ Fail("[ruleset] has a null antag_flag!")
+ continue
+
+ if (antag_flag in known_antag_flags)
+ Fail("[ruleset] has a non-unique antag_flag [antag_flag] (used by [known_antag_flags[antag_flag]])!")
+ continue
+
+ known_antag_flags[antag_flag] = ruleset
diff --git a/config/dynamic.json b/config/dynamic.json
new file mode 100644
index 0000000000..bed7b4b387
--- /dev/null
+++ b/config/dynamic.json
@@ -0,0 +1,138 @@
+{
+ "Dynamic": {},
+ "Roundstart": {
+ "Traitors": {
+ "cost": 8,
+ "scaling_cost": 9,
+ "weight": 5,
+ "required_candidates": 1,
+ "minimum_required_age": 0,
+ "requirements": [
+ 101,
+ 10,
+ 10,
+ 10,
+ 10,
+ 10,
+ 10,
+ 10,
+ 10,
+ 10
+ ],
+ "antag_cap": {
+ "denominator": 24
+ },
+ "protected_roles": [
+ "Prisoner",
+ "Security Officer",
+ "Warden",
+ "Detective",
+ "Head of Security",
+ "Captain"
+ ],
+ "restricted_roles": [
+ "Cyborg"
+ ]
+ },
+
+ "Blood Brothers": {
+ "weight": 0
+ },
+
+ "Changelings": {
+ "weight": 3
+ },
+
+ "Heretics": {
+ "weight": 3
+ },
+
+ "Wizard": {
+ "weight": 3
+ },
+
+ "Blood Cult": {
+ "weight": 2
+ },
+
+ "Nuclear Emergency": {
+ "weight": 3
+ },
+
+ "Revolution": {
+ "weight": 2
+ },
+
+ "Clock Cult": {
+ "weight": 3
+ }
+ },
+
+ "Midround": {
+ "Syndicate Sleeper Agent": {
+ "weight": 7
+ },
+
+ "Malfunctioning AI": {
+ "weight": 3
+ },
+
+ "Wizard": {
+ "weight": 2
+ },
+
+ "Nuclear Assault": {
+ "weight": 3
+ },
+
+ "Blob": {
+ "weight": 2
+ },
+
+ "Blob Infection": {
+ "weight": 2
+ },
+
+ "Alien Infestation": {
+ "weight": 3
+ },
+
+ "Nightmare": {
+ "weight": 4
+ },
+
+ "Space Dragon": {
+ "weight": 3
+ },
+
+ "Abductors": {
+ "weight": 3
+ },
+
+ "Swarmers": {
+ "weight": 3
+ },
+
+ "Space Ninja": {
+ "weight": 4
+ },
+
+ "Spiders": {
+ "weight": 0
+ }
+ },
+
+ "Latejoin": {
+ "Syndicate Infiltrator": {
+ "weight": 7
+ },
+
+ "Provocateur": {
+ "weight": 2
+ },
+
+ "Heretic Smuggler": {
+ "weight": 4
+ }
+ }
+}
diff --git a/config/entries/dynamic.txt b/config/entries/dynamic.txt
deleted file mode 100644
index e08fb7634d..0000000000
--- a/config/entries/dynamic.txt
+++ /dev/null
@@ -1,318 +0,0 @@
-## Dynamic storytellers weights: how likely each storyteller is to show up. This is adjusted by voting and recency.
-STORYTELLER_WEIGHT CHAOTIC 2
-STORYTELLER_WEIGHT TEAMWORK 4
-STORYTELLER_WEIGHT CONVERSION 0
-STORYTELLER_WEIGHT RANDOM 2
-STORYTELLER_WEIGHT CLASSIC 6
-STORYTELLER_WEIGHT INTRIGUE 6
-STORYTELLER_WEIGHT STORY 6
-STORYTELLER_WEIGHT CALM 6
-STORYTELLER_WEIGHT EXTENDED 0
-
-## Dynamic storyteller minimum player coutns: how many players before this storyteller can be rolled.
-STORYTELLER_MIN_PLAYERS CHAOTIC 30
-STORYTELLER_MIN_PLAYERS TEAMWORK 30
-
-## If this is uncommented, Dynamic won't disable certain storytellers based on recent round threats
-#NO_STORYTELLER_THREAT_REMOVAL
-
-## Injection delays: how long (in minutes) will pass before a midround or latejoin antag is injected.
-DYNAMIC_MIDROUND_DELAY_MIN 5
-DYNAMIC_MIDROUND_DELAY_MAX 15
-DYNAMIC_LATEJOIN_DELAY_MIN 10
-DYNAMIC_LATEJOIN_DELAY_MAX 30
-
-DYNAMIC_FIRST_MIDROUND_DELAY_MIN 20
-DYNAMIC_FIRST_MIDROUND_DELAY_MAX 30
-DYNAMIC_FIRST_LATEJOIN_DELAY_MIN 2
-DYNAMIC_FIRST_LATEJOIN_DELAY_MAX 30
-
-## How many roundstart players required for high population override to take effect.
-DYNAMIC_HIGH_POP_LIMIT 80 #80 instead of 55 because fewer robust players
-
-## Threat requirements for a second roundstart ruleset being drafted
-DYNAMIC_SECOND_RULE_REQUIREMENTS 101 101 101 101 100 90 80 70 60 50
-## Threat requirements for a *third* roundstart ruleset being drafted
-DYNAMIC_THIRD_RULE_REQUIREMENTS 101 101 101 101 101 100 90 80 70 60
-## As above, but if there's 79+ players
-DYNAMIC_SECOND_RULE_HIGH_POP_REQUIREMENT 50
-DYNAMIC_THIRD_RULE_HIGH_POP_REQUIREMENT 60
-
-## Pop range per requirement.
-## If the value is five the range is:
-## 0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-54, 45+
-## If it is six the range is:
-## 0-5, 6-11, 12-17, 18-23, 24-29, 30-35, 36-41, 42-47, 48-53, 54+
-## If it is seven the range is:
-## 0-6, 7-13, 14-20, 21-27, 28-34, 35-41, 42-48, 49-55, 56-62, 63+
-## Options outside this range can be used, of course.
-DYNAMIC_POP_PER_REQUIREMENT 9 # 9 instead of 6 because 1/3 of players are probably not doing much?
-
-## 1 -> 9, probability for this rule to be picked against other rules.
-## Note that requirements must also be met, and some requirements are impossible to meet.
-DYNAMIC_WEIGHT TRAITOR 5
-DYNAMIC_WEIGHT MALF_AI 1
-DYNAMIC_WEIGHT TRAITORBRO 4
-DYNAMIC_WEIGHT CHANGELING 1
-DYNAMIC_WEIGHT WIZARD 1
-DYNAMIC_WEIGHT CULT 3
-DYNAMIC_WEIGHT NUCLEAR 3
-DYNAMIC_WEIGHT REVOLUTION 2
-DYNAMIC_WEIGHT BLOODSUCKER 4
-# All below are impossible-by-default
-DYNAMIC_WEIGHT EXTENDED 3
-DYNAMIC_WEIGHT CLOCKWORK_CULT 3
-DYNAMIC_WEIGHT CLOWNOPS 3
-DYNAMIC_WEIGHT DEVIL 3
-DYNAMIC_WEIGHT MONKEY 3
-DYNAMIC_WEIGHT METEOR 3
-
-## Midround antags
-DYNAMIC_WEIGHT MIDROUND_TRAITOR 9
-DYNAMIC_WEIGHT MIDROUND_MALF_AI 5
-DYNAMIC_WEIGHT MIDROUND_WIZARD 4
-DYNAMIC_WEIGHT MIDROUND_NUCLEAR 2
-DYNAMIC_WEIGHT BLOB 2
-DYNAMIC_WEIGHT XENOS 2
-DYNAMIC_WEIGHT NIGHTMARE 3
-DYNAMIC_WEIGHT SENTIENT_DISEASE 4
-DYNAMIC_WEIGHT REVENANT 2
-DYNAMIC_WEIGHT SLAUGHTER_DEMON 1
-DYNAMIC_WEIGHT ABDUCTORS 3
-DYNAMIC_WEIGHT SPACE_NINJA 3
-
-## Events
-DYNAMIC_WEIGHT SPIDERS 5
-DYNAMIC_WEIGHT VENTCLOG_NORMAL 3
-DYNAMIC_WEIGHT VENTCLOG_THREATENING 3
-DYNAMIC_WEIGHT VENTCLOG_CATASTROPHIC 3
-DYNAMIC_WEIGHT ION_STORM 7
-DYNAMIC_WEIGHT METEOR_WAVE_NORMAL 3
-DYNAMIC_WEIGHT METEOR_WAVE_THREATENING 2
-DYNAMIC_WEIGHT METEOR_WAVE_CATASTROPHIC 1
-DYNAMIC_WEIGHT PIRATES 8
-DYNAMIC_WEIGHT ANOMALY_BLUESPACE 2
-DYNAMIC_WEIGHT ANOMALY_FLUX 2
-DYNAMIC_WEIGHT ANOMALY_GRAVITATIONAL 2
-DYNAMIC_WEIGHT ANOMALY_PYROCLASTIC 2
-DYNAMIC_WEIGHT ANOMALY_VORTEX 2
-DYNAMIC_WEIGHT BRAND_INTELLIGENCE 1
-DYNAMIC_WEIGHT CARP_MIGRATION 7
-DYNAMIC_WEIGHT COMMUNICATIONS_BLACKOUT 2
-DYNAMIC_WEIGHT PROCESSOR_OVERLOAD 2
-DYNAMIC_WEIGHT SPACE_DUST 2
-DYNAMIC_WEIGHT MAJOR_DUST 1
-DYNAMIC_WEIGHT ELECTRICAL_STORM 2
-DYNAMIC_WEIGHT HEART_ATTACK 2
-DYNAMIC_WEIGHT RADIATION_STORM 1
-
-## Latejoin antags
-DYNAMIC_WEIGHT LATEJOIN_TRAITOR 7
-DYNAMIC_WEIGHT LATEJOIN_REVOLUTION 2
-DYNAMIC_WEIGHT LATEJOIN_BLOODSUCKER 4
-DYNAMIC_WEIGHT LATEJOIN_COLLECTOR 5
-
-## Threat cost. This is decreased from the mode's threat when the rule is executed.
-DYNAMIC_COST TRAITOR 10
-DYNAMIC_COST MALF_AI 35
-DYNAMIC_COST TRAITORBRO 10
-DYNAMIC_COST CHANGELING 30
-DYNAMIC_COST WIZARD 30
-DYNAMIC_COST CULT 35
-DYNAMIC_COST NUCLEAR 45
-DYNAMIC_COST REVOLUTION 40
-DYNAMIC_cOST BLOODSUCKER 15
-DYNAMIC_COST EXTENDED 0
-DYNAMIC_COST CLOCKWORK_CULT 35
-DYNAMIC_COST CLOWNOPS 40
-DYNAMIC_COST DEVIL 0
-DYNAMIC_COST MONKEY 0
-DYNAMIC_COST METEOR 0
-
-## Midround antags
-DYNAMIC_COST MIDROUND_TRAITOR 10
-DYNAMIC_COST MIDROUND_MALF_AI 35
-DYNAMIC_COST MIDROUND_WIZARD 20
-DYNAMIC_COST MIDROUND_NUCLEAR 35
-DYNAMIC_COST BLOB 10
-DYNAMIC_COST XENOS 20
-DYNAMIC_COST NIGHTMARE 10
-DYNAMIC_COST SENTIENT_DISEASE 5
-DYNAMIC_COST REVENANT 5
-DYNAMIC_COST SLAUGHTER_DEMON 15
-DYNAMIC_COST ABDUCTORS 10
-DYNAMIC_COST SPACE_NINJA 15
-
-## Events
-DYNAMIC_COST SPIDERS 10
-DYNAMIC_COST VENTCLOG_NORMAL 2
-DYNAMIC_COST VENTCLOG_THREATENING 5
-DYNAMIC_COST VENTCLOG_CATASTROPHIC 15
-DYNAMIC_COST ION_STORM 3
-DYNAMIC_COST METEOR_WAVE_NORMAL 15
-DYNAMIC_COST METEOR_WAVE_THREATENING 25
-DYNAMIC_COST METEOR_WAVE_CATASTROPHIC 40
-DYNAMIC_COST PIRATES 10
-DYNAMIC_COST ANOMALY_BLUESPACE 3
-DYNAMIC_COST ANOMALY_FLUX 2
-DYNAMIC_COST ANOMALY_GRAVITATIONAL 3
-DYNAMIC_COST ANOMALY_PYROCLASTIC 5
-DYNAMIC_COST ANOMALY_VORTEX 5
-DYNAMIC_COST BRAND_INTELLIGENCE 5
-DYNAMIC_COST CARP_MIGRATION 3
-DYNAMIC_COST COMMUNICATIONS_BLACKOUT 5
-DYNAMIC_COST PROCESSOR_OVERLOAD 5
-DYNAMIC_COST SPACE_DUST 2
-DYNAMIC_COST MAJOR_DUST 4
-DYNAMIC_COST ELECTRICAL_STORM 1
-DYNAMIC_COST HEART_ATTACK 1
-DYNAMIC_COST RADIATION_STORM 3
-
-## Latejoin antags
-DYNAMIC_COST LATEJOIN_TRAITOR 5
-DYNAMIC_COST LATEJOIN_REVOLUTION 20
-DYNAMIC_COST LATEJOIN_BLOODSUCKER 10
-DYNAMIC_COST LATEJOIN_COLLECTOR 1
-
-## Rule will not be generated with threat levels below requirement at a pop value. Pop values are determined by dynamic's pop-per-requirement.
-## By default it's 0-8, 9-17, 18-26, 27-35, 36-44, 45-53, 54-60, 61-69, 70-78, 79+.
-## This means that 40 30 30 20 20 20 15 15 15 10 will not generate below 40 at 0-8, 30 at 9-17 etc.
-DYNAMIC_REQUIREMENTS TRAITOR 50 50 50 50 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS TRAITORBRO 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS CHANGELING 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS WIZARD 101 101 60 60 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS CULT 101 101 101 60 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS NUCLEAR 101 101 101 60 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS REVOLUTION 101 101 101 60 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS EXTENDED 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS CLOCKWORK_CULT 101 101 101 70 60 60 50 50 50 50
-DYNAMIC_REQUIREMENTS CLOWNOPS 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS DEVIL 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS MONKEY 101 101 101 101 101 101 101 101 101 101
-DYNAMIC_REQUIREMENTS METEOR 101 101 101 101 101 101 101 101 101 101
-
-## Midround antags
-DYNAMIC_REQUIREMENTS MIDROUND_TRAITOR 30 25 20 15 15 15 15 15 15 15
-DYNAMIC_REQUIREMENTS MIDROUND_MALF_AI 101 101 70 50 50 50 40 30 30 30
-DYNAMIC_REQUIREMENTS MIDROUND_WIZARD 90 90 60 40 30 30 30 30 30 30
-DYNAMIC_REQUIREMENTS MIDROUND_NUCLEAR 90 90 90 80 70 60 50 40 40 40
-DYNAMIC_REQUIREMENTS BLOB 101 101 101 80 60 50 50 50 50 50
-DYNAMIC_REQUIREMENTS XENOS 101 101 101 70 50 50 50 50 50 50
-DYNAMIC_REQUIREMENTS NIGHTMARE 101 101 101 70 50 40 20 15 15 15
-DYNAMIC_REQUIREMENTS SENTIENT_DISEASE 30 30 20 20 15 10 10 10 10 5
-DYNAMIC_REQUIREMENTS REVENANT 30 30 30 30 20 15 15 15 15 15
-DYNAMIC_REQUIREMENTS SLAUGHTER_DEMON 101 101 101 90 80 70 60 50 50 50
-DYNAMIC_REQUIREMENTS ABDUCTORS 80 80 70 50 40 30 30 20 15 15
-DYNAMIC_REQUIREMENTS SPACE_NINJA 101 101 101 90 80 70 60 50 40 30
-
-## Events
-DYNAMIC_REQUIREMENTS SPIDERS 70 60 50 50 40 40 40 30 20 15
-DYNAMIC_REQUIREMENTS VENTCLOG 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS ION_STORM 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS METEOR_WAVE 60 50 40 30 30 30 30 30 30 30
-DYNAMIC_REQUIREMENTS PIRATES 70 60 50 50 40 40 40 30 20 15
-DYNAMIC_REQUIREMENTS ANOMALY_BLUESPACE 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS ANOMALY_FLUX 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS ANOMALY_GRAVITATIONAL 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS ANOMALY_PYROCLASTIC 10 10 10 10 10 10 10 10 10 10
-DYNAMIC_REQUIREMENTS ANOMALY_VORTEX 10 10 10 10 10 10 10 10 10 10
-DYNAMIC_REQUIREMENTS BRAND_INTELLIGENCE 10 10 10 10 10 10 10 10 10 10
-DYNAMIC_REQUIREMENTS CARP_MIGRATION 10 10 10 10 10 10 10 10 10 10
-DYNAMIC_REQUIREMENTS COMMUNICATIONS_BLACKOUT 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS PROCESSOR_OVERLOAD 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS SPACE_DUST 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS MAJOR_DUST 10 10 10 10 10 10 10 10 10 10
-DYNAMIC_REQUIREMENTS ELECTRICAL_STORM 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS HEART_ATTACK 5 5 5 5 5 5 5 5 5 5
-DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5
-
-## Latejoin antags
-DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15
-DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40
-DYNAMIC_REQUIREMENTS LATEJOIN_BLOODSUCKER 40 30 20 15 15 15 15 15 15 15
-DYNAMIC_REQUIREMENTS LATEJOIN_COLLECTOR 10 10 10 10 10 10 10 10 10 10
-
-## An alternative, static requirement used instead when pop is over mode's high_pop_limit.
-DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MALF_AI 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITORBRO 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT CHANGELING 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT WIZARD 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT CULT 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT NUCLEAR 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT REVOLUTION 50
-# All below are impossible-by-default
-DYNAMIC_HIGH_POPULATION_REQUIREMENT EXTENDED 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT CLOCKWORK_CULT 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT CLOWNOPS 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT DEVIL 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MONKEY 101
-DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR 101
-
-## Midround antags
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_TRAITOR 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_MALF_AI 35
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_WIZARD 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MIDROUND_NUCLEAR 35
-DYNAMIC_HIGH_POPULATION_REQUIREMENT BLOB 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT XENOS 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT NIGHTMARE 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT SENTIENT_DISEASE 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT REVENANT 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT SLAUGHTER_DEMON 30
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ABDUCTORS 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT SPACE_NINJA 30
-
-## Events
-DYNAMIC_HIGH_POPULATION_REQUIREMENT SPIDERS 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT VENTCLOG 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ION_STORM 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT METEOR_WAVE 30
-DYNAMIC_HIGH_POPULATION_REQUIREMENT PIRATES 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_BLUESPACE 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_FLUX 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_GRAVITATIONAL 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_PYROCLASTIC 10
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ANOMALY_VORTEX 10
-DYNAMIC_HIGH_POPULATION_REQUIREMENT BRAND_INTELLIGENCE 10
-DYNAMIC_HIGH_POPULATION_REQUIREMENT CARP_MIGRATION 10
-DYNAMIC_HIGH_POPULATION_REQUIREMENT COMMUNICATIONS_BLACKOUT 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT PROCESSOR_OVERLOAD 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT SPACE_DUST 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT MAJOR_DUST 10
-DYNAMIC_HIGH_POPULATION_REQUIREMENT ELECTRICAL_STORM 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT HEART_ATTACK 5
-DYNAMIC_HIGH_POPULATION_REQUIREMENT RADIATION_STORM 5
-
-## Latejoin antags
-DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_TRAITOR 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_REVOLUTION 50
-DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_BLOODSUCKER 15
-DYNAMIC_HIGH_POPULATION_REQUIREMENT LATEJOIN_COLLECTOR 10
-
-## Dynamic traitor stuff
-
-## Requirements for "hijack the shuttle" goals.
-DYNAMIC_HIJACK_REQUIREMENTS 101 101 101 95 80 70 60 50 40 30
-
-DYNAMIC_HIJACK_HIGH_POPULATION_REQUIREMENT 25
-
-DYNAMIC_HIJACK_COST 10
-
-DYNAMIC_GLORIOUS_DEATH_COST 5
-
-DYNAMIC_ASSASSINATE_COST 2
-
-## This requirement uses threat level, rather than current threat, which is why it's higher.
-DYNAMIC_WAROPS_REQUIREMENT 60
-
-DYNAMIC_WAROPS_COST 10
-
-## Storyteller min players
-# STORYTELLER_MIN_PLAYERS CHAOTIC 35
-
-## Storyteller minimum chaos
-# STORYTELLER_MIN_CHAOS CHAOTIC 75
-
-## Storyteller maximum chaos
-# STORYTELLER_MAX_CHAOS CHAOTIC 250
diff --git a/config/entries/gamemodes.txt b/config/entries/gamemodes.txt
index f78c3743aa..7193bef584 100644
--- a/config/entries/gamemodes.txt
+++ b/config/entries/gamemodes.txt
@@ -51,6 +51,7 @@ CONTINUOUS WIZARD
#CONTINUOUS MONKEY
CONTINUOUS BLOODSUCKER
CONTINUOUS HERESY
+CONTINUOUS DYNAMIC
##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
diff --git a/config/entries/general.txt b/config/entries/general.txt
index b426881de9..5fc3512c60 100644
--- a/config/entries/general.txt
+++ b/config/entries/general.txt
@@ -465,6 +465,9 @@ ECONOMY
#Replaces standard extended/secret dichotomy with extended and calm/chaotic votes for dynamic.
#DYNAMIC_VOTING
+## Uncomment to enable dynamic ruleset config file.
+DYNAMIC_CONFIG_ENABLED
+
## Choose which Engine to start the round with. Weight is after the comma. Setting the weight to 0 removes the engine from rotation.
BOX_RANDOM_ENGINE Box SM,3
BOX_RANDOM_ENGINE Box Tesla,3
diff --git a/html/changelog.html b/html/changelog.html
index 585e61fd30..515eeef06f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -535,31 +535,6 @@
Supernova rad storms are now half as likely per tick tweak: Supernovae don't announce they're ending if they never announced they're starting tweak: Supernovae say explicitly no rad storms can happen if they can't
Monstermos is back
-
-
05 August 2021
-
Putnam3145 updated:
-
-
-
04 August 2021
-
BlueWildrose updated:
-
- - The debrained overlay actually shows for brainless corpses now instead of showing a blue error.
-
-
timothyteakettle updated:
-
- - legs are no longer awful
-
-
-
03 August 2021
-
zeroisthebiggay updated:
-
- - tempgun is a laser
- - bake mode is useful
- - tempgun has less shots
- - tempgun has more sprites
-