From f6721d02b3117752b4660acf2da650756a43accf Mon Sep 17 00:00:00 2001 From: The0bserver Date: Tue, 16 Feb 2021 09:53:09 -0500 Subject: [PATCH 01/48] Adds chemicals I missed on the first pass. --- .../reagents/chemistry/reagents/drug_reagents.dm | 7 +++++++ .../reagents/chemistry/reagents/food_reagents.dm | 5 +++++ .../chemistry/reagents/medicine_reagents.dm | 12 ++++++++++++ .../chemistry/reagents/pyrotechnic_reagents.dm | 15 +++++++++++++++ 4 files changed, 39 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 675502c5fb..51eb0bd622 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -45,6 +45,13 @@ trippy = FALSE pH = 8 +//Nicotine is used as a pesticide IRL. +/datum/reagent/drug/nicotine/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + if(chems.has_reagent(type, 1)) + mytray.adjustToxic(round(chems.get_reagent_amount(type))) + mytray.adjustPests(-rand(1,2)) + /datum/reagent/drug/nicotine/on_mob_life(mob/living/carbon/M) if(prob(1)) var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 1975eede70..303fd981fb 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -49,6 +49,11 @@ var/brute_heal = 1 var/burn_heal = 0 +/datum/reagent/consumable/nutriment/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + if(chems.has_reagent(type, 1)) + mytray.adjustHealth(round(chems.get_reagent_amount(type) * 0.2)) + /datum/reagent/consumable/nutriment/on_mob_life(mob/living/carbon/M) if(!HAS_TRAIT(M, TRAIT_NO_PROCESS_FOOD)) if(prob(50)) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index e55286ed3f..806b9c30f0 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -155,6 +155,12 @@ pH = 11 value = REAGENT_VALUE_COMMON +// Healing +/datum/reagent/medicine/cryoxadone/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + mytray.adjustHealth(round(chems.get_reagent_amount(type) * 3)) + mytray.adjustToxic(-round(chems.get_reagent_amount(type) * 3)) + /datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/carbon/M) var/power = -0.00003 * (M.bodytemperature ** 2) + 3 if(M.bodytemperature < T0C) @@ -935,6 +941,12 @@ pH = 0 value = REAGENT_VALUE_RARE +// FEED ME SEYMOUR +/datum/reagent/medicine/strange_reagent/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + if(chems.has_reagent(type, 1)) + mytray.spawnplant() + /datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(M.stat == DEAD) if(M.suiciding || M.hellbound) //they are never coming back diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 3f0ebcb3e3..2e05f66cf8 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -32,6 +32,12 @@ value = REAGENT_VALUE_VERY_COMMON taste_description = "metal" +//It has stable IN THE NAME. IT WAS MADE FOR THIS MOMENT. +/datum/reagent/stabilizing_agent/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + if(myseed && chems.has_reagent(type, 1)) + myseed.adjust_instability(-1) + /datum/reagent/clf3 name = "Chlorine Trifluoride" description = "Makes a temporary 3x3 fireball when it comes into existence, so be careful when mixing. ClF3 applied to a surface burns things that wouldn't otherwise burn, sometimes through the very floors of the station and exposing it to the vacuum of space." @@ -167,6 +173,15 @@ taste_description = "burning" value = REAGENT_VALUE_COMMON +// Smells like victory... +/datum/reagent/napalm/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user) + . = ..() + if(chems.has_reagent(type, 1)) + if(!(myseed.resistance_flags & FIRE_PROOF)) + mytray.adjustHealth(-round(chems.get_reagent_amount(type) * 6)) + mytray.adjustToxic(round(chems.get_reagent_amount(type) * 7)) + mytray.adjustWeeds(-rand(5,9)) //At least give them a small reward if they bother. + /datum/reagent/napalm/on_mob_life(mob/living/carbon/M) M.adjust_fire_stacks(1) ..() From ce013a51226379b625df6f348b396ccf41402542 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:34:51 -0700 Subject: [PATCH 02/48] Update alien.dm --- code/modules/mob/living/simple_animal/hostile/alien.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 86467624b5..13218c6292 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -78,6 +78,15 @@ projectiletype = /obj/item/projectile/neurotox projectilesound = 'sound/weapons/pierce.ogg' +/mob/living/simple_animal/hostile/alien/sentinel/cube + gold_core_spawnable = NO_SPAWN + health = 220 + maxhealth = 220 + melee_damage_lower = 20 + melee_damage_upper = 20 + del_on_death = TRUE + loot = list(/obj/effect/mob_spawn/alien/corpse/humanoid/sentinel) + /mob/living/simple_animal/hostile/alien/queen name = "alien queen" From e792d8d61f13add301d82055e48563f7b58906c2 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:35:34 -0700 Subject: [PATCH 03/48] Update snacks_meat.dm --- code/modules/food_and_drinks/food/snacks_meat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index 05a0da2793..152740f932 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -435,7 +435,7 @@ name = "alien drone cube" desc = "Just add water and run!" tastes = list("the jungle" = 1, "acid" = 1) - dried_being = /mob/living/carbon/alien/humanoid/drone + dried_being = /mob/living/simple_animal/hostile/alien/sentinel/cube /obj/item/reagent_containers/food/snacks/cube/goat name = "goat cube" From 2a6e70941da3ccc40e46c5ffb955ecc33a7d5ccd Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:41:27 -0700 Subject: [PATCH 04/48] Update alien.dm --- code/modules/mob/living/simple_animal/hostile/alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index 13218c6292..05d6eda435 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -81,7 +81,7 @@ /mob/living/simple_animal/hostile/alien/sentinel/cube gold_core_spawnable = NO_SPAWN health = 220 - maxhealth = 220 + maxHealth = 220 melee_damage_lower = 20 melee_damage_upper = 20 del_on_death = TRUE From 15a8d1d5e07c987f761567f9847f212bb72014f3 Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Sat, 20 Feb 2021 17:24:30 -0800 Subject: [PATCH 05/48] i did a thing - reverted salt nerf - made it so you can't parry while resting --- code/modules/clothing/gloves/miscellaneous.dm | 4 ++-- code/modules/mob/living/carbon/human/human_defines.dm | 8 ++++---- code/modules/mob/living/living_active_parry.dm | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 4728001699..a558abbfe8 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -220,8 +220,8 @@ parry_max_attacks = INFINITY parry_failed_cooldown_duration = 2.25 SECONDS parry_failed_stagger_duration = 2.25 SECONDS - parry_cooldown = 3 SECONDS - parry_failed_clickcd_duration = 0.5 SECONDS + parry_cooldown = 0 + parry_failed_clickcd_duration = 0 /obj/item/clothing/gloves/botanic_leather name = "botanist's leather gloves" diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 772022a987..ca1a26fa07 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -142,10 +142,10 @@ parry_efficiency_considered_successful = 0.01 parry_efficiency_to_counterattack = 0.01 parry_max_attacks = INFINITY - parry_failed_cooldown_duration = 3 SECONDS - parry_failed_stagger_duration = 2 SECONDS - parry_cooldown = 3 SECONDS - parry_failed_clickcd_duration = 0.8 SECONDS + parry_failed_cooldown_duration = 1.5 SECONDS + parry_failed_stagger_duration = 2 + parry_cooldown = 0 + parry_failed_clickcd_duration = 0.8 parry_data = list( // yeah it's snowflake "UNARMED_PARRY_STAGGER" = 3 SECONDS, diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm index c0423286c1..10f8aaf2f4 100644 --- a/code/modules/mob/living/living_active_parry.dm +++ b/code/modules/mob/living/living_active_parry.dm @@ -23,6 +23,9 @@ if(!(combat_flags & COMBAT_FLAG_PARRY_CAPABLE)) to_chat(src, "You are not something that can parry attacks.") return + if(!(mobility_flags & MOBILITY_STAND)) + to_chat(src, "You aren't able to parry without solid footing!") + return // Prioritize item, then martial art, then unarmed. // yanderedev else if time var/obj/item/using_item = get_active_held_item() From 6a694841aaaa519121c6d2ef30813f6d5672900f Mon Sep 17 00:00:00 2001 From: kiwedespars <47008095+kiwedespars@users.noreply.github.com> Date: Sat, 20 Feb 2021 17:46:06 -0800 Subject: [PATCH 06/48] i forgot this thing microstagger is now a stagger --- code/modules/mob/living/carbon/human/human_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index ca1a26fa07..66d3154ee3 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -143,7 +143,7 @@ parry_efficiency_to_counterattack = 0.01 parry_max_attacks = INFINITY parry_failed_cooldown_duration = 1.5 SECONDS - parry_failed_stagger_duration = 2 + parry_failed_stagger_duration = 1 SECONDS parry_cooldown = 0 parry_failed_clickcd_duration = 0.8 From 1eb2d3dd93b4279d0b8e42cb969ebb1593703b9a Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Sun, 21 Feb 2021 02:58:19 -0600 Subject: [PATCH 07/48] buhhh lingfist nerf --- code/modules/mob/living/carbon/human/species.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c3cdb3354f..c17f3b58c5 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1454,9 +1454,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/armor_block = target.run_armor_check(affecting, "melee") - if(HAS_TRAIT(user, TRAIT_MAULER)) // maulers get 15 armorpierce because if you're going to punch someone you might as well do a good job of it - armor_block = target.run_armor_check(affecting, "melee", armour_penetration = 15) // lot of good that sec jumpsuit did you - playsound(target.loc, user.dna.species.attack_sound, 25, 1, -1) target.visible_message("[user] [atk_verb]ed [target]!", \ "[user] [atk_verb]ed you!", null, COMBAT_MESSAGE_RANGE, null, \ @@ -1473,9 +1470,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) target.apply_damage(damage*1.5, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus) target.apply_damage(damage*0.5, STAMINA, affecting, armor_block) log_combat(user, target, "kicked") - else if(HAS_TRAIT(user, TRAIT_MAULER)) // mauler punches deal 1.1x raw damage + 1.3x stam damage, and have some armor pierce - target.apply_damage(damage*1.1, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus) - target.apply_damage(damage*1.3, STAMINA, affecting, armor_block) + else if(HAS_TRAIT(user, TRAIT_MAULER)) // mauler punches deal 1.2x raw damage but nstam + target.apply_damage(damage*1.2, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus) log_combat(user, target, "punched (mauler)") else //other attacks deal full raw damage + 2x in stamina damage target.apply_damage(damage, attack_type, affecting, armor_block, wound_bonus = punchwoundbonus) From 81fdb96968a30e19a9f1b150ac22bdf6f04415cb Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 21 Feb 2021 17:50:23 -0500 Subject: [PATCH 08/48] small moment --- code/modules/tcg/cards.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm index ff7d2fee2a..258e7a4c23 100644 --- a/code/modules/tcg/cards.dm +++ b/code/modules/tcg/cards.dm @@ -66,6 +66,7 @@ desc = "A flipped TCG-branded card." icon_state = "cardback" icon = 'icons/obj/tcg/pack_1.dmi' + w_class = WEIGHT_CLASS_SMALL var/datum_type = /datum/tcg_card var/datum/tcg_card/card_datum @@ -548,6 +549,7 @@ desc = "A TCG-branded card binder, specifically for your infinite collection of TCG cards!" icon = 'icons/obj/tcg/misc.dmi' icon_state = "binder" + w_class = WEIGHT_CLASS_SMALL var/list/cards = list() var/list/decks = list() From cc8c75539ea29411e030e30522ef5cd6e7acc0f0 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Tue, 23 Feb 2021 12:50:33 +0100 Subject: [PATCH 09/48] sigh --- .../antagonists/changeling/changeling.dm | 38 +++++++------------ .../antagonists/traitor/classes/subterfuge.dm | 9 ++--- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index ba4578add9..9c0b19cd83 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -433,31 +433,21 @@ destroy_objective.find_target() objectives += destroy_objective else - if(prob(70)) - var/datum/objective/assassinate/once/kill_objective = new - kill_objective.owner = owner - if(team_mode) //No backstabbing while in a team - kill_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) - else - kill_objective.find_target() - objectives += kill_objective - - /*else - var/datum/objective/maroon/maroon_objective = new - maroon_objective.owner = owner - if(team_mode) - maroon_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) - else - maroon_objective.find_target() - objectives += maroon_objective*/ + var/datum/objective/assassinate/once/kill_objective = new + kill_objective.owner = owner + if(team_mode) //No backstabbing while in a team + kill_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1) + else + kill_objective.find_target() + objectives += kill_objective - if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) - var/datum/objective/escape/escape_with_identity/identity_theft = new - identity_theft.owner = owner - identity_theft.target = kill_objective.target - identity_theft.update_explanation_text() - objectives += identity_theft - escape_objective_possible = FALSE + if(!(locate(/datum/objective/escape) in objectives) && escape_objective_possible && prob(50)) + var/datum/objective/escape/escape_with_identity/identity_theft = new + identity_theft.owner = owner + identity_theft.target = kill_objective.target + identity_theft.update_explanation_text() + objectives += identity_theft + escape_objective_possible = FALSE if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible) if(prob(50)) diff --git a/code/modules/antagonists/traitor/classes/subterfuge.dm b/code/modules/antagonists/traitor/classes/subterfuge.dm index ea073f38c1..73dc455a45 100644 --- a/code/modules/antagonists/traitor/classes/subterfuge.dm +++ b/code/modules/antagonists/traitor/classes/subterfuge.dm @@ -12,11 +12,10 @@ mode = SSticker.mode assassin_prob = max(0,mode.threat_level-40) if(prob(assassin_prob)) - if(prob(assassin_prob)) - var/datum/objective/assassinate/once/kill_objective = new - kill_objective.owner = T.owner - kill_objective.find_target() - T.add_objective(kill_objective) + var/datum/objective/assassinate/once/kill_objective = new + kill_objective.owner = T.owner + kill_objective.find_target() + T.add_objective(kill_objective) else var/list/weights = list() weights["sabo"] = length(subtypesof(/datum/sabotage_objective)) From 9f3b30acea9360daaf0441c9a4a87be29c67041e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 23 Feb 2021 06:01:30 -0600 Subject: [PATCH 10/48] Automatic changelog generation for PR #14268 [ci skip] --- html/changelogs/AutoChangeLog-pr-14268.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14268.yml diff --git a/html/changelogs/AutoChangeLog-pr-14268.yml b/html/changelogs/AutoChangeLog-pr-14268.yml new file mode 100644 index 0000000000..9138987c8d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14268.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - balance: "xeno cube makes hostile xenos now, and drops a sentinel instead of a drone." From 6c5acc3b4d2eb40123cff236e658fa4fce3fcf2a Mon Sep 17 00:00:00 2001 From: SandPoot Date: Tue, 23 Feb 2021 16:42:07 -0300 Subject: [PATCH 11/48] upload files --- code/game/machinery/doors/airlock.dm | 4 +++- code/game/objects/items.dm | 2 ++ code/game/objects/items/tools/crowbar.dm | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index d9444c3157..f4a65ce984 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1062,7 +1062,7 @@ to_chat(user, "The airlock's motors resist your efforts to force it!") else if(locked) to_chat(user, "The airlock's bolts prevent it from being forced!") - else if( !welded && !operating) + else if(!welded && !operating) if(!beingcrowbarred) //being fireaxe'd var/obj/item/fireaxe/axe = I if(!axe.wielded) @@ -1073,6 +1073,8 @@ INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) if(I.tool_behaviour == TOOL_CROWBAR) + if(!I.can_force_powered) + return if(hasPower() && isElectrified()) shock(user,100)//it's like sticking a forck in a power socket return diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index df64ca72a5..8a09bca0bf 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -116,6 +116,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb var/buffer = null var/show_wires = FALSE var/datum/integrated_io/selected_io = null //functional for integrated circuits. + //Special crowbar + var/can_force_powered = FALSE var/reach = 1 //In tiles, how far this weapon can reach; 1 for adjacent, which is default diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 36f89e57f2..f0fd29adbc 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -88,6 +88,7 @@ usesound = 'sound/items/jaws_pry.ogg' force = 15 toolspeed = 0.25 + can_force_powered = TRUE /obj/item/crowbar/power/suicide_act(mob/user) user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") From 86235abef68961f52e562dbea1e75ba3a08c8c43 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 23 Feb 2021 13:52:44 -0600 Subject: [PATCH 12/48] Automatic changelog generation for PR #14299 [ci skip] --- html/changelogs/AutoChangeLog-pr-14299.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14299.yml diff --git a/html/changelogs/AutoChangeLog-pr-14299.yml b/html/changelogs/AutoChangeLog-pr-14299.yml new file mode 100644 index 0000000000..c58037d83a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14299.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Regular crowbars no longer open powered airlocks." From 04764600bb5b7201c4d96976093b1bf125d99701 Mon Sep 17 00:00:00 2001 From: keronshb Date: Tue, 23 Feb 2021 16:25:18 -0500 Subject: [PATCH 13/48] Unlocks Sentient disease abilities Let's the Sentient Disease start with stuff to unlock. --- code/modules/antagonists/disease/disease_abilities.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/disease/disease_abilities.dm b/code/modules/antagonists/disease/disease_abilities.dm index 496d11bcbc..fc53575bd8 100644 --- a/code/modules/antagonists/disease/disease_abilities.dm +++ b/code/modules/antagonists/disease/disease_abilities.dm @@ -191,8 +191,6 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/action/sneeze name = "Voluntary Sneezing" actions = list(/datum/action/cooldown/disease_sneeze) - cost = 2 - required_total_points = 3 short_desc = "Force the host you are following to sneeze, spreading your infection to those in front of them." long_desc = "Force the host you are following to sneeze with extra force, spreading your infection to any victims in a 4 meter cone in front of your host.
Cooldown: 20 seconds" @@ -229,8 +227,6 @@ new /datum/disease_ability/symptom/powerful/youth /datum/disease_ability/action/infect name = "Secrete Infection" actions = list(/datum/action/cooldown/disease_infect) - cost = 2 - required_total_points = 3 short_desc = "Cause all objects your host is touching to become infectious for a limited time, spreading your infection to anyone who touches them." long_desc = "Cause the host you are following to excrete an infective substance from their pores, causing all objects touching their skin to transmit your infection to anyone who touches them for the next 30 seconds. This includes the floor, if they are not wearing shoes, and any items they are holding, if they are not wearing gloves.
Cooldown: 40 seconds" @@ -271,23 +267,20 @@ new /datum/disease_ability/symptom/powerful/youth //healing costs more so you have to techswitch from naughty disease otherwise we'd have friendly disease for easy greentext (no fun!) /datum/disease_ability/symptom/mild - cost = 2 - required_total_points = 4 category = "Symptom (Weak)" /datum/disease_ability/symptom/medium - cost = 4 - required_total_points = 8 category = "Symptom" /datum/disease_ability/symptom/medium/heal cost = 5 + required_total_points = 5 malefit = -1 category = "Symptom (+)" /datum/disease_ability/symptom/powerful cost = 4 - required_total_points = 16 + required_total_points = 10 category = "Symptom (Strong)" /datum/disease_ability/symptom/powerful/heal From a55d492d9d9eeda1bd5549dee39e23bd5cfd67a9 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Tue, 23 Feb 2021 18:58:18 -0500 Subject: [PATCH 14/48] reading moment --- code/modules/tcg/cards.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm index 258e7a4c23..54d6d5abd9 100644 --- a/code/modules/tcg/cards.dm +++ b/code/modules/tcg/cards.dm @@ -66,7 +66,6 @@ desc = "A flipped TCG-branded card." icon_state = "cardback" icon = 'icons/obj/tcg/pack_1.dmi' - w_class = WEIGHT_CLASS_SMALL var/datum_type = /datum/tcg_card var/datum/tcg_card/card_datum From afbc8edd35df371daa46dfecda7eea260f4646f8 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 24 Feb 2021 00:13:51 +0000 Subject: [PATCH 15/48] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/AutoChangeLog-pr-14268.yml | 4 ---- html/changelogs/AutoChangeLog-pr-14299.yml | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14268.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14299.yml diff --git a/html/changelog.html b/html/changelog.html index 56ecc7ee31..1a9457b200 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,16 @@ -->
+

24 February 2021

+

SandPoot updated:

+
    +
  • Regular crowbars no longer open powered airlocks.
    • +
+

silicons updated:

+
    +
  • xeno cube makes hostile xenos now, and drops a sentinel instead of a drone.
    • +
+

23 February 2021

keronshb updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 44a9aa916f..5ce1e25a37 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28585,3 +28585,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. timothyteakettle: - bugfix: banning panel prioritises mobs with clients now when trying to find them if they're in the game +2021-02-24: + SandPoot: + - bugfix: Regular crowbars no longer open powered airlocks. + silicons: + - balance: xeno cube makes hostile xenos now, and drops a sentinel instead of a + drone. diff --git a/html/changelogs/AutoChangeLog-pr-14268.yml b/html/changelogs/AutoChangeLog-pr-14268.yml deleted file mode 100644 index 9138987c8d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14268.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - balance: "xeno cube makes hostile xenos now, and drops a sentinel instead of a drone." diff --git a/html/changelogs/AutoChangeLog-pr-14299.yml b/html/changelogs/AutoChangeLog-pr-14299.yml deleted file mode 100644 index c58037d83a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14299.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - bugfix: "Regular crowbars no longer open powered airlocks." From 8400a664e85dad614823c8fa33ae9689b9bd1e4e Mon Sep 17 00:00:00 2001 From: R3dtail <45108567+R3dtail@users.noreply.github.com> Date: Tue, 23 Feb 2021 22:00:49 -0600 Subject: [PATCH 16/48] Enables Novel Posting --- code/__DEFINES/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 57484ae85b..791e6554ab 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -86,7 +86,7 @@ #define EMOTE_OMNI 4 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam -#define MAX_MESSAGE_LEN 2048 //Citadel edit: What's the WORST that could happen? +#define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen? #define MAX_FLAVOR_LEN 4096 //double the maximum message length. #define MAX_TASTE_LEN 40 //lick... vore... ew... #define MAX_NAME_LEN 42 From 60708b03dfeb328ea936fa4270807087693d2051 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 24 Feb 2021 05:16:15 +0100 Subject: [PATCH 17/48] check --- .../game/machinery/computer/buildandrepair.dm | 6 ---- code/game/machinery/constructable_frame.dm | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 280348368d..00ba621550 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -117,12 +117,6 @@ if(user.a_intent == INTENT_HARM) return ..() -//callback proc used on stacks use_tool to stop unnecessary amounts being wasted from spam clicking. -/obj/structure/frame/computer/proc/check_state(target_state) - if(state == target_state) - return TRUE - return FALSE - /obj/structure/frame/computer/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(state == 4) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index b00edfd82c..d5bbcb0adc 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -21,6 +21,11 @@ circuit = null qdel(src) +//callback proc used on stacks use_tool to stop unnecessary amounts being wasted from spam clicking. +/obj/structure/frame/proc/check_state(target_state) + if(state == target_state) + return TRUE + return FALSE /obj/structure/frame/machine name = "machine frame" @@ -84,7 +89,7 @@ if(!P.tool_start_check(user, amount=5)) return to_chat(user, "You start to add cables to the frame...") - if(P.use_tool(src, user, 20, volume=50, amount=5)) + if(P.use_tool(src, user, 20, volume=50, amount=5, extra_checks = CALLBACK(src, .proc/check_state, 1))) to_chat(user, "You add cables to the frame.") state = 2 icon_state = "box_1" @@ -93,25 +98,23 @@ if(P.tool_behaviour == TOOL_SCREWDRIVER && !anchored) user.visible_message("[user] disassembles the frame.", \ "You start to disassemble the frame...", "You hear banging and clanking.") - if(P.use_tool(src, user, 40, volume=50)) - if(state == 1) - to_chat(user, "You disassemble the frame.") - var/obj/item/stack/sheet/metal/M = new (loc, 5) - M.add_fingerprint(user) - qdel(src) + if(P.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/check_state, 1))) + to_chat(user, "You disassemble the frame.") + var/obj/item/stack/sheet/metal/M = new (loc, 5) + M.add_fingerprint(user) + qdel(src) return if(P.tool_behaviour == TOOL_WRENCH) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") - if(P.use_tool(src, user, 40, volume=75)) - if(state == 1) - to_chat(user, "You [anchored ? "un" : ""]secure [name].") - setAnchored(!anchored) + if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 1))) + to_chat(user, "You [anchored ? "un" : ""]secure [name].") + setAnchored(!anchored) return if(2) if(P.tool_behaviour == TOOL_WRENCH) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") - if(P.use_tool(src, user, 40, volume=75)) + if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 2))) to_chat(user, "You [anchored ? "un" : ""]secure [name].") setAnchored(!anchored) return @@ -169,7 +172,7 @@ if(P.tool_behaviour == TOOL_WRENCH && !circuit.needs_anchored) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") - if(P.use_tool(src, user, 40, volume=75)) + if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 3))) to_chat(user, "You [anchored ? "un" : ""]secure [name].") setAnchored(!anchored) return From 94cc70f7b9139bbd3ad3fb8891e4d205e69e815c Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 24 Feb 2021 01:21:00 -0700 Subject: [PATCH 18/48] Update traits.dm --- code/_globalvars/traits.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index f376ba50d7..965513d98c 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -15,6 +15,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_HUSK" = TRAIT_HUSK, "TRAIT_SACRIFICED" = TRAIT_SACRIFICED, "TRAIT_NOCLONE" = TRAIT_NOCLONE, + "TRAIT_CLOWN_MENTALITY" = TRAIT_CLOWN_MENTALITY, "TRAIT_CLUMSY" = TRAIT_CLUMSY, "TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS, "TRAIT_DUMB" = TRAIT_DUMB, From fd497b3297700a5d7dc230b4b046ebefb9f396b8 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 24 Feb 2021 01:23:06 -0700 Subject: [PATCH 19/48] Update traits.dm --- code/_globalvars/traits.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 965513d98c..ac6ea4e25c 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -15,7 +15,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_HUSK" = TRAIT_HUSK, "TRAIT_SACRIFICED" = TRAIT_SACRIFICED, "TRAIT_NOCLONE" = TRAIT_NOCLONE, - "TRAIT_CLOWN_MENTALITY" = TRAIT_CLOWN_MENTALITY, "TRAIT_CLUMSY" = TRAIT_CLUMSY, "TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS, "TRAIT_DUMB" = TRAIT_DUMB, @@ -133,6 +132,9 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NODROP" = TRAIT_NODROP, "TRAIT_NO_TELEPORT" = TRAIT_NO_TELEPORT, "TRAIT_SPOOKY_THROW" = TRAIT_SPOOKY_THROW + ), + /datum/mind = list( + "TRAIT_CLOWN_MENTALITY" = TRAIT_CLOWN_MENTALITY ) )) From 504a36f50dc854dee6b479d1601eae61f0399f62 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 24 Feb 2021 01:36:03 -0700 Subject: [PATCH 20/48] Update holy_weapons.dm --- code/game/objects/items/holy_weapons.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index a541fb8fe3..44121d64d1 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -771,7 +771,10 @@ /obj/item/nullrod/tribal_knife/process() slowdown = rand(-2, 2) - + if(iscarbon(loc)) + var/mob/living/carbon/wielder = loc + if(wielder.is_holding(src)) + wielder.update_equipment_speed_mods() /obj/item/nullrod/pitchfork icon_state = "pitchfork0" From 2c8880c087198242b8ac7c4f5fe41d2568b4c6f9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 Feb 2021 05:37:26 -0600 Subject: [PATCH 21/48] Automatic changelog generation for PR #14294 [ci skip] --- html/changelogs/AutoChangeLog-pr-14294.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14294.yml diff --git a/html/changelogs/AutoChangeLog-pr-14294.yml b/html/changelogs/AutoChangeLog-pr-14294.yml new file mode 100644 index 0000000000..f724b96568 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14294.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Traitor / Ling objective amount should now be correct again." From b2b8534edc9afbeb4b54d33971d62365243e3301 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Wed, 24 Feb 2021 18:50:12 +0100 Subject: [PATCH 22/48] im fucking retarded thinking that was balanced --- .../code/modules/projectiles/guns/ballistic/rifles.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm index 5a3f149dbb..e89bb92b33 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm @@ -168,8 +168,8 @@ /obj/item/projectile/bullet/cflechetteshredder //you only get this with a 30TC bundle,5 magazines, as such this should be the superior ammotype name = "flechette (shredder)" damage = 10 - dismemberment = 50 - wound_bonus = 50 + dismemberment = 15 + wound_bonus = 20 armour_penetration = 100 sharpness = SHARP_EDGED wound_falloff_tile = 0 From aca2f896870a5442e325f36e02e48d24bc14f257 Mon Sep 17 00:00:00 2001 From: R3dtail <45108567+R3dtail@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:20:21 -0600 Subject: [PATCH 23/48] Update say.dm Deleted the comment on line 90 since max_message_len and max_flavor_len are now equal as it was a requested change --- code/__DEFINES/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 791e6554ab..9403eca2da 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -87,7 +87,7 @@ //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam #define MAX_MESSAGE_LEN 4096 //Citadel edit: What's the WORST that could happen? -#define MAX_FLAVOR_LEN 4096 //double the maximum message length. +#define MAX_FLAVOR_LEN 4096 #define MAX_TASTE_LEN 40 //lick... vore... ew... #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 From ccc50ff9ceb78da9e3c58a142dbdcdb22a3697b8 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 24 Feb 2021 20:47:46 -0300 Subject: [PATCH 24/48] upload toxichealing.dm --- code/modules/surgery/advanced/toxichealing.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/surgery/advanced/toxichealing.dm b/code/modules/surgery/advanced/toxichealing.dm index 0e0fd10c1c..adec2857fc 100644 --- a/code/modules/surgery/advanced/toxichealing.dm +++ b/code/modules/surgery/advanced/toxichealing.dm @@ -24,6 +24,12 @@ /datum/surgery_step/toxichealing/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] starts rejuvenating some of [target]'s flesh back to life.", "You start knitting some of [target]'s flesh back to life.") +/datum/surgery_step/toxichealing/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) + if(..()) + while((target.getToxLoss() >= 1) || (target.getOxyLoss() >= 1)) + if(!..()) + break + /datum/surgery_step/toxichealing/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] fixes some of [target]'s wounds.", "You succeed in fixing some of [target]'s wounds.") target.heal_bodypart_damage(0,0,30) //Heals stam From f79ed26258e3ab66b547fa793907263b49259a6f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 25 Feb 2021 00:13:41 +0000 Subject: [PATCH 25/48] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-14294.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14294.yml diff --git a/html/changelog.html b/html/changelog.html index 1a9457b200..ef4f86f424 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
    +

    25 February 2021

    +

    DeltaFire15 updated:

    +
      +
    • Traitor / Ling objective amount should now be correct again.
      • +
    +

    24 February 2021

    SandPoot updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 5ce1e25a37..3898798d10 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28591,3 +28591,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. silicons: - balance: xeno cube makes hostile xenos now, and drops a sentinel instead of a drone. +2021-02-25: + DeltaFire15: + - bugfix: Traitor / Ling objective amount should now be correct again. diff --git a/html/changelogs/AutoChangeLog-pr-14294.yml b/html/changelogs/AutoChangeLog-pr-14294.yml deleted file mode 100644 index f724b96568..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14294.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Traitor / Ling objective amount should now be correct again." From 2819d028f0166fc866721b87335dda129fdf8d92 Mon Sep 17 00:00:00 2001 From: Jay Date: Wed, 24 Feb 2021 22:52:05 -0600 Subject: [PATCH 26/48] Fixes misaligned sprite for the strange metal mask donator item --- icons/mob/clothing/custom_w.dmi | Bin 48424 -> 48375 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/clothing/custom_w.dmi b/icons/mob/clothing/custom_w.dmi index 5116be4d52979a31b84a49cf1ae5ae2fd08950ed..3d3e0d24aae5fcc89435b08da44cb6b5ebd52783 100644 GIT binary patch delta 8916 zcmcI}_d^rU^Y_s~K&m1|KoF%Py-1fPMG=q=L7KEsqzZ(iizuR^ROt#Ly@Rv>O7Fb~ zM3CMgkOcA^@6Y#Nc=E&Lc5i2PW_D-hwX@$bgy=KEGLckJNj`RC0l&NSivByHD(Ceu z;`e*vx3X5wa_U@L3!OgDGrq5({5CBuR}`_@06M;(+3{}W^t}B*O8?HkWBHd-L5_Y4nX+kpL5i8O z-g(XJhWU>iKn}#whc-J(Kh}O>6)bBcPdKx1k^xElFv7i7y!h-k%T2*GGitrJ!6{=Zo)) zY5y2EVHVei_u=)2T@Gg72k1&rUcdFRlLKS}-oJkjhDJsbf06U;DYS|XQBfgylrHzJ zgVT^>??(FgYN5l%SV4aVS;M&EJAKz?V*`rEf;mfMAxQ7Cf86e_!gD`GOukb5$NJsD zO1V?zBj(Y2F4(Z$hHK*b>(vhF0PP1#4u7wWF+L*`lR~BZN9n36Dq%weG3Mvcv^qzJ zhv4Bg#n#R^R%w>=uC^q<2EXm_j4R?!M5~iB58$*DN$>rsPj&ExDeq1QfJPiefCf7g zhwu~Bn?Noal&~}iUp4Vwl9#(!l*-0nWa^szP!1I@hKjLYUJ4#b+*Xw!At90RTm%55 zd#wQAxrihvVE+CYb7}LBiHXsTjq>(I=G9l6ot?FGbQl!LsuFRy;Hb?KsBbj?v8K5> zO8}qT4P5~h3sEuC_|Is9Ugb2e{fbh*N4DEkPq~JypRd#^><5LHUL5|E;Qo7#j2rBm z&L@m=)$rfkc^bt@KD<{^T8d7H{~|>FIl{KlG3d{ze2K@XdP4UX4)9cNs#i=Ih7l9@ zL}JxKSuSb`?2gpUYBAF>~pbGrK0tPprU2YRZ{ww)QK>n z)o+g5l1_`peuB#^_jbub=xt6uC50g+D_z~mcZ0$gopgrSQh01&m$*3iAD6w__R`*R4|V5CZVoz6%*iXGcsFg)(!#psL|UY1j;!9`(&d=dVq4j@RaoSb1}UD zzXJxrJa0{-N$cMhXPH{kVBs;-VBn1FMBz1Xnp2Xr@VIyf>ih3O;Z6R7c-tXFvZ3r> zc(?-GO&LdCT4cl+h#1=<1cLD*O6_%^Qc02&b=JjgV4r);RPC_Uic-EsK6!PVtfH9+ zc{qq){uM+3C_QSd9d6~MKYI1+B>Y6vk;-_(W4Rn>59cZl!EA-^1hyAOTVQu9Z26gmuHNY@a5ja7IypX!?R>*RDCG1lu(lMK3_ z=L`Pi%1_iZg~HB8cnj0b&mUh4W*kc_r@j(+Y^UWWB6*$J3{W~{FOe^=ODW0tB6XGVy zINEZfVv#4ekb;vopI?!-CH-^3m*CY&E?fEJ>13eNQ3glw@wV!*0Qfi;o1Q*abD@+G zsS-i9)R))acHBUv+jeevC-<)w#U5J71-sNUYJkatT8V-o6cEdfZxyBQWn?H4SpL-e zFWM|&vQN$@t?>(mkJS=n0zzj{+xLBx|IN-2zDJ)ktkRDmkkA%2C>4+9$LP-eV4$Dw zOFNXeC|g4<3V=lBX~&vHLCbp25TYIfhk`%hO@k|vD1X`?Gy(iTd!XjBMxU~gu@UD_ zxPl`Ng);w0P>dht9}7kilzVwOnOH?XfK8GYt6s8Xr9HOFbxU~uZN+z+dk4!wdz`)( z;=%v!;OEImGuRd!-V@p#te_UV#FDKr3p+|f@tc9AMYg!NmZa$(u7!!s$EA|Ke~yFD zjg-}sEt-1jB(}?cJPWo2dd0GKH#X^@6>5KtM6b;s3NK-d8C+2Kvx?GRZ!n9vS`*s) z_xN&}@tzTmZCv5u@rvWml`AxI55z%hzqjjibo0Agw~x0#$bG1QBDSdBO9;rDjcT=}JAfg;b7Cby*>VBP-(mX^8l6>8&8rmsTES((=T z0D#5ep_+;jB@6T5O^XGae*+VoE{~!;8OBnZuBGh4pJZ0dRKxy+U7L0)SWh5efFcqB z-4$kDX)Kws{j$@5c9&QPw|Oe{|9yJ)$t%_DBOG2Oap*D8euF%mGY0I+?W>+l@S1V2 zMl}7|jho?$>P=YXec}{C5-Mf`1uZU{BS-E^9NP~Gw7G-=O)@8WIQfm0#j8ht9`>P~ z0WJ&u)pECc`MkHI8g`xW0vlQM5-POBboU%ens~K~+6@soW@e9;Klt5{}cTG|Nqe8rHx~Z+f!q?@;oeVBz>>a01^Mw^7fKrt?vY3 zou#mYo;sZlvz?n5k_)seKVwJ;}e4*VF|~5uEo7?-1RAY^Qp)c)E!hPiVX4 zSCd^uo@@8>na44SZ_}R{xvy`_+u1X_ek{X~JEDH$wEeLvg)mEtSJ~;gW4;=lK14nk zfG{?!gn$8rmh4v4MDQEe&9M`Ra;vyGbXatr*2?z@^UYD}f_-#Aaqhf^j@?l0waJNF zk{9gp>x3KKp^6%S7PB3imB;~knVGZ&^dpPpEFLuo&%Q*WUYPaB>nvzB*&R9 zn-BF^kYWU%8ZX{{tnK`k>hCT7Y?}g9hSbb~ff^}^L9f4cpq4))T)|8!IE%J*u*O+M zfJpn$u(er*2=D(?CM`Zgm^GR-C7R#FhbI-Nn^+m;6bkcS&Jt88k|lRR;%nvwPd87! zD#fsh31-%Lu(a-|6m$Bv=T9JGQtve_OGsnlTa1Wx6PRL2eS^Sq^kyjn zS~b>hd?c*!!6YdW#O9>G@7CgI*S5(f>$-Hc2=G5M#ViQ~Nr=H<+wu%o?e&c~S1G|c zF*8_c*bZ4IBhk+GLRU1Eh{teDrE<6N&b_hyadvmirFm_f^rkYI4}61DMDFSzQb%5o z4`-jgn|f~I%qIsy7G!9md&$F!&-YE`8rYpaJv7zA%K~rfl^ZRQ(nP;hbV5PWC#_{!xq9-}4_Pmpu>~E5ZO8Xt{q|)M!*Tf_D zQ4Y@emAzM_>-%ZqeyzUJ;IgQX=S=;cg*t)i^IIl5oTan|nS6`qcHr(&$+TJHLTQn+?@H-w}iK4@i1oWBA4xkQK#D;f4_l>l+suzZ+$fD-e zFGa-cY!W2*C-Ogq&esmPO$BBmd?<*Efa5&9f=w}FhdlA z^X8}+sm&MIA4GJGpfZG4Y(9PZ^c51n-NC)q;-R+oM>-AefR;T)x^IS<6CWPwW4&ya zz#i?tA;M!v4)94TRavR zZ%eU)v*n6Q zxo_F5o8VBGf^e-x`K+5;J9bldl&q1AS&{@cD2NcZrGNeQoQI3@$@KSOAFQzs^7*HtEJuskQVDNG5Mnz>Mw=Lnj z)rC?11M4aM#z84YJ1%pwMhQ2+Gn0n-JjX^c{s+A=6iyC2PC}3uhJU?%TT~#A=t*4s zHytTOZu_)SH-&IcE}~MgqoH9_!^Wg)@F>Iv{;;8dOl(iAYK^`w5i)Z&z)Yvowft;8 zt8#GO{r7k1Jb?J!+S9uvhcMqL?^-BiG9(R93eK0s4v4FQgB$Rx7}p*>y}f4=uAkSE zC$_xGjm^UEkaHb4&AMK3=jS`ks$hY$I?lO3O~vm;9eOs`7lMOvyZUn#SG~$~}L#y>5BL_wH_)H!}85N{`=_V&L$=4ayk~5r=fiAO9h5N$i7ef!J5*W2#}1eI z(VSWx8~+D)MrjS_`Q7Pt;RaV*vnaS^PaJWQ$~zeNvcXK$JkF&J2$1U2nTzdRsgRI? zvOKu=@Tq%M3t3$t+x8498rt`t_QkCoq?;SA`fR=OL!}dfLkHNF2Tx!eZ`|~9Z-jQ7 z56^AyZ{{x9H)^b*6E5dgP5qB#2DR+3&^!Qz3^8%)hm!KZ=}z6gwn_YQv?GEq`uiyH z-()4=bUU7t!hd-MBBe^^jCud+c_0vaQu|WG6=cn_5>|!fGp~s~G0kSy#w-zj&bo|$ zH%F6j3ojL{v^@Pc#3<^URC=Rs zwS%YdzZ{6%i3j<3NW;tMb0f|{C7SIIC(@5G6B`Um50E@g=Yl+TtTWQWW>HFw<)lG{ zX`qN{+1q#P(Zixh9q;Re!1cFvUsLbJf7VSVmxco1nhk19Y=nje!G$Bou-t1g3xu*M z5DMj8(h+rdd(#dCr(DyQVV?ztf$JSSsW)?b+UnFuo-z>tmq|YYkUT_O zi0*bid@WDMNnUu`S|-|OLVBm2SoI-la(AidaU>Ig714yX|2c#uG$i|6WvjdyV_i3G zTFgDVIjsA^c`N2c1#pdb-Uw#=3(9CJv=@8#ub5|^zc{Rh6`NcNjGKOKOa}oNQ8|Je zl0H>S%b5`RBIjZxKb5+j;b8uGn+5tRYHxe%642T>O{lS%GhDsKPz8~1dA+`Lb85-` zuz|q9Bj&c|sU~W4e0r$&T^a!lx-Al`<)->iwz3 zZF0J=eP6n5vA+ob{&?cqW(Grv#D&ps1XWynKWB9U>5CF>%vrK*ylH9{8JjKK2GxFvN~$hq@Ex^u0hVmIot zt!Dtwoxjhb`jTRZZL#3*XPs4<1c09|HYNL3?AX=3d0hj?0ej2BgMcU(%>BG`s@Yn& zVbYs-&mak1@P{&|7i6pt5=e_U&UJHRJzDkFprqbYEU0@`liy{m?{Q6y;#KyDyF^Kb z(W`+oH^{l@7gvdt`-2e<-}VGHtf zXyMI?B*+D{-WiP{9Voc(MGTU+xv)R5 z_;hN&Qrsr({n+Af*oT+T*R|IF# zpY_9P#o4RoUkB-m@i%5{Pt(&qBqiwHP>nU$9ST=(FV?pHR^wUYTqMK7o-zhiAEGNt z2rRypa;yYHHdik!h}U79IUj#M$E9gIdq^W@1kNZZnX}Anosl`ON``Y1-r*#w3H;e@ zGxRu}&-Slh{v_LmkP-w2eFOWS)kMP1^A;?kie!qWU_lou(Zh!}K^58ABLh3lSoiU_ z@W+HV6lm<*h*gNS6L{ACgPaP&<3r{Qj!Bu`-Y=#{l>XXG>l~IJ(a5^gy!@I&I&%Wf zeX%_GgJaT@Mid^Ow;m6s%Wr`z*K_7!d`2_Oy~Lqs01y;JI_VFUTBL3~rQT&`ETgz` zkH8b8iZ*46>${`t&;dgkhF=k{|K}La2hLi!>lykjOaXf8A24ew zPtd~uR{sV%Na3G%mzFOF3w8K|yKnK<7rWM*v0^scSQ_b&@759N7h^t482M<@gr`-a z`_1oV84_zyXBQ_B9u^96Zm!3|oS(~Y`hrwbk5}8r?=qhxoGIhGkqf?_abHSnTqk)L zpbW_uoS0SpZB9SBvpz2;=Cz>GVFczCs}eDQLmz;ekX?UJ?D;)e1@kA#y~cNpmOv|!D` z+e1P;=>fsE~U(f4v| zs*)%)`Sqmlk%IAGXtk zT;(b3a24qb6L=ZWg^P#4f9egEvWZ}(4j%q&MV@aHk?OylDyOGrh+wV0uUi+?TVvj! ze$1j!$B#N@nQq^v5VsLHj(Dv}T7iCv4a#UWj#pfJ33>$4pXSw2?`#AcN-k{U_Zk&3 z-uwy-#7miF_iO-b!$;A!!D<2eM+Ni$c>n$C>f;X%RHBX+uM2MzgkB)Es?@o zFznKK1v!g2G_@eoNMXN*`3+jZsQ*soP?6yO{zDy;veF;r%W>(K+&9k;jzX2{+`hEM|WAp0?1F}7pT-2u3(-Irbj&$ zT|?uy>MKXEp`1m?uHZD#h35IGqDA$t@#ZTc71pxRb^H7NJ8A=RgY84!6Dv@~C4Gbn zx$aW|T@_Thq8^<;)Y5wY13Z~ClXnZ6Dzr+Zc!3b2nPtDja3_Xb)g!P%Z^-4`^A<1B zY6{bPidNjKgD z?6qiUHvVTb-Kw!&p*y4ny{R~3IUY$A5-WfUxI3sfju5M^o}RY194D&A#)&R%6>HPE zcNP7?h3{5AJfS8WN5MN6Yzjd~j66EDYB5=ovI4qONoOy*A|trJtC$uP6vQf0uCgh< zFg;b~ETPHz0Iv58{rjTeKhe9lI+!M+z&)OEbhI^G`9znP&fQITsz5g+m~Gaw%y5{c z^@foUZ!xgn9 zt#@w`RoccJy_O*qv&ry1;TYmLxtR4lI8y1e@^h`X;~UDK^sIZQM{65yjsRr#S}Z&Z zN(z5A>Wr!1#yQagi>7CyfUQTbmt6W*y=L#;$w`>?b_JC_Y<0D~Yhy)dxKkog|3kH|HB_nG4Xp5VL*!@b)S%!dc~lpZ@a4vuEjQ@##$-2*b0FB8oXD2S0U1}qiaspbH`l(O zCmZ`mOvipIY2z-(s@O#W@Jg2w09V=MqMy**UPj&;Y(=e`#$h!&?Apod^H{>H!AwKM z`bSJ|T(28~JK&@+&UuWeJLfM;YxS3R;~N(*7!oO%TZQb8NseVzB56XXWkf`1AjZG5 zxyO?a5A9g9t%$X@hR$n^!y^@O>%hM{tD_cUbF?LO4#I&c1KgcQ<+=~ zA_#bk{*@x&DZ}QnetgNC8;_A>yGph?kWLA#u^>dCan4@Xe@v1AuiC>P32fGjTu;xo z)J^3!SriwniC?v6m)IpX({=X5tFSV}Yf9mQlJEPM{A@7>?OQML{^4F4fzo;3o2e#O zX-nZGbBxPq9tmNXOgpw32H&X~k|XZv0Vf?w7R zA^i)#UL23dq!=b-lDx0KtYLh&CCQGbXSO*c&!k$ zR8)A9SuIY`Xs3-N9`1p1#NolgJvYy{<_oyrgCGH5+91c^YVw>A_;X*jyrz+bGGyhY z5+u+KrI1EBEj~%f>gm??9v+Kv(hJCj-6q%6<_rjDYl!OU zUPR3>;ZHl278lC9K_fk(ottR@(AldH(Q+Nf&yZ9Sxa*;<9ZL)6YMiz#JN)&xv$Gzk z3l{P?9q%=jZaQ~F@eL{r&Wa6M$)G1EQRm2FJPrztXlUGT!enRTKH}k-{r_#JjaCG- zV=fJI#7dhhJQ#?U!%)YxP6U(HglsS;`@>TF_5&6eB3#6`;al`s>}P>8r|f^NjPlrTve^{jPSk1` zT~if>w_&V{<39s=^=Ys9-rv|L2@A`%Ga?%Y)Ja@xXQ#Jsx@&fRziJItU^fVW$&FHq zaWeNfwTu=|<`)x!Phs%oe64iK8F1tB8p2%rE2}3mH!CxJpLlbox)PHSw&Y@^aKnAx zceL8|x%~ZQid(fyp6BnL-1Mw2S=b~45g_G#&3@tEVm5+7yl&{O| z!Q_7=0xI)lIQ3&gA#?V3PL+#VBbTLqa}6Zv)p3@ZcQ zSvRoGhWX&jCPHNT6Y0GH%;QKZ;tF%v8|zX2x0nbB7CGG{c0)pm^^Dcco>fVGs-3)O z!b5xXhl;838a>2pmG(Ws{q#pt*t6;6bKKUQ$>q&tc(^6FX*|f*m5De>nS5~(vN<87 zdX%QxFqq>JMkrrvM}k3I3X-j(Ok)Rx);?Ycro`_LgEtc8Ue0pI%X1Ym{+K_p@Ms?A zt$EFGmm*%Jx2j;&GiwbH6B85U!@IQ5@GC+0HdTrjO6bzC_}$ou9RT`0RDYyaqG}WV F{{Zx1XNCX( delta 8924 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 LPgKg4t%Cj!I38=R From c816fcb672542a9bb7d94e99046952c8d98fb704 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 25 Feb 2021 05:11:47 -0700 Subject: [PATCH 27/48] Update instruments.dm --- code/__DEFINES/instruments.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/instruments.dm b/code/__DEFINES/instruments.dm index 3c414f87f4..69d2a60e51 100644 --- a/code/__DEFINES/instruments.dm +++ b/code/__DEFINES/instruments.dm @@ -19,7 +19,7 @@ #define INSTRUMENT_EXP_FALLOFF_MAX 10 /// Minimum volume for when the sound is considered dead. -#define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0 +#define INSTRUMENT_MIN_SUSTAIN_DROPOFF 1 #define SUSTAIN_LINEAR 1 #define SUSTAIN_EXPONENTIAL 2 From bf6c574ea41e83748d3276d6cd4d6cdaca5907bd Mon Sep 17 00:00:00 2001 From: Putnam Date: Thu, 25 Feb 2021 05:55:44 -0800 Subject: [PATCH 28/48] Makes tablets not permacontam. --- code/modules/modular_computers/computers/item/computer.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 63cb1cc5fa..e53f4087ab 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -9,6 +9,7 @@ var/light_on = FALSE integrity_failure = 0.5 max_integrity = 100 + rad_flags = RAD_PROTECT_CONTENTS armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0) var/enabled = 0 // Whether the computer is turned on. From 9b6c23fa9c7612929a5c9e50aa05c5463bddd67d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 25 Feb 2021 18:03:03 -0600 Subject: [PATCH 29/48] Automatic changelog generation for PR #14303 [ci skip] --- html/changelogs/AutoChangeLog-pr-14303.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14303.yml diff --git a/html/changelogs/AutoChangeLog-pr-14303.yml b/html/changelogs/AutoChangeLog-pr-14303.yml new file mode 100644 index 0000000000..eddaf71cd6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14303.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - code_imp: "All machine-frame based tool-use actions now have state-checking callbacks." From 2c728535c5bdcd9ec4d8a1165b34a4d482519197 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 26 Feb 2021 00:13:46 +0000 Subject: [PATCH 30/48] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-14303.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14303.yml diff --git a/html/changelog.html b/html/changelog.html index ef4f86f424..d5bb2485e1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
      +

      26 February 2021

      +

      DeltaFire15 updated:

      +
        +
      • All machine-frame based tool-use actions now have state-checking callbacks.
        • +
      +

      25 February 2021

      DeltaFire15 updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3898798d10..ed74d59468 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28594,3 +28594,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-02-25: DeltaFire15: - bugfix: Traitor / Ling objective amount should now be correct again. +2021-02-26: + DeltaFire15: + - code_imp: All machine-frame based tool-use actions now have state-checking callbacks. diff --git a/html/changelogs/AutoChangeLog-pr-14303.yml b/html/changelogs/AutoChangeLog-pr-14303.yml deleted file mode 100644 index eddaf71cd6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14303.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - code_imp: "All machine-frame based tool-use actions now have state-checking callbacks." From 744f393d38d0a003c42b481332ccbc4e033a57a1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 25 Feb 2021 20:35:11 -0600 Subject: [PATCH 31/48] Automatic changelog generation for PR #14305 [ci skip] --- html/changelogs/AutoChangeLog-pr-14305.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14305.yml diff --git a/html/changelogs/AutoChangeLog-pr-14305.yml b/html/changelogs/AutoChangeLog-pr-14305.yml new file mode 100644 index 0000000000..3fbb7accfa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14305.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "chaplain arrythmic knives can no longer be abused for infinite speed." From ac0fd530f27129c8a139aaadc1587c03cdcceabd Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 26 Feb 2021 00:13:23 -0800 Subject: [PATCH 32/48] Makes polychromic windbreaker's message not be nonsense --- code/modules/clothing/suits/miscellaneous.dm | 6 ++++++ code/modules/clothing/suits/toggles.dm | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 8580b153b2..3e72765234 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1040,6 +1040,12 @@ icon_state = "wbreakpoly" item_state = "wbreakpoly" +/obj/item/clothing/suit/toggle/wbreakpoly/on_toggle(mob/user) + if(suittoggled) + to_chat(usr, "You zip up [src].") + else + to_chat(usr, "You unzip [src].") + /obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize() . = ..() AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index aa22834670..98d6809d64 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -110,6 +110,9 @@ suit_toggle(user) return TRUE +/obj/item/clothing/suit/toggle/proc/on_toggle(mob/user) // override this, not suit_toggle, which does checks + to_chat(usr, "You toggle [src]'s [togglename].") + /obj/item/clothing/suit/toggle/ui_action_click() suit_toggle() @@ -119,7 +122,7 @@ if(!can_use(usr)) return 0 - to_chat(usr, "You toggle [src]'s [togglename].") + on_toggle(usr) if(src.suittoggled) src.icon_state = "[initial(icon_state)]" src.suittoggled = FALSE From 08d19e349fdd92453bdc761903586b4212e1c80a Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Fri, 26 Feb 2021 10:06:53 -0300 Subject: [PATCH 33/48] Update code/modules/surgery/advanced/toxichealing.dm Co-authored-by: Putnam3145 --- code/modules/surgery/advanced/toxichealing.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/toxichealing.dm b/code/modules/surgery/advanced/toxichealing.dm index adec2857fc..376fb43c31 100644 --- a/code/modules/surgery/advanced/toxichealing.dm +++ b/code/modules/surgery/advanced/toxichealing.dm @@ -27,7 +27,8 @@ /datum/surgery_step/toxichealing/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE) if(..()) while((target.getToxLoss() >= 1) || (target.getOxyLoss() >= 1)) - if(!..()) + . = ..() + if(!.) break /datum/surgery_step/toxichealing/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) From 51595705e4fe81153b6428d159a994b26c349ba9 Mon Sep 17 00:00:00 2001 From: dzahlus Date: Fri, 26 Feb 2021 20:59:28 +0100 Subject: [PATCH 34/48] simpin for slimes --- code/modules/antagonists/eldritch_cult/eldritch_magic.dm | 2 +- code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm | 2 +- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index ba79cca07a..bb95a8bdf3 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -566,7 +566,7 @@ human_user.adjustBruteLoss(-10, FALSE) human_user.adjustFireLoss(-10, FALSE) human_user.adjustStaminaLoss(-10, FALSE) - human_user.adjustToxLoss(-10, FALSE) + human_user.adjustToxLoss(-10, FALSE, TRUE) human_user.adjustOxyLoss(-10) /obj/effect/proc_holder/spell/pointed/manse_link diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 9d65396c63..43678e17c6 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -183,7 +183,7 @@ var/mob/living/carbon/human/human_user = user human_user.adjustBruteLoss(-6, FALSE) human_user.adjustFireLoss(-6, FALSE) - human_user.adjustToxLoss(-6, FALSE) + human_user.adjustToxLoss(-6, FALSE, TRUE) human_user.adjustOxyLoss(-6, FALSE) human_user.adjustStaminaLoss(-20) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 6552d82e95..fe8f923e1a 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2545,7 +2545,7 @@ M.drowsyness = max(M.drowsyness-5, 0) M.AdjustAllImmobility(-40, FALSE) M.adjustStaminaLoss(-15, FALSE) - M.adjustToxLoss(-3, FALSE) + M.adjustToxLoss(-3, FALSE, TRUE) M.adjustOxyLoss(-3, FALSE) M.adjustBruteLoss(-3, FALSE) M.adjustFireLoss(-3, FALSE) From 107abc05519be36adf7a2817965b6afcd67bb25d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:35:05 -0600 Subject: [PATCH 35/48] Automatic changelog generation for PR #14285 [ci skip] --- html/changelogs/AutoChangeLog-pr-14285.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14285.yml diff --git a/html/changelogs/AutoChangeLog-pr-14285.yml b/html/changelogs/AutoChangeLog-pr-14285.yml new file mode 100644 index 0000000000..83acb59ab4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14285.yml @@ -0,0 +1,4 @@ +author: "kappa-sama" +delete-after: True +changes: + - tweak: "cards and card binders are now small-class items" From 0621bf3f4daa264a54e97f08d5a017cf3d332b6f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:36:04 -0600 Subject: [PATCH 36/48] Automatic changelog generation for PR #14283 [ci skip] --- html/changelogs/AutoChangeLog-pr-14283.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14283.yml diff --git a/html/changelogs/AutoChangeLog-pr-14283.yml b/html/changelogs/AutoChangeLog-pr-14283.yml new file mode 100644 index 0000000000..560b6e0355 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14283.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - balance: "Lingfists (trait_mauler) now deal no stam damage and lost their 15(!!!) armor penetration." From eda96681e20346d8531eeef349e4f810eb5a00cc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:36:11 -0600 Subject: [PATCH 37/48] Automatic changelog generation for PR #14281 [ci skip] --- html/changelogs/AutoChangeLog-pr-14281.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14281.yml diff --git a/html/changelogs/AutoChangeLog-pr-14281.yml b/html/changelogs/AutoChangeLog-pr-14281.yml new file mode 100644 index 0000000000..5a8d1fdc5f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14281.yml @@ -0,0 +1,5 @@ +author: "kiwedespars" +delete-after: True +changes: + - balance: "reverted the pr that absolutely gutted pugilism and made it worse than base unarmed, also gives it a second long stagger" + - balance: "removed the ability to parry while horizontal, because that's dumb and makes it easy to just time the parries right." From a4a5fa2e7d65086ce9abbe51149f282cc0cc6eff Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:36:29 -0600 Subject: [PATCH 38/48] Automatic changelog generation for PR #14300 [ci skip] --- html/changelogs/AutoChangeLog-pr-14300.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14300.yml diff --git a/html/changelogs/AutoChangeLog-pr-14300.yml b/html/changelogs/AutoChangeLog-pr-14300.yml new file mode 100644 index 0000000000..eb6bf4e2ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14300.yml @@ -0,0 +1,5 @@ +author: "keronshb" +delete-after: True +changes: + - balance: "16 > 10 unlock cost for stronger abilities" + - balance: "Made nearly all other abilities for free." From 933522d6f96e5761ea43e85ff9b7ba059b9082f2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:38:58 -0600 Subject: [PATCH 39/48] Automatic changelog generation for PR #14289 [ci skip] --- html/changelogs/AutoChangeLog-pr-14289.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14289.yml diff --git a/html/changelogs/AutoChangeLog-pr-14289.yml b/html/changelogs/AutoChangeLog-pr-14289.yml new file mode 100644 index 0000000000..71c8364b6f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14289.yml @@ -0,0 +1,4 @@ +author: "TheObserver-sys" +delete-after: True +changes: + - rscadd: "Chems that should have been usable are now usable, try some cryoxadone on a plant today!!!" From dbc6e1435880722bcf3c75321f3d1c0fe7f4226f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 14:41:45 -0600 Subject: [PATCH 40/48] Automatic changelog generation for PR #14316 [ci skip] --- html/changelogs/AutoChangeLog-pr-14316.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14316.yml diff --git a/html/changelogs/AutoChangeLog-pr-14316.yml b/html/changelogs/AutoChangeLog-pr-14316.yml new file mode 100644 index 0000000000..fafa28453d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14316.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - tweak: "Tablets now protect their contents from rads." From 9ea578987ff38bf89a83f35eceb257f8574799a0 Mon Sep 17 00:00:00 2001 From: R3dtail <45108567+R3dtail@users.noreply.github.com> Date: Fri, 26 Feb 2021 15:03:32 -0600 Subject: [PATCH 41/48] Bigger Belly Doubles the number of characters available to be used for bellies_desc_max. Additionally, doubles the number of characters available for the bellies_name_max. --- code/modules/vore/eating/vorepanel.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/vorepanel.dm b/code/modules/vore/eating/vorepanel.dm index 6e3951e60a..37ea23b171 100644 --- a/code/modules/vore/eating/vorepanel.dm +++ b/code/modules/vore/eating/vorepanel.dm @@ -4,8 +4,8 @@ #define BELLIES_MAX 20 #define BELLIES_NAME_MIN 2 -#define BELLIES_NAME_MAX 12 -#define BELLIES_DESC_MAX 1024 +#define BELLIES_NAME_MAX 24 +#define BELLIES_DESC_MAX 2048 /mob/living/proc/insidePanel() set name = "Vore Panel" From 99dbe4bd1e855d9e7daabed1869e49215a608fac Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 27 Feb 2021 00:13:56 +0000 Subject: [PATCH 42/48] Automatic changelog compile [ci skip] --- html/changelog.html | 32 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 21 ++++++++++++++ html/changelogs/AutoChangeLog-pr-14281.yml | 5 ---- html/changelogs/AutoChangeLog-pr-14283.yml | 4 --- html/changelogs/AutoChangeLog-pr-14285.yml | 4 --- html/changelogs/AutoChangeLog-pr-14289.yml | 4 --- html/changelogs/AutoChangeLog-pr-14300.yml | 5 ---- html/changelogs/AutoChangeLog-pr-14305.yml | 4 --- html/changelogs/AutoChangeLog-pr-14316.yml | 4 --- 9 files changed, 53 insertions(+), 30 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14281.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14283.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14285.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14289.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14300.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14305.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14316.yml diff --git a/html/changelog.html b/html/changelog.html index d5bb2485e1..6b6c8b2589 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,38 @@ -->
        +

        27 February 2021

        +

        Hatterhat updated:

        +
          +
        • Lingfists (trait_mauler) now deal no stam damage and lost their 15(!!!) armor penetration.
          • +
        +

        Putnam3145 updated:

        +
          +
        • Tablets now protect their contents from rads.
          • +
        +

        TheObserver-sys updated:

        +
          +
        • Chems that should have been usable are now usable, try some cryoxadone on a plant today!!!
          • +
        +

        kappa-sama updated:

        +
          +
        • cards and card binders are now small-class items
          • +
        +

        keronshb updated:

        +
          +
        • 16 > 10 unlock cost for stronger abilities
          • +
        • Made nearly all other abilities for free.
          • +
        +

        kiwedespars updated:

        +
          +
        • reverted the pr that absolutely gutted pugilism and made it worse than base unarmed, also gives it a second long stagger
          • +
        • removed the ability to parry while horizontal, because that's dumb and makes it easy to just time the parries right.
          • +
        +

        silicons updated:

        +
          +
        • chaplain arrythmic knives can no longer be abused for infinite speed.
          • +
        +

        26 February 2021

        DeltaFire15 updated:

          diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ed74d59468..6d36900b23 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28597,3 +28597,24 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2021-02-26: DeltaFire15: - code_imp: All machine-frame based tool-use actions now have state-checking callbacks. +2021-02-27: + Hatterhat: + - balance: Lingfists (trait_mauler) now deal no stam damage and lost their 15(!!!) + armor penetration. + Putnam3145: + - tweak: Tablets now protect their contents from rads. + TheObserver-sys: + - rscadd: Chems that should have been usable are now usable, try some cryoxadone + on a plant today!!! + kappa-sama: + - tweak: cards and card binders are now small-class items + keronshb: + - balance: 16 > 10 unlock cost for stronger abilities + - balance: Made nearly all other abilities for free. + kiwedespars: + - balance: reverted the pr that absolutely gutted pugilism and made it worse than + base unarmed, also gives it a second long stagger + - balance: removed the ability to parry while horizontal, because that's dumb and + makes it easy to just time the parries right. + silicons: + - bugfix: chaplain arrythmic knives can no longer be abused for infinite speed. diff --git a/html/changelogs/AutoChangeLog-pr-14281.yml b/html/changelogs/AutoChangeLog-pr-14281.yml deleted file mode 100644 index 5a8d1fdc5f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14281.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "kiwedespars" -delete-after: True -changes: - - balance: "reverted the pr that absolutely gutted pugilism and made it worse than base unarmed, also gives it a second long stagger" - - balance: "removed the ability to parry while horizontal, because that's dumb and makes it easy to just time the parries right." diff --git a/html/changelogs/AutoChangeLog-pr-14283.yml b/html/changelogs/AutoChangeLog-pr-14283.yml deleted file mode 100644 index 560b6e0355..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14283.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "Lingfists (trait_mauler) now deal no stam damage and lost their 15(!!!) armor penetration." diff --git a/html/changelogs/AutoChangeLog-pr-14285.yml b/html/changelogs/AutoChangeLog-pr-14285.yml deleted file mode 100644 index 83acb59ab4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14285.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kappa-sama" -delete-after: True -changes: - - tweak: "cards and card binders are now small-class items" diff --git a/html/changelogs/AutoChangeLog-pr-14289.yml b/html/changelogs/AutoChangeLog-pr-14289.yml deleted file mode 100644 index 71c8364b6f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14289.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TheObserver-sys" -delete-after: True -changes: - - rscadd: "Chems that should have been usable are now usable, try some cryoxadone on a plant today!!!" diff --git a/html/changelogs/AutoChangeLog-pr-14300.yml b/html/changelogs/AutoChangeLog-pr-14300.yml deleted file mode 100644 index eb6bf4e2ac..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14300.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - balance: "16 > 10 unlock cost for stronger abilities" - - balance: "Made nearly all other abilities for free." diff --git a/html/changelogs/AutoChangeLog-pr-14305.yml b/html/changelogs/AutoChangeLog-pr-14305.yml deleted file mode 100644 index 3fbb7accfa..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14305.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "chaplain arrythmic knives can no longer be abused for infinite speed." diff --git a/html/changelogs/AutoChangeLog-pr-14316.yml b/html/changelogs/AutoChangeLog-pr-14316.yml deleted file mode 100644 index fafa28453d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14316.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - tweak: "Tablets now protect their contents from rads." From af4b8ef0c5f30c5cb583b0261610eb14940cd25c Mon Sep 17 00:00:00 2001 From: R3dtail <45108567+R3dtail@users.noreply.github.com> Date: Fri, 26 Feb 2021 19:36:44 -0600 Subject: [PATCH 43/48] Update vorepanel.dm Made it uniform with the maximum characters allowed for emotes because uniformity is nice. --- code/modules/vore/eating/vorepanel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/eating/vorepanel.dm b/code/modules/vore/eating/vorepanel.dm index 37ea23b171..5622ec0382 100644 --- a/code/modules/vore/eating/vorepanel.dm +++ b/code/modules/vore/eating/vorepanel.dm @@ -5,7 +5,7 @@ #define BELLIES_MAX 20 #define BELLIES_NAME_MIN 2 #define BELLIES_NAME_MAX 24 -#define BELLIES_DESC_MAX 2048 +#define BELLIES_DESC_MAX 4096 /mob/living/proc/insidePanel() set name = "Vore Panel" From 8452fff356624ebd50d9bf479f99932a783ae6a6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 26 Feb 2021 19:42:36 -0600 Subject: [PATCH 44/48] Automatic changelog generation for PR #14326 [ci skip] --- html/changelogs/AutoChangeLog-pr-14326.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14326.yml diff --git a/html/changelogs/AutoChangeLog-pr-14326.yml b/html/changelogs/AutoChangeLog-pr-14326.yml new file mode 100644 index 0000000000..2dc18b5674 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14326.yml @@ -0,0 +1,4 @@ +author: "R3dtail" +delete-after: True +changes: + - tweak: "doubled max belly name length and quadrupled belly description length" From 6cd8486c7712bf691d3ad95b64b99ffe68887b7e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 27 Feb 2021 14:41:35 -0600 Subject: [PATCH 45/48] Automatic changelog generation for PR #14325 [ci skip] --- html/changelogs/AutoChangeLog-pr-14325.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14325.yml diff --git a/html/changelogs/AutoChangeLog-pr-14325.yml b/html/changelogs/AutoChangeLog-pr-14325.yml new file mode 100644 index 0000000000..73694d8794 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14325.yml @@ -0,0 +1,4 @@ +author: "dzahlus" +delete-after: True +changes: + - bugfix: "fixes toxinlovers dying from heretic stuff that should heal them instead" From 5a11f6209ce721d3bc616aac4983a9e955071476 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 27 Feb 2021 14:43:38 -0600 Subject: [PATCH 46/48] Automatic changelog generation for PR #14321 [ci skip] --- html/changelogs/AutoChangeLog-pr-14321.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14321.yml diff --git a/html/changelogs/AutoChangeLog-pr-14321.yml b/html/changelogs/AutoChangeLog-pr-14321.yml new file mode 100644 index 0000000000..c1afc0f3ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14321.yml @@ -0,0 +1,5 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Polychromic windbreaker's alt-click message is now coherent" + - code_imp: "Toggleable suits now have an on_toggle proc to be overridden." From 30ad7e0a3efd88e5b608818b30d244dd91738da4 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 27 Feb 2021 17:13:18 -0600 Subject: [PATCH 47/48] Automatic changelog generation for PR #14311 [ci skip] --- html/changelogs/AutoChangeLog-pr-14311.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14311.yml diff --git a/html/changelogs/AutoChangeLog-pr-14311.yml b/html/changelogs/AutoChangeLog-pr-14311.yml new file mode 100644 index 0000000000..fd76cc3f4d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14311.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - tweak: "Body rejuvenation surgery will loop until the patient is completely healed." From 59ba3155e0016c6ef9cdcfc71d485ac1c00efdcc Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 28 Feb 2021 00:14:48 +0000 Subject: [PATCH 48/48] Automatic changelog compile [ci skip] --- html/changelog.html | 19 +++++++++++++++++++ html/changelogs/.all_changelog.yml | 10 ++++++++++ html/changelogs/AutoChangeLog-pr-14311.yml | 4 ---- html/changelogs/AutoChangeLog-pr-14321.yml | 5 ----- html/changelogs/AutoChangeLog-pr-14325.yml | 4 ---- html/changelogs/AutoChangeLog-pr-14326.yml | 4 ---- 6 files changed, 29 insertions(+), 17 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14311.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14321.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14325.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-14326.yml diff --git a/html/changelog.html b/html/changelog.html index 6b6c8b2589..65e2d571a2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,25 @@ -->
          +

          28 February 2021

          +

          Putnam3145 updated:

          +
            +
          • Polychromic windbreaker's alt-click message is now coherent
            • +
          • Toggleable suits now have an on_toggle proc to be overridden.
            • +
          +

          R3dtail updated:

          +
            +
          • doubled max belly name length and quadrupled belly description length
            • +
          +

          SandPoot updated:

          +
            +
          • Body rejuvenation surgery will loop until the patient is completely healed.
            • +
          +

          dzahlus updated:

          +
            +
          • fixes toxinlovers dying from heretic stuff that should heal them instead
            • +
          +

          27 February 2021

          Hatterhat updated:

            diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 6d36900b23..6ba2436d94 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -28618,3 +28618,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. makes it easy to just time the parries right. silicons: - bugfix: chaplain arrythmic knives can no longer be abused for infinite speed. +2021-02-28: + Putnam3145: + - bugfix: Polychromic windbreaker's alt-click message is now coherent + - code_imp: Toggleable suits now have an on_toggle proc to be overridden. + R3dtail: + - tweak: doubled max belly name length and quadrupled belly description length + SandPoot: + - tweak: Body rejuvenation surgery will loop until the patient is completely healed. + dzahlus: + - bugfix: fixes toxinlovers dying from heretic stuff that should heal them instead diff --git a/html/changelogs/AutoChangeLog-pr-14311.yml b/html/changelogs/AutoChangeLog-pr-14311.yml deleted file mode 100644 index fd76cc3f4d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14311.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SandPoot" -delete-after: True -changes: - - tweak: "Body rejuvenation surgery will loop until the patient is completely healed." diff --git a/html/changelogs/AutoChangeLog-pr-14321.yml b/html/changelogs/AutoChangeLog-pr-14321.yml deleted file mode 100644 index c1afc0f3ac..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14321.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Polychromic windbreaker's alt-click message is now coherent" - - code_imp: "Toggleable suits now have an on_toggle proc to be overridden." diff --git a/html/changelogs/AutoChangeLog-pr-14325.yml b/html/changelogs/AutoChangeLog-pr-14325.yml deleted file mode 100644 index 73694d8794..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14325.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "dzahlus" -delete-after: True -changes: - - bugfix: "fixes toxinlovers dying from heretic stuff that should heal them instead" diff --git a/html/changelogs/AutoChangeLog-pr-14326.yml b/html/changelogs/AutoChangeLog-pr-14326.yml deleted file mode 100644 index 2dc18b5674..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14326.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "R3dtail" -delete-after: True -changes: - - tweak: "doubled max belly name length and quadrupled belly description length"