From b303c1ebdda20b598525f198940fc7060f7a5068 Mon Sep 17 00:00:00 2001 From: Lin Date: Wed, 24 Jun 2020 02:13:53 +0000 Subject: [PATCH 01/14] hm yes --- code/modules/mob/living/carbon/life.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index f9c5db4789..3f82033760 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -1,8 +1,8 @@ /mob/living/carbon/BiologicalLife(seconds, times_fired) - if(stat == DEAD) - return FALSE //Reagent processing needs to come before breathing, to prevent edge cases. handle_organs() + if(stat == DEAD) + return FALSE if(!(. = ..())) return handle_blood() From b83c42874426e771e355e52dbf1582d3321828f2 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 24 Jun 2020 14:37:08 +0100 Subject: [PATCH 02/14] Update tables_racks.dm --- code/game/objects/structures/tables_racks.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 012d92e103..575310191a 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -134,6 +134,8 @@ if(!ishuman(pushed_mob)) return var/mob/living/carbon/human/H = pushed_mob + if(iscatperson(H)) + H.emote("nya") SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "table", /datum/mood_event/table) /obj/structure/table/shove_act(mob/living/target, mob/living/user) From 03c9762dcf3b57a0e242fe7a03c02049e4c15fff Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 24 Jun 2020 12:11:49 -0700 Subject: [PATCH 03/14] Update files.dm --- code/__HELPERS/files.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 7c6c186bca..8b4f8d5b54 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -3,7 +3,7 @@ for(var/file in args) src << browse_rsc(file) -/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md")) +/client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list("txt","log","htm", "html", "md", "json")) var/path = root for(var/i=0, i Date: Thu, 25 Jun 2020 09:05:09 +1200 Subject: [PATCH 04/14] Add proper deletion to mentor SQL queries --- .../code/modules/mentor/mentor_memo.dm | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/mentor/mentor_memo.dm b/modular_citadel/code/modules/mentor/mentor_memo.dm index b9f6833e32..8110c5ffcc 100644 --- a/modular_citadel/code/modules/mentor/mentor_memo.dm +++ b/modular_citadel/code/modules/mentor/mentor_memo.dm @@ -33,11 +33,14 @@ var/datum/DBQuery/query_memocheck = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")] WHERE ckey = '[sql_ckey]'") if(!query_memocheck.Execute()) var/err = query_memocheck.ErrorMsg() + qdel(query_memocheck) log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n") return if(query_memocheck.NextRow()) + qdel(query_memocheck) to_chat(src, "You already have set a memo.") return + qdel(query_memocheck) var/memotext = input(src,"Write your Memo","Memo") as message if(!memotext) return @@ -46,20 +49,24 @@ var/datum/DBQuery/query_memoadd = SSdbcore.NewQuery("INSERT INTO [format_table_name("mentor_memo")] (ckey, memotext, timestamp) VALUES ('[sql_ckey]', '[memotext]', '[timestamp]')") if(!query_memoadd.Execute()) var/err = query_memoadd.ErrorMsg() + qdel(query_memoadd) log_game("SQL ERROR adding new memo. Error : \[[err]\]\n") return log_admin("[key_name(src)] has set a mentor memo: [memotext]") message_admins("[key_name_admin(src)] has set a mentor memo:
[memotext]") + qdel(query_memoadd) if("Edit") var/datum/DBQuery/query_memolist = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")]") if(!query_memolist.Execute()) var/err = query_memolist.ErrorMsg() + qdel(query_memolist) log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n") return var/list/memolist = list() while(query_memolist.NextRow()) var/lkey = query_memolist.item[1] memolist += "[lkey]" + qdel(query_memolist) if(!memolist.len) to_chat(src, "No memos found in database.") return @@ -70,10 +77,12 @@ var/datum/DBQuery/query_memofind = SSdbcore.NewQuery("SELECT memotext FROM [format_table_name("mentor_memo")] WHERE ckey = '[target_sql_ckey]'") if(!query_memofind.Execute()) var/err = query_memofind.ErrorMsg() + qdel(query_memofind) log_game("SQL ERROR obtaining memotext from memo table. Error : \[[err]\]\n") return if(query_memofind.NextRow()) var/old_memo = query_memofind.item[1] + qdel(query_memofind) var/new_memo = input("Input new memo", "New Memo", "[old_memo]", null) as message if(!new_memo) return @@ -83,6 +92,7 @@ var/datum/DBQuery/update_query = SSdbcore.NewQuery("UPDATE [format_table_name("mentor_memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'") if(!update_query.Execute()) var/err = update_query.ErrorMsg() + qdel(update_query) log_game("SQL ERROR editing memo. Error : \[[err]\]\n") return if(target_sql_ckey == sql_ckey) @@ -91,10 +101,14 @@ else log_admin("[key_name(src)] has edited [target_sql_ckey]'s mentor memo from [old_memo] to [new_memo]") message_admins("[key_name_admin(src)] has edited [target_sql_ckey]'s mentor memo from
[old_memo]
to
[new_memo]") + qdel(update_query) + else + qdel(query_memofind) if("Show") var/datum/DBQuery/query_memoshow = SSdbcore.NewQuery("SELECT ckey, memotext, timestamp, last_editor FROM [format_table_name("mentor_memo")]") if(!query_memoshow.Execute()) var/err = query_memoshow.ErrorMsg() + qdel(query_memoshow) log_game("SQL ERROR obtaining ckey, memotext, timestamp, last_editor from memo table. Error : \[[err]\]\n") return var/output = null @@ -107,6 +121,7 @@ if(last_editor) output += "
Last edit by [last_editor] (Click here to see edit log)" output += "
[memotext]
" + qdel(query_memoshow) if(!output) to_chat(src, "No memos found in database.") return @@ -115,12 +130,14 @@ var/datum/DBQuery/query_memodellist = SSdbcore.NewQuery("SELECT ckey FROM [format_table_name("mentor_memo")]") if(!query_memodellist.Execute()) var/err = query_memodellist.ErrorMsg() + qdel(query_memodellist) log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n") return var/list/memolist = list() while(query_memodellist.NextRow()) var/ckey = query_memodellist.item[1] memolist += "[ckey]" + qdel(query_memodellist) if(!memolist.len) to_chat(src, "No memos found in database.") return @@ -131,6 +148,7 @@ var/datum/DBQuery/query_memodel = SSdbcore.NewQuery("DELETE FROM [format_table_name("memo")] WHERE ckey = '[target_sql_ckey]'") if(!query_memodel.Execute()) var/err = query_memodel.ErrorMsg() + qdel(query_memodel) log_game("SQL ERROR removing memo. Error : \[[err]\]\n") return if(target_sql_ckey == sql_ckey) @@ -138,4 +156,4 @@ message_admins("[key_name_admin(src)] has removed their mentor memo.") else log_admin("[key_name(src)] has removed [target_sql_ckey]'s mentor memo.") - message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s mentor memo.") \ No newline at end of file + message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s mentor memo.") From fe3932a36e0587e9e5f3ad7736592df505d3c080 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:08:40 +0200 Subject: [PATCH 05/14] Fixing the snore-pocalypse, and another not so critical issue. --- code/__DEFINES/dcs/signals.dm | 3 +++ code/datums/components/spawner.dm | 13 ++++++++++--- code/datums/status_effects/debuffs.dm | 8 +++----- code/datums/status_effects/status_effect.dm | 9 +++++---- code/game/objects/obj_defense.dm | 2 ++ code/modules/flufftext/Dreaming.dm | 4 ---- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 8a88f2dbb6..db38f1961d 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -254,6 +254,9 @@ #define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled) #define COMSIG_OBJ_BREAK "obj_break" //from base of /obj/obj_break(): (damage_flag) #define COMSIG_OBJ_SETANCHORED "obj_setanchored" //called in /obj/structure/setAnchored(): (value) +#define COMSIG_OBJ_ATTACK_GENERIC "obj_attack_generic" //from base of atom/animal_attack(): (/mob/user) + #define COMPONENT_STOP_GENERIC_ATTACK 1 + // /machinery signals #define COMSIG_MACHINE_EJECT_OCCUPANT "eject_occupant" //from base of obj/machinery/dropContents() (occupant) diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index fe86b60375..f9164b0f5e 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -8,6 +8,8 @@ var/list/faction = list("mining") /datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs) + if(!isatom(parent)) + return COMPONENT_INCOMPATIBLE if(_spawn_time) spawn_time=_spawn_time if(_mob_types) @@ -19,20 +21,25 @@ if(_max_mobs) max_mobs=_max_mobs - RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/stop_spawning) + RegisterSignal(parent, COMSIG_OBJ_ATTACK_GENERIC, .proc/on_attack_generic) START_PROCESSING(SSprocessing, src) /datum/component/spawner/process() try_spawn_mob() - -/datum/component/spawner/proc/stop_spawning(force, hint) +/datum/component/spawner/proc/stop_spawning(datum/source, force, hint) STOP_PROCESSING(SSprocessing, src) for(var/mob/living/simple_animal/L in spawned_mobs) if(L.nest == src) L.nest = null spawned_mobs = null +// Stopping clientless simple mobs' from indiscriminately bashing their own spawners due DestroySurroundings() et similars. +/datum/component/spawner/proc/on_attack_generic(datum/source, mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) + if(!user.client && (user in spawned_mobs)) + return COMPONENT_STOP_GENERIC_ATTACK + /datum/component/spawner/proc/try_spawn_mob() var/atom/P = parent if(spawned_mobs.len >= max_mobs) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index c52577f637..3493661028 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -9,7 +9,6 @@ /datum/status_effect/incapacitating/on_creation(mob/living/new_owner, set_duration, updating_canmove) if(isnum(set_duration)) duration = set_duration - tick_interval = max(world.tick_lag, round(tick_interval, world.tick_lag)) . = ..() if(.) if(updating_canmove) @@ -82,11 +81,10 @@ owner.adjustStaminaLoss(-0.5) //reduce stamina loss by 0.5 per tick, 10 per 2 seconds if(human_owner && human_owner.drunkenness) human_owner.drunkenness *= 0.997 //reduce drunkenness by 0.3% per tick, 6% per 2 seconds - if(prob(20)) - if(carbon_owner) - carbon_owner.handle_dreams() + if(carbon_owner && !carbon_owner.dreaming && prob(2)) + carbon_owner.dream() // 2% per second, tick interval is in deciseconds - if(prob(tick_interval * 0.2) && owner.health > owner.crit_threshold) + if(prob((tick_interval+1) * 0.2) && owner.health > owner.crit_threshold) owner.emote("snore") /datum/status_effect/staggered diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm index 33c8384d72..12c223f500 100644 --- a/code/datums/status_effects/status_effect.dm +++ b/code/datums/status_effects/status_effect.dm @@ -6,6 +6,7 @@ var/id = "effect" //Used for screen alerts. var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means. var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second. + var/next_tick //The scheduled time for the next tick. var/mob/living/owner //The mob affected by the status effect. var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves @@ -31,7 +32,7 @@ return if(duration != -1) duration = world.time + duration - tick_interval = world.time + tick_interval + next_tick = world.time + tick_interval if(alert_type) var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type) A.attached_effect = src //so the alert can reference us, if it needs to @@ -52,9 +53,9 @@ if(!owner) qdel(src) return - if(tick_interval < world.time) + if(next_tick < world.time) tick() - tick_interval = world.time + initial(tick_interval) + next_tick = world.time + tick_interval if(duration != -1 && duration < world.time) qdel(src) @@ -221,7 +222,7 @@ threshold_crossed = FALSE //resets threshold effect if we fall below threshold so threshold effect can trigger again on_threshold_drop() if(stacks_added > 0) - tick_interval += delay_before_decay //refreshes time until decay + next_tick += delay_before_decay //refreshes time until decay stacks = min(stacks, max_stacks) status_overlay.icon_state = "[overlay_state][stacks]" status_underlay.icon_state = "[underlay_state][stacks]" diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 54ac2a5559..1203c5a1df 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -103,6 +103,8 @@ take_damage(400, BRUTE, "melee", 0, get_dir(src, B)) /obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime + if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_GENERIC, user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) & COMPONENT_STOP_GENERIC_ATTACK) + return FALSE user.do_attack_animation(src) user.changeNext_move(CLICK_CD_MELEE) return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 43c3337a4b..860d3898f2 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -1,7 +1,3 @@ -/mob/living/carbon/proc/handle_dreams() - if(prob(10) && !dreaming) - dream() - /mob/living/carbon/proc/dream() set waitfor = FALSE var/list/dream_fragments = list() From c0e0226d3c78c31b3083ed9a6920dc7a1c3f3498 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:18:03 +0200 Subject: [PATCH 06/14] faction check. --- code/datums/components/spawner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index f9164b0f5e..27bf4a5986 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -37,7 +37,7 @@ // Stopping clientless simple mobs' from indiscriminately bashing their own spawners due DestroySurroundings() et similars. /datum/component/spawner/proc/on_attack_generic(datum/source, mob/user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) - if(!user.client && (user in spawned_mobs)) + if(!user.client && ((user.faction & faction) || (user in spawned_mobs))) return COMPONENT_STOP_GENERIC_ATTACK /datum/component/spawner/proc/try_spawn_mob() From d832ec14c60744eaafb33a8d2a44a9350617cc61 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 Jun 2020 16:35:15 -0500 Subject: [PATCH 07/14] Automatic changelog generation for PR #12599 [ci skip] --- html/changelogs/AutoChangeLog-pr-12599.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12599.yml diff --git a/html/changelogs/AutoChangeLog-pr-12599.yml b/html/changelogs/AutoChangeLog-pr-12599.yml new file mode 100644 index 0000000000..b2e8a8d354 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12599.yml @@ -0,0 +1,4 @@ +author: "Funce" +delete-after: True +changes: + - bugfix: "Mentor SQL queries are now deleted properly." From e3380c4f7028aa3704ba1368cf0becc652d61d50 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 Jun 2020 16:36:10 -0500 Subject: [PATCH 08/14] Automatic changelog generation for PR #12588 [ci skip] --- html/changelogs/AutoChangeLog-pr-12588.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12588.yml diff --git a/html/changelogs/AutoChangeLog-pr-12588.yml b/html/changelogs/AutoChangeLog-pr-12588.yml new file mode 100644 index 0000000000..7f4c9fe248 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12588.yml @@ -0,0 +1,4 @@ +author: "Linzolle" +delete-after: True +changes: + - bugfix: "organs now decay inside dead bodies again" From 0b180bd1eba4812722c3d2c6a79b3240325cd347 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 25 Jun 2020 00:08:04 +0000 Subject: [PATCH 09/14] Automatic changelog compile [ci skip] --- html/changelog.html | 31 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 18 +++++++++++++ html/changelogs/AutoChangeLog-pr-12568.yml | 4 --- html/changelogs/AutoChangeLog-pr-12570.yml | 4 --- html/changelogs/AutoChangeLog-pr-12571.yml | 4 --- html/changelogs/AutoChangeLog-pr-12575.yml | 5 ---- html/changelogs/AutoChangeLog-pr-12580.yml | 4 --- html/changelogs/AutoChangeLog-pr-12581.yml | 4 --- html/changelogs/AutoChangeLog-pr-12582.yml | 4 --- html/changelogs/AutoChangeLog-pr-12584.yml | 4 --- html/changelogs/AutoChangeLog-pr-12588.yml | 4 --- html/changelogs/AutoChangeLog-pr-12599.yml | 4 --- 12 files changed, 49 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-12568.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12570.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12571.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12575.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12580.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12581.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12582.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12584.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12588.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12599.yml diff --git a/html/changelog.html b/html/changelog.html index 2ba1b142a1..a092e54e9d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,37 @@ -->
+

25 June 2020

+

Anonymous updated:

+
    +
  • Added kepi and orvilike kepi. Available through loadout.
    • +
+

Detective Google updated:

+
    +
  • Medigygax
    • +
+

Detective-Google updated:

+
    +
  • malf AIs can no longer yeet the station while shunted
    • +
  • SMESes can now properly use self charging cells
    • +
  • ghosts now show up when the round ends
    • +
  • away missions
    • +
+

Funce updated:

+
    +
  • Mentor SQL queries are now deleted properly.
    • +
+

Linzolle updated:

+
    +
  • analyze function on chem master is no longer broken
    • +
  • organs now decay inside dead bodies again
    • +
+

dapnee updated:

+
    +
  • wataur bottle item
    • +
  • wataur bottle and overlay
    • +
+

24 June 2020

DeltaFire15 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b4ea0e1aef..77b0662288 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -26059,3 +26059,21 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: bonfires/grills no longer produce infinite quantities of food - bugfix: slime's alter form ability now updates their hair colour when changing their body colour +2020-06-25: + Anonymous: + - rscadd: Added kepi and orvilike kepi. Available through loadout. + Detective Google: + - rscadd: Medigygax + Detective-Google: + - bugfix: malf AIs can no longer yeet the station while shunted + - bugfix: SMESes can now properly use self charging cells + - rscadd: ghosts now show up when the round ends + - balance: away missions + Funce: + - bugfix: Mentor SQL queries are now deleted properly. + Linzolle: + - bugfix: analyze function on chem master is no longer broken + - bugfix: organs now decay inside dead bodies again + dapnee: + - rscadd: wataur bottle item + - imageadd: wataur bottle and overlay diff --git a/html/changelogs/AutoChangeLog-pr-12568.yml b/html/changelogs/AutoChangeLog-pr-12568.yml deleted file mode 100644 index e646331cfe..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12568.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "analyze function on chem master is no longer broken" diff --git a/html/changelogs/AutoChangeLog-pr-12570.yml b/html/changelogs/AutoChangeLog-pr-12570.yml deleted file mode 100644 index dc42541999..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12570.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Anonymous" -delete-after: True -changes: - - rscadd: "Added kepi and orvilike kepi. Available through loadout." diff --git a/html/changelogs/AutoChangeLog-pr-12571.yml b/html/changelogs/AutoChangeLog-pr-12571.yml deleted file mode 100644 index a7478d6d00..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12571.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective Google" -delete-after: True -changes: - - rscadd: "Medigygax" diff --git a/html/changelogs/AutoChangeLog-pr-12575.yml b/html/changelogs/AutoChangeLog-pr-12575.yml deleted file mode 100644 index 160ced2f5f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12575.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - rscadd: "wataur bottle item" - - imageadd: "wataur bottle and overlay" diff --git a/html/changelogs/AutoChangeLog-pr-12580.yml b/html/changelogs/AutoChangeLog-pr-12580.yml deleted file mode 100644 index c0ed79dfea..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12580.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective-Google" -delete-after: True -changes: - - rscadd: "ghosts now show up when the round ends" diff --git a/html/changelogs/AutoChangeLog-pr-12581.yml b/html/changelogs/AutoChangeLog-pr-12581.yml deleted file mode 100644 index 873c69d902..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12581.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective-Google" -delete-after: True -changes: - - bugfix: "malf AIs can no longer yeet the station while shunted" diff --git a/html/changelogs/AutoChangeLog-pr-12582.yml b/html/changelogs/AutoChangeLog-pr-12582.yml deleted file mode 100644 index bd96c27c8d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12582.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective-Google" -delete-after: True -changes: - - bugfix: "SMESes can now properly use self charging cells" diff --git a/html/changelogs/AutoChangeLog-pr-12584.yml b/html/changelogs/AutoChangeLog-pr-12584.yml deleted file mode 100644 index 4b5f48385e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12584.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective-Google" -delete-after: True -changes: - - balance: "away missions" diff --git a/html/changelogs/AutoChangeLog-pr-12588.yml b/html/changelogs/AutoChangeLog-pr-12588.yml deleted file mode 100644 index 7f4c9fe248..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12588.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "organs now decay inside dead bodies again" diff --git a/html/changelogs/AutoChangeLog-pr-12599.yml b/html/changelogs/AutoChangeLog-pr-12599.yml deleted file mode 100644 index b2e8a8d354..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12599.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Funce" -delete-after: True -changes: - - bugfix: "Mentor SQL queries are now deleted properly." From 7967424036924a56e0fabfcfc887d1cda32ff4f0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 Jun 2020 22:27:20 -0500 Subject: [PATCH 10/14] Automatic changelog generation for PR #12600 [ci skip] --- html/changelogs/AutoChangeLog-pr-12600.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12600.yml diff --git a/html/changelogs/AutoChangeLog-pr-12600.yml b/html/changelogs/AutoChangeLog-pr-12600.yml new file mode 100644 index 0000000000..85f45408e1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12600.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Snore spam." + - bugfix: "Hostile mobs shouldn't hit their original spawner structures or thoses of the same faction." From 54c8d58e52df6844b8310474098171320593c03f Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 24 Jun 2020 23:20:51 -0700 Subject: [PATCH 11/14] Update clown_items.dm --- code/game/objects/items/clown_items.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 050427702d..f5477ae5f6 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -88,6 +88,7 @@ var/obj/effect/decal/cleanable/C = locate() in target qdel(C) target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) + target.clean_blood() SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM) target.wash_cream() return @@ -180,4 +181,4 @@ name = "Canned Laughter" desc = "Just looking at this makes you want to giggle." icon_state = "laughter" - list_reagents = list(/datum/reagent/consumable/laughter = 50) \ No newline at end of file + list_reagents = list(/datum/reagent/consumable/laughter = 50) From 79a8be2c6567581e2d93edc3d0a6947e579a4f9c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 25 Jun 2020 09:08:54 -0500 Subject: [PATCH 12/14] Automatic changelog generation for PR #12606 [ci skip] --- html/changelogs/AutoChangeLog-pr-12606.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12606.yml diff --git a/html/changelogs/AutoChangeLog-pr-12606.yml b/html/changelogs/AutoChangeLog-pr-12606.yml new file mode 100644 index 0000000000..40ea9deb2f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12606.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - bugfix: "soap cleans blood again" From 549fee0624d0684c474d42631367a9fad67bef7b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 26 Jun 2020 00:08:13 +0000 Subject: [PATCH 13/14] Automatic changelog compile [ci skip] --- html/changelog.html | 11 +++++++++++ html/changelogs/.all_changelog.yml | 7 +++++++ html/changelogs/AutoChangeLog-pr-12600.yml | 5 ----- html/changelogs/AutoChangeLog-pr-12606.yml | 4 ---- 4 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-12600.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12606.yml diff --git a/html/changelog.html b/html/changelog.html index a092e54e9d..eb29a97c12 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,17 @@ -->
    +

    26 June 2020

    +

    Ghommie updated:

    +
      +
    • Snore spam.
      • +
    • Hostile mobs shouldn't hit their original spawner structures or thoses of the same faction.
      • +
    +

    silicons updated:

    +
      +
    • soap cleans blood again
      • +
    +

    25 June 2020

    Anonymous updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 77b0662288..468ba0e049 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -26077,3 +26077,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. dapnee: - rscadd: wataur bottle item - imageadd: wataur bottle and overlay +2020-06-26: + Ghommie: + - bugfix: Snore spam. + - bugfix: Hostile mobs shouldn't hit their original spawner structures or thoses + of the same faction. + silicons: + - bugfix: soap cleans blood again diff --git a/html/changelogs/AutoChangeLog-pr-12600.yml b/html/changelogs/AutoChangeLog-pr-12600.yml deleted file mode 100644 index 85f45408e1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12600.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Snore spam." - - bugfix: "Hostile mobs shouldn't hit their original spawner structures or thoses of the same faction." diff --git a/html/changelogs/AutoChangeLog-pr-12606.yml b/html/changelogs/AutoChangeLog-pr-12606.yml deleted file mode 100644 index 40ea9deb2f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12606.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "soap cleans blood again" From a83a543bdf045f8a30009ee2a99381895ffb813f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 25 Jun 2020 20:33:37 -0500 Subject: [PATCH 14/14] Automatic changelog generation for PR #12592 [ci skip] --- html/changelogs/AutoChangeLog-pr-12592.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12592.yml diff --git a/html/changelogs/AutoChangeLog-pr-12592.yml b/html/changelogs/AutoChangeLog-pr-12592.yml new file mode 100644 index 0000000000..6f6fa81dcc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12592.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "felinids now nya when tabled"