From e10f0a5def2703ee7235572e77b3a2b845781947 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Tue, 11 Sep 2018 08:41:24 +0200 Subject: [PATCH 01/29] Species damage mod now only affects damage, not healing. --- .../mob/living/carbon/human/human_damage.dm | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index d82fc719d88..d4c14bda32a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -29,7 +29,7 @@ if(dna.species && dna.species.has_organ["brain"]) var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain) if(sponge) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.brain_mod sponge.receive_damage(amount, 1) if(updating) @@ -43,7 +43,7 @@ if(dna.species && dna.species.has_organ["brain"]) var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain) if(sponge) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.brain_mod sponge.damage = min(max(amount, 0), (maxHealth*2)) if(updating) @@ -76,11 +76,10 @@ amount += O.burn_dam return amount - /mob/living/carbon/human/adjustBruteLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE) - if(dna.species) - amount = amount * dna.species.brute_mod if(amount > 0) + if(dna.species) + amount = amount * dna.species.brute_mod take_overall_damage(amount, 0, updating_health, used_weapon = damage_source) else heal_overall_damage(-amount, 0, updating_health, FALSE, robotic) @@ -88,9 +87,9 @@ return STATUS_UPDATE_HEALTH /mob/living/carbon/human/adjustFireLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE) - if(dna.species) - amount = amount * dna.species.burn_mod if(amount > 0) + if(dna.species) + amount = amount * dna.species.burn_mod take_overall_damage(0, amount, updating_health, used_weapon = damage_source) else heal_overall_damage(0, -amount, updating_health, FALSE, robotic) @@ -98,9 +97,8 @@ return STATUS_UPDATE_HEALTH /mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.brute_mod - if(organ_name in bodyparts_by_name) var/obj/item/organ/external/O = get_organ(organ_name) @@ -111,9 +109,8 @@ O.heal_damage(-amount, 0, internal = 0, robo_repair = O.is_robotic(), updating_health = updating_health) return STATUS_UPDATE_HEALTH - /mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.burn_mod if(organ_name in bodyparts_by_name) @@ -134,7 +131,7 @@ return ..() /mob/living/carbon/human/adjustCloneLoss(amount) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.clone_mod . = ..() @@ -174,22 +171,22 @@ // Defined here solely to take species flags into account without having to recast at mob/living level. /mob/living/carbon/human/adjustOxyLoss(amount) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.oxy_mod . = ..() /mob/living/carbon/human/setOxyLoss(amount) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.oxy_mod . = ..() /mob/living/carbon/human/adjustToxLoss(amount) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.tox_mod . = ..() /mob/living/carbon/human/setToxLoss(amount) - if(dna.species) + if(dna.species && amount > 0) amount = amount * dna.species.tox_mod . = ..() From d9ed6ca46a0ddfe025f4be78d268e2611c72e12a Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Thu, 11 Oct 2018 22:09:18 -0300 Subject: [PATCH 02/29] Fixes newscaster images and spruces up newscaster feed message formatting --- code/game/machinery/newscaster.dm | 10 ++++++++-- nano/templates/newscaster.tmpl | 15 +++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 491cb93018e..a712e033afd 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -241,8 +241,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["censored"] = viewing_channel.censored var/list/messages = list() data["messages"] = messages + var/message_number = 0 for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("title" = M.title, "body" = M.body, "img" = M.img ? icon2base64(M.img) : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count) + if(M.img) + user << browse_rsc(M.img, "tmp_photo[message_number].png") + messages[++messages.len] = list("title" = M.title, "body" = M.body, "img" = M.img ? M.img : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count, "message_number" = message_number) + message_number += 1 if(8, 9) data["channel_name"] = viewing_channel.channel_name data["ref"] = "\ref[viewing_channel]" @@ -273,7 +277,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co data["author"] = news_network.wanted_issue.backup_author data["criminal"] = news_network.wanted_issue.author data["description"] = news_network.wanted_issue.body - data["photo"] = news_network.wanted_issue.img ? icon2base64(news_network.wanted_issue.img) : 0 + if(news_network.wanted_issue.img) + user << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") + data["photo"] = news_network.wanted_issue.img ? news_network.wanted_issue.img : 0 if(12) var/list/jobs = list() data["jobs"] = jobs diff --git a/nano/templates/newscaster.tmpl b/nano/templates/newscaster.tmpl index 16c201407e3..fb39a6aac3f 100644 --- a/nano/templates/newscaster.tmpl +++ b/nano/templates/newscaster.tmpl @@ -139,11 +139,14 @@ Property of Nanotrasen
{{else}} {{for data.messages}}
- {{:value.title}}
- {{:value.body}}
+

+ + {{:value.title}}
{{if value.img}} -
- {{/if}} +
+ {{/if}} +

+ {{:value.body}}
[{{:value.message_type}} by {{:value.author}}]
Message view count: {{:value.view_count}}

@@ -296,10 +299,10 @@ Property of Nanotrasen
{{:data.description}}
-
Photo:
+
Photo:

{{if data.photo}} - +
{{else}} None {{/if}} From ca22b73a1d9f24be078324b1ae4d73f04bdd21af Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Fri, 12 Oct 2018 03:24:19 -0300 Subject: [PATCH 03/29] Fixes indentation and adds closing

's --- nano/templates/newscaster.tmpl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nano/templates/newscaster.tmpl b/nano/templates/newscaster.tmpl index fb39a6aac3f..ff826222bc7 100644 --- a/nano/templates/newscaster.tmpl +++ b/nano/templates/newscaster.tmpl @@ -140,13 +140,14 @@ Property of Nanotrasen
{{for data.messages}}

- - {{:value.title}}
+ {{:value.title}}
+

{{if value.img}} -
+
{{/if}}

- {{:value.body}}
+ {{:value.body}}
+

[{{:value.message_type}} by {{:value.author}}]
Message view count: {{:value.view_count}}
From 0553de3578520b2fcf83be709a276e4a275f9b58 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 07:59:50 +0000 Subject: [PATCH 04/29] Automatic changelog compile, [ci skip] --- html/changelog.html | 23 +++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 19 +++++++++++++++++++ html/changelogs/AutoChangeLog-pr-9677.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9815.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9817.yml | 5 ----- html/changelogs/AutoChangeLog-pr-9818.yml | 6 ------ html/changelogs/AutoChangeLog-pr-9819.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9820.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9821.yml | 5 ----- 9 files changed, 42 insertions(+), 32 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9677.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9815.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9817.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9818.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9819.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9820.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9821.yml diff --git a/html/changelog.html b/html/changelog.html index 1d19c855ad3..e95fd14f0c2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -63,6 +63,29 @@
  • META - Cargo shuttle airlocks now bolt properly.
  • META - Cargo shuttle flaps are now airtight. All hail Cargonia.
    • +

    DesolateG updated:

    +
      +
    • Refactors global var lists to use the global subsystem.
      • +
    +

    Farie82 updated:

    +
      +
    • Added the on_give proc for items. Was needed for the fixes
      • +
    • Giving two handed items like the DIY chainsaw and potted plants now works correctly
      • +
    • The DIY chainsaw, doomslayer chainsaw and the potted plants now do damage when given to somebody else and when picked up while the chainsaw was on.
      • +
    +

    Purpose updated:

    +
      +
    • Cyberiad's grimy tiles are now actually dirty and cleanable.
      • +
    • Delta's grimy tiles are now actually dirty and cleanable.
      • +
    • Ironsand is now visible in the Map Maker.
      • +
    • Away missions updated with the appropriate dirt/grime so that it is now cleanable.
      • +
    • Fixes stool's unique suicide message.
      • +
    • Fixes rollerbeds no longer going through plastic flaps.
      • +
    +

    TDSSS updated:

    +
      +
    • Removed Skrell discrimination, allows ! character in IDs (agent IDs or made via ID computer)
      • +

    variableundefined updated:

    • Ore now represented by stack that holds up to 50 items. Should reduce lag with ORM greatly.
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 4a3974e3afd..725a891440b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7442,6 +7442,25 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: META - Cargo shuttle blast doors now reacts to the right button. - bugfix: META - Cargo shuttle airlocks now bolt properly. - bugfix: META - Cargo shuttle flaps are now airtight. All hail Cargonia. + DesolateG: + - tweak: Refactors global var lists to use the global subsystem. + Farie82: + - rscadd: Added the on_give proc for items. Was needed for the fixes + - bugfix: Giving two handed items like the DIY chainsaw and potted plants now works + correctly + - bugfix: The DIY chainsaw, doomslayer chainsaw and the potted plants now do damage + when given to somebody else and when picked up while the chainsaw was on. + Purpose: + - tweak: Cyberiad's grimy tiles are now actually dirty and cleanable. + - tweak: Delta's grimy tiles are now actually dirty and cleanable. + - bugfix: Ironsand is now visible in the Map Maker. + - bugfix: Away missions updated with the appropriate dirt/grime so that it is now + cleanable. + - bugfix: Fixes stool's unique suicide message. + - bugfix: Fixes rollerbeds no longer going through plastic flaps. + TDSSS: + - bugfix: Removed Skrell discrimination, allows ! character in IDs (agent IDs or + made via ID computer) variableundefined: - tweak: Ore now represented by stack that holds up to 50 items. Should reduce lag with ORM greatly. diff --git a/html/changelogs/AutoChangeLog-pr-9677.yml b/html/changelogs/AutoChangeLog-pr-9677.yml deleted file mode 100644 index ea12e7e55e3..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9677.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DesolateG" -delete-after: True -changes: - - tweak: "Refactors global var lists to use the global subsystem." diff --git a/html/changelogs/AutoChangeLog-pr-9815.yml b/html/changelogs/AutoChangeLog-pr-9815.yml deleted file mode 100644 index 1440dc00ab4..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9815.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TDSSS" -delete-after: True -changes: - - bugfix: "Removed Skrell discrimination, allows ! character in IDs (agent IDs or made via ID computer)" diff --git a/html/changelogs/AutoChangeLog-pr-9817.yml b/html/changelogs/AutoChangeLog-pr-9817.yml deleted file mode 100644 index 49b105caa1e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9817.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Purpose" -delete-after: True -changes: - - bugfix: "Fixes stool's unique suicide message." - - bugfix: "Fixes rollerbeds no longer going through plastic flaps." diff --git a/html/changelogs/AutoChangeLog-pr-9818.yml b/html/changelogs/AutoChangeLog-pr-9818.yml deleted file mode 100644 index b031aaeb7a5..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9818.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Farie82" -delete-after: True -changes: - - rscadd: "Added the on_give proc for items. Was needed for the fixes" - - bugfix: "Giving two handed items like the DIY chainsaw and potted plants now works correctly" - - bugfix: "The DIY chainsaw, doomslayer chainsaw and the potted plants now do damage when given to somebody else and when picked up while the chainsaw was on." diff --git a/html/changelogs/AutoChangeLog-pr-9819.yml b/html/changelogs/AutoChangeLog-pr-9819.yml deleted file mode 100644 index 937b4deacbe..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9819.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Purpose" -delete-after: True -changes: - - tweak: "Cyberiad's grimy tiles are now actually dirty and cleanable." diff --git a/html/changelogs/AutoChangeLog-pr-9820.yml b/html/changelogs/AutoChangeLog-pr-9820.yml deleted file mode 100644 index 33afd4c3702..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9820.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Purpose" -delete-after: True -changes: - - tweak: "Delta's grimy tiles are now actually dirty and cleanable." diff --git a/html/changelogs/AutoChangeLog-pr-9821.yml b/html/changelogs/AutoChangeLog-pr-9821.yml deleted file mode 100644 index 75bb220f482..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9821.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Purpose" -delete-after: True -changes: - - bugfix: "Ironsand is now visible in the Map Maker." - - bugfix: "Away missions updated with the appropriate dirt/grime so that it is now cleanable." From 228ba156cac3b08ba536b739144058a2415fe6da Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 12 Oct 2018 15:41:06 +0100 Subject: [PATCH 05/29] adds nullrod to gamma paranormal --- code/modules/response_team/ert_outfits.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 93227849f1f..be0a6808c39 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -411,6 +411,7 @@ l_pocket = /obj/item/grenade/clusterbuster/holy shoes = /obj/item/clothing/shoes/magboots/advance glasses = /obj/item/clothing/glasses/night + r_pocket = /obj/item/nullrod cybernetic_implants = list( /obj/item/organ/internal/cyberimp/chest/nutriment/plus, From e9d153daf4e9c67f17bceddbc08fafd0b38589d7 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 12 Oct 2018 15:59:30 +0100 Subject: [PATCH 06/29] moves check and add to reagents holder datum --- .../diseases/advance/symptoms/sensory.dm | 26 ++++++++----------- code/modules/reagents/chemistry/holder.dm | 5 ++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index e3e50ba468f..c3095a69e08 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -24,35 +24,31 @@ Bonus level = 5 severity = 0 -/datum/symptom/sensory_restoration/proc/check_and_add(reagent, check, add, mob/living/M) - if(M.reagents.get_reagent_amount(reagent) < check) - M.reagents.add_reagent(reagent, add) - return 1 - /datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 3)) var/mob/living/M = A.affected_mob + var/datum/reagents/RD = M.reagents switch(A.stage) if(2) - if(check_and_add("oculine", 10, 10, M)) + if(RD.check_and_add("oculine", 10, 10)) to_chat(M, "Your hearing feels clearer and crisp.") if(3) - if(check_and_add("antihol", 10, 10, M)) + if(RD.check_and_add("antihol", 10, 10)) to_chat(M, "You feel sober.") - check_and_add("oculine", 10, 10, M) + RD.check_and_add("oculine", 10, 10) if(4) - if(check_and_add("synaphydramine", 10, 5, M)) + if(RD.check_and_add("synaphydramine", 10, 5)) to_chat(M, "You feel focused.") - check_and_add("antihol", 10, 10, M) - check_and_add("oculine", 10, 10, M) + RD.check_and_add("antihol", 10, 10) + RD.check_and_add("oculine", 10, 10) if(5) - if(check_and_add("mannitol", 10, 10, M)) + if(RD.check_and_add("mannitol", 10, 10)) to_chat(M, "Your mind feels relaxed.") - check_and_add("synaphydramine", 10, 5, M) - check_and_add("antihol", 10, 10, M) - check_and_add("oculine", 10, 10, M) + RD.check_and_add("synaphydramine", 10, 5) + RD.check_and_add("antihol", 10, 10) + RD.check_and_add("oculine", 10, 10) return diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index dacd44a5035..43233df217b 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -594,6 +594,11 @@ var/const/INGEST = 2 return 1 +/datum/reagents/proc/check_and_add(reagent, check, add) + if(get_reagent_amount(reagent) < check) + add_reagent(reagent, add) + return TRUE + /datum/reagents/proc/remove_reagent(reagent, amount, safety)//Added a safety check for the trans_id_to if(!isnum(amount)) From 50a13bc37e7f6ce806d4c0e87ba44b1556a1c825 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Fri, 12 Oct 2018 18:52:12 -0300 Subject: [PATCH 07/29] Migrates align tags to style tags (future proof) and centers newscaster images. --- nano/templates/newscaster.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nano/templates/newscaster.tmpl b/nano/templates/newscaster.tmpl index ff826222bc7..891fcf75a41 100644 --- a/nano/templates/newscaster.tmpl +++ b/nano/templates/newscaster.tmpl @@ -139,13 +139,13 @@ Property of Nanotrasen
      {{else}} {{for data.messages}}
      -

      +

      {{:value.title}}

      {{if value.img}} -
      +
      {{/if}} -

      +

      {{:value.body}}

      [{{:value.message_type}} by {{:value.author}}]
      From 2bce5e00af288253d790e07a50c8295388a461fe Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Fri, 12 Oct 2018 19:01:05 -0300 Subject: [PATCH 08/29] deletes extra quotation mark, migrates quotation mark to apostrophe --- nano/templates/newscaster.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nano/templates/newscaster.tmpl b/nano/templates/newscaster.tmpl index 891fcf75a41..d83344bb0a8 100644 --- a/nano/templates/newscaster.tmpl +++ b/nano/templates/newscaster.tmpl @@ -139,13 +139,13 @@ Property of Nanotrasen
      {{else}} {{for data.messages}}
      -

      +

      {{:value.title}}

      {{if value.img}}
      {{/if}} -

      +

      {{:value.body}}

      [{{:value.message_type}} by {{:value.author}}]
      From d356346fc693f6cd013296983cb5934ffeb65cca Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Fri, 12 Oct 2018 19:05:52 -0300 Subject: [PATCH 09/29] adds space after text-align, and semicolons --- nano/templates/newscaster.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nano/templates/newscaster.tmpl b/nano/templates/newscaster.tmpl index d83344bb0a8..4ddf376e71f 100644 --- a/nano/templates/newscaster.tmpl +++ b/nano/templates/newscaster.tmpl @@ -139,13 +139,13 @@ Property of Nanotrasen
      {{else}} {{for data.messages}}
      -

      +

      {{:value.title}}

      {{if value.img}}
      {{/if}} -

      +

      {{:value.body}}

      [{{:value.message_type}} by {{:value.author}}]
      From 49459abbecdfa5f602c58e1632a4189338ad49da Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 18:36:28 -0400 Subject: [PATCH 10/29] Automatic changelog generation for PR #9826 [ci skip] --- html/changelogs/AutoChangeLog-pr-9826.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9826.yml diff --git a/html/changelogs/AutoChangeLog-pr-9826.yml b/html/changelogs/AutoChangeLog-pr-9826.yml new file mode 100644 index 00000000000..22bfe89e3f9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9826.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - bugfix: "Gamma ERT Paranormal gets their null rod." From bd99211605f6042dad4edd3064f18ac749b827da Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 18:37:00 -0400 Subject: [PATCH 11/29] Automatic changelog generation for PR #9827 [ci skip] --- html/changelogs/AutoChangeLog-pr-9827.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9827.yml diff --git a/html/changelogs/AutoChangeLog-pr-9827.yml b/html/changelogs/AutoChangeLog-pr-9827.yml new file mode 100644 index 00000000000..6d75583b19d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9827.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - tweak: "Moves check_and_add() to reagents holder" From 54858a45b65b7407715a9ab5749b3ba02ec884a9 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Fri, 12 Oct 2018 16:04:12 +0200 Subject: [PATCH 12/29] Prevents organs from going necrotic during abducter surgery. --- code/game/gamemodes/miniantags/abduction/abduction_gear.dm | 1 + code/game/machinery/OpTable.dm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 8cde8a9d3d1..1dda6d853f6 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -736,6 +736,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} icon_state = "bed" no_icon_updates = 1 //no icon updates for this; it's static. injected_reagents = list("corazone","spaceacillin") + injected_target_amount = 31 //the patient needs at least 30u of spaceacillin to prevent necrotization. /obj/structure/closet/abductor name = "alien locker" diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 70afe02762a..e1fa805575d 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -15,6 +15,7 @@ buckle_lying = 90 var/no_icon_updates = 0 //set this to 1 if you don't want the icons ever changing var/list/injected_reagents = list() + var/injected_target_amount = 1 /obj/machinery/optable/New() ..() @@ -107,8 +108,9 @@ if(LAZYLEN(injected_reagents)) for(var/mob/living/carbon/C in get_turf(src)) for(var/chemical in injected_reagents) - if(C.reagents.get_reagent_amount(chemical) < 1) - C.reagents.add_reagent(chemical, 1) + var/current_amount = C.reagents.get_reagent_amount(chemical) + if(current_amount < injected_target_amount) + C.reagents.add_reagent(chemical, injected_target_amount - current_amount) /obj/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user as mob) if(C == user) From 98a084921f90e00ff8b0d6cb721ba194242fefd5 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 13 Oct 2018 00:22:03 +0100 Subject: [PATCH 13/29] moves chem master to using update_icon() fixes not using no power sprites --- .../reagents/chemistry/machinery/chem_master.dm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 2a7dac0f48d..d6dc8f91806 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -20,7 +20,7 @@ /obj/machinery/chem_master/New() create_reagents(100) - overlays += "waitlight" + update_icon() /obj/machinery/chem_master/ex_act(severity) switch(severity) @@ -32,6 +32,12 @@ qdel(src) return +/obj/machinery/chem_master/update_icon() + overlays.Cut() + icon_state = "mixer[beaker ? "1" : "0"][powered() ? "" : "_nopower"]" + if(powered()) + overlays += "waitlight" + /obj/machinery/chem_master/blob_act() if(prob(50)) qdel(src) @@ -57,7 +63,7 @@ B.forceMove(src) to_chat(user, "You add the beaker to the machine!") SSnanoui.update_uis(src) - icon_state = "mixer1" + update_icon() else if(istype(B, /obj/item/storage/pill_bottle)) @@ -184,7 +190,7 @@ beaker.forceMove(get_turf(src)) beaker = null reagents.clear_reagents() - icon_state = "mixer0" + update_icon() else if(href_list["createpill"] || href_list["createpill_multiple"]) if(!condi) var/count = 1 From d206760dc7c072807a42dd3d9d877001dbd9d024 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sat, 13 Oct 2018 01:23:08 +0200 Subject: [PATCH 14/29] Refactored code to use the reagent check_and_add proc --- .../game/gamemodes/miniantags/abduction/abduction_gear.dm | 3 ++- code/game/machinery/OpTable.dm | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 1dda6d853f6..28f6fd4544a 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -736,7 +736,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} icon_state = "bed" no_icon_updates = 1 //no icon updates for this; it's static. injected_reagents = list("corazone","spaceacillin") - injected_target_amount = 31 //the patient needs at least 30u of spaceacillin to prevent necrotization. + reagent_target_amount = 31 //the patient needs at least 30u of spaceacillin to prevent necrotization. + inject_amount = 10 /obj/structure/closet/abductor name = "alien locker" diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index e1fa805575d..2ee1e93683d 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -15,7 +15,8 @@ buckle_lying = 90 var/no_icon_updates = 0 //set this to 1 if you don't want the icons ever changing var/list/injected_reagents = list() - var/injected_target_amount = 1 + var/reagent_target_amount = 1 + var/inject_amount = 1 /obj/machinery/optable/New() ..() @@ -107,10 +108,9 @@ check_victim() if(LAZYLEN(injected_reagents)) for(var/mob/living/carbon/C in get_turf(src)) + var/datum/reagents/R = C.reagents for(var/chemical in injected_reagents) - var/current_amount = C.reagents.get_reagent_amount(chemical) - if(current_amount < injected_target_amount) - C.reagents.add_reagent(chemical, injected_target_amount - current_amount) + R.check_and_add(chemical,reagent_target_amount,inject_amount) /obj/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user as mob) if(C == user) From e1b2de4fd2128ca8e75baf3a43d03a4fc6ceeb78 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 23:55:57 +0000 Subject: [PATCH 15/29] Automatic changelog compile, [ci skip] --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-9826.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9827.yml | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9826.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9827.yml diff --git a/html/changelog.html b/html/changelog.html index e95fd14f0c2..e411e7bd57e 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -63,6 +63,11 @@
    • META - Cargo shuttle airlocks now bolt properly.
    • META - Cargo shuttle flaps are now airtight. All hail Cargonia.
    +

    Birdtalon updated:

    +
      +
    • Gamma ERT Paranormal gets their null rod.
      • +
    • Moves check_and_add() to reagents holder
      • +

    DesolateG updated:

    • Refactors global var lists to use the global subsystem.
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 725a891440b..2c264a60d9c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7442,6 +7442,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: META - Cargo shuttle blast doors now reacts to the right button. - bugfix: META - Cargo shuttle airlocks now bolt properly. - bugfix: META - Cargo shuttle flaps are now airtight. All hail Cargonia. + Birdtalon: + - bugfix: Gamma ERT Paranormal gets their null rod. + - tweak: Moves check_and_add() to reagents holder DesolateG: - tweak: Refactors global var lists to use the global subsystem. Farie82: diff --git a/html/changelogs/AutoChangeLog-pr-9826.yml b/html/changelogs/AutoChangeLog-pr-9826.yml deleted file mode 100644 index 22bfe89e3f9..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9826.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - bugfix: "Gamma ERT Paranormal gets their null rod." diff --git a/html/changelogs/AutoChangeLog-pr-9827.yml b/html/changelogs/AutoChangeLog-pr-9827.yml deleted file mode 100644 index 6d75583b19d..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9827.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - tweak: "Moves check_and_add() to reagents holder" From c52c922842744454a05be2d61869589fc00901cc Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 21:00:38 -0400 Subject: [PATCH 16/29] Automatic changelog generation for PR #9825 [ci skip] --- html/changelogs/AutoChangeLog-pr-9825.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9825.yml diff --git a/html/changelogs/AutoChangeLog-pr-9825.yml b/html/changelogs/AutoChangeLog-pr-9825.yml new file mode 100644 index 00000000000..f8ff9cd44b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9825.yml @@ -0,0 +1,4 @@ +author: "uc_guy" +delete-after: True +changes: + - bugfix: "You can no longer get an infection and die during abductor surgery." From b5540d8d1376d25f803a819a23c1ee26901fcc97 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 21:02:27 -0400 Subject: [PATCH 17/29] Automatic changelog generation for PR #9830 [ci skip] --- html/changelogs/AutoChangeLog-pr-9830.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9830.yml diff --git a/html/changelogs/AutoChangeLog-pr-9830.yml b/html/changelogs/AutoChangeLog-pr-9830.yml new file mode 100644 index 00000000000..4da7d227add --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9830.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - bugfix: "Chem master now will show its de-powered state properly." From d1c29436a51d594bd1c01105e2d61015743fabb4 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 21:20:55 -0400 Subject: [PATCH 18/29] Automatic changelog generation for PR #9822 [ci skip] --- html/changelogs/AutoChangeLog-pr-9822.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9822.yml diff --git a/html/changelogs/AutoChangeLog-pr-9822.yml b/html/changelogs/AutoChangeLog-pr-9822.yml new file mode 100644 index 00000000000..d6edef8fd2e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9822.yml @@ -0,0 +1,5 @@ +author: "FlimFlamm" +delete-after: True +changes: + - tweak: "Tweaked formatting of Newscaster stories" + - bugfix: "Fixes images displaying improperly on Newscaster stories" From f22e21a0e2459cfde0d8b445d95acd70af63d4cf Mon Sep 17 00:00:00 2001 From: DarkPyrolord Date: Sat, 13 Oct 2018 14:43:27 +1300 Subject: [PATCH 19/29] SpamBGone --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c5557028896..b793ec154c7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1019,7 +1019,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, return 1 /mob/living/carbon/proc/forceFedAttackLog(var/obj/item/reagent_containers/food/toEat, mob/user) - add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagentlist(toEat)]", ATKLOG_FEW) + add_attack_logs(user, src, "Fed [toEat]. Reagents: [toEat.reagentlist(toEat)]", ATKLOG_MOST) if(!iscarbon(user)) LAssailant = null else From 185b678e597225d0ae069c00cdc7364542763e4b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 22:16:35 -0400 Subject: [PATCH 20/29] Automatic changelog generation for PR #9831 [ci skip] --- html/changelogs/AutoChangeLog-pr-9831.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9831.yml diff --git a/html/changelogs/AutoChangeLog-pr-9831.yml b/html/changelogs/AutoChangeLog-pr-9831.yml new file mode 100644 index 00000000000..98cda2b6471 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9831.yml @@ -0,0 +1,4 @@ +author: "DarkPyrolord" +delete-after: True +changes: + - tweak: "Changed attack log level for reagent forcefeeding from FEW to MOST" From d84c191a8823833ac06d5285fceca0c62ab809f5 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Fri, 12 Oct 2018 22:54:39 -0400 Subject: [PATCH 21/29] removes boxing attack logs --- code/modules/martial_arts/brawling.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index 520f4c1a96a..f3401373f23 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -14,12 +14,11 @@ A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) var/atk_verb = pick("left hook","right hook","straight punch") - + var/damage = rand(5, 8) + A.dna.species.punchdamagelow if(!damage) playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!") - add_attack_logs(A, D, "Melee attacked with [src] (miss/block)") return 0 @@ -32,7 +31,6 @@ "[A] has hit [D] with a [atk_verb]!") D.apply_damage(damage, STAMINA, affecting, armor_block) - add_attack_logs(A, D, "Melee attacked with [src]") if(D.getStaminaLoss() > 50) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) From c2d6726168156728de7cf82449f3d08ba3725c83 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Fri, 12 Oct 2018 23:25:10 -0400 Subject: [PATCH 22/29] Update code/modules/martial_arts/brawling.dm --- code/modules/martial_arts/brawling.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index f3401373f23..ec57db72d7b 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -19,6 +19,7 @@ if(!damage) playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) D.visible_message("[A] has attempted to hit [D] with a [atk_verb]!") + add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL) return 0 @@ -31,6 +32,7 @@ "[A] has hit [D] with a [atk_verb]!") D.apply_damage(damage, STAMINA, affecting, armor_block) + add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL) if(D.getStaminaLoss() > 50) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) From 216f03ddca04b41dbdc69b40f4d05ea75f3846d0 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Fri, 12 Oct 2018 23:28:04 -0400 Subject: [PATCH 23/29] moves boxing attack logs to the ALL preference --- code/modules/martial_arts/brawling.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm index ec57db72d7b..7869e101505 100644 --- a/code/modules/martial_arts/brawling.dm +++ b/code/modules/martial_arts/brawling.dm @@ -32,7 +32,7 @@ "[A] has hit [D] with a [atk_verb]!") D.apply_damage(damage, STAMINA, affecting, armor_block) - add_attack_logs(A, D, "Melee attacked with [src] (miss/block)", ATKLOG_ALL) + add_attack_logs(A, D, "Melee attacked with [src]", ATKLOG_ALL) if(D.getStaminaLoss() > 50) var/knockout_prob = D.getStaminaLoss() + rand(-15,15) if((D.stat != DEAD) && prob(knockout_prob)) From 28b85924b200c4d2c14baccf775a5af96ccef00b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 23:32:13 -0400 Subject: [PATCH 24/29] Automatic changelog generation for PR #9521 [ci skip] --- html/changelogs/AutoChangeLog-pr-9521.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9521.yml diff --git a/html/changelogs/AutoChangeLog-pr-9521.yml b/html/changelogs/AutoChangeLog-pr-9521.yml new file mode 100644 index 00000000000..49dc6067c39 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9521.yml @@ -0,0 +1,6 @@ +author: "alex-gh" +delete-after: True +changes: + - bugfix: "Species damage modifiers now only affect damage, not healing." + - tweak: "Races that took more damage from certain damage types no longer heal from that damage type faster. For example: Drask no longer heal from burn at double rate; Grey, Vox no longer heal from brute at increased rate (Note: IPC healing with welders/wires is not affected)." + - tweak: "Kidan no longer heal from brute at a reduced rate." From 73c2718965d9a39f3b06dd58264983a04fbc19d4 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Fri, 12 Oct 2018 23:41:33 -0400 Subject: [PATCH 25/29] Automatic changelog generation for PR #9832 [ci skip] --- html/changelogs/AutoChangeLog-pr-9832.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9832.yml diff --git a/html/changelogs/AutoChangeLog-pr-9832.yml b/html/changelogs/AutoChangeLog-pr-9832.yml new file mode 100644 index 00000000000..8819115a4df --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9832.yml @@ -0,0 +1,4 @@ +author: "Ty-Omaha" +delete-after: True +changes: + - tweak: "Boxing logs moved to the ALL preference" From 0f78bf636cec319a02f9364c2e5ca69abaf14770 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 13 Oct 2018 03:47:53 +0000 Subject: [PATCH 26/29] Automatic changelog compile, [ci skip] --- html/changelog.html | 29 +++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 19 +++++++++++++++ html/changelogs/AutoChangeLog-pr-9521.yml | 6 ----- html/changelogs/AutoChangeLog-pr-9822.yml | 5 ---- html/changelogs/AutoChangeLog-pr-9825.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9830.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9831.yml | 4 ---- html/changelogs/AutoChangeLog-pr-9832.yml | 4 ---- 8 files changed, 48 insertions(+), 27 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9521.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9822.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9825.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9830.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9831.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-9832.yml diff --git a/html/changelog.html b/html/changelog.html index e411e7bd57e..faafee731ef 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,35 @@ -->
      +

      13 October 2018

      +

      Birdtalon updated:

      +
        +
      • Chem master now will show its de-powered state properly.
        • +
      +

      DarkPyrolord updated:

      +
        +
      • Changed attack log level for reagent forcefeeding from FEW to MOST
        • +
      +

      FlimFlamm updated:

      +
        +
      • Tweaked formatting of Newscaster stories
        • +
      • Fixes images displaying improperly on Newscaster stories
        • +
      +

      Ty-Omaha updated:

      +
        +
      • Boxing logs moved to the ALL preference
        • +
      +

      alex-gh updated:

      +
        +
      • Species damage modifiers now only affect damage, not healing.
        • +
      • Races that took more damage from certain damage types no longer heal from that damage type faster. For example: Drask no longer heal from burn at double rate; Grey, Vox no longer heal from brute at increased rate (Note: IPC healing with welders/wires is not affected).
        • +
      • Kidan no longer heal from brute at a reduced rate.
        • +
      +

      uc_guy updated:

      +
        +
      • You can no longer get an infection and die during abductor surgery.
        • +
      +

      12 October 2018

      Alonefromhell updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 2c264a60d9c..244e4755ae7 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7477,3 +7477,22 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: You can throw sand into people's eyes! Pocket sand! - tweak: 'Phazon take 5 bluespace crystal to construct now instead of 1. remove: Transfer prompt when you click on a stack of the same type with a stack' +2018-10-13: + Birdtalon: + - bugfix: Chem master now will show its de-powered state properly. + DarkPyrolord: + - tweak: Changed attack log level for reagent forcefeeding from FEW to MOST + FlimFlamm: + - tweak: Tweaked formatting of Newscaster stories + - bugfix: Fixes images displaying improperly on Newscaster stories + Ty-Omaha: + - tweak: Boxing logs moved to the ALL preference + alex-gh: + - bugfix: Species damage modifiers now only affect damage, not healing. + - tweak: 'Races that took more damage from certain damage types no longer heal from + that damage type faster. For example: Drask no longer heal from burn at double + rate; Grey, Vox no longer heal from brute at increased rate (Note: IPC healing + with welders/wires is not affected).' + - tweak: Kidan no longer heal from brute at a reduced rate. + uc_guy: + - bugfix: You can no longer get an infection and die during abductor surgery. diff --git a/html/changelogs/AutoChangeLog-pr-9521.yml b/html/changelogs/AutoChangeLog-pr-9521.yml deleted file mode 100644 index 49dc6067c39..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9521.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "alex-gh" -delete-after: True -changes: - - bugfix: "Species damage modifiers now only affect damage, not healing." - - tweak: "Races that took more damage from certain damage types no longer heal from that damage type faster. For example: Drask no longer heal from burn at double rate; Grey, Vox no longer heal from brute at increased rate (Note: IPC healing with welders/wires is not affected)." - - tweak: "Kidan no longer heal from brute at a reduced rate." diff --git a/html/changelogs/AutoChangeLog-pr-9822.yml b/html/changelogs/AutoChangeLog-pr-9822.yml deleted file mode 100644 index d6edef8fd2e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9822.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "FlimFlamm" -delete-after: True -changes: - - tweak: "Tweaked formatting of Newscaster stories" - - bugfix: "Fixes images displaying improperly on Newscaster stories" diff --git a/html/changelogs/AutoChangeLog-pr-9825.yml b/html/changelogs/AutoChangeLog-pr-9825.yml deleted file mode 100644 index f8ff9cd44b6..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9825.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "uc_guy" -delete-after: True -changes: - - bugfix: "You can no longer get an infection and die during abductor surgery." diff --git a/html/changelogs/AutoChangeLog-pr-9830.yml b/html/changelogs/AutoChangeLog-pr-9830.yml deleted file mode 100644 index 4da7d227add..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9830.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - bugfix: "Chem master now will show its de-powered state properly." diff --git a/html/changelogs/AutoChangeLog-pr-9831.yml b/html/changelogs/AutoChangeLog-pr-9831.yml deleted file mode 100644 index 98cda2b6471..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9831.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DarkPyrolord" -delete-after: True -changes: - - tweak: "Changed attack log level for reagent forcefeeding from FEW to MOST" diff --git a/html/changelogs/AutoChangeLog-pr-9832.yml b/html/changelogs/AutoChangeLog-pr-9832.yml deleted file mode 100644 index 8819115a4df..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9832.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ty-Omaha" -delete-after: True -changes: - - tweak: "Boxing logs moved to the ALL preference" From 7633b312e52407ee846d088c68072be5f9e4c701 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sat, 13 Oct 2018 07:50:05 +0200 Subject: [PATCH 27/29] Voice analyzers no longer activate on any noise. --- code/modules/assembly/voice.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 8228e490a38..2dc6749bd73 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -70,7 +70,7 @@ /obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, msg) return -/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg) +/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg) pulse(0) var/turf/T = get_turf(src) //otherwise it won't work in hand T.visible_message("[bicon(src)] beeps!") \ No newline at end of file From d965f99443b1ac87e8680bb7ef62d3b58f09d167 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 13 Oct 2018 02:51:04 -0400 Subject: [PATCH 28/29] Automatic changelog generation for PR #9834 [ci skip] --- html/changelogs/AutoChangeLog-pr-9834.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-9834.yml diff --git a/html/changelogs/AutoChangeLog-pr-9834.yml b/html/changelogs/AutoChangeLog-pr-9834.yml new file mode 100644 index 00000000000..ce9c9cc9070 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-9834.yml @@ -0,0 +1,4 @@ +author: "uc_guy" +delete-after: True +changes: + - bugfix: "Voice analyzers no longer activate on noise." From 4643db46905f64aa1ce2ee46b1efb99bccdc63f0 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Sat, 13 Oct 2018 08:09:50 +0000 Subject: [PATCH 29/29] Automatic changelog compile, [ci skip] --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/AutoChangeLog-pr-9834.yml | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-9834.yml diff --git a/html/changelog.html b/html/changelog.html index faafee731ef..622f5b0825c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -83,6 +83,7 @@

        uc_guy updated:

        • You can no longer get an infection and die during abductor surgery.
          • +
        • Voice analyzers no longer activate on noise.

        12 October 2018

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 244e4755ae7..668ff62a364 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7496,3 +7496,4 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Kidan no longer heal from brute at a reduced rate. uc_guy: - bugfix: You can no longer get an infection and die during abductor surgery. + - bugfix: Voice analyzers no longer activate on noise. diff --git a/html/changelogs/AutoChangeLog-pr-9834.yml b/html/changelogs/AutoChangeLog-pr-9834.yml deleted file mode 100644 index ce9c9cc9070..00000000000 --- a/html/changelogs/AutoChangeLog-pr-9834.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "uc_guy" -delete-after: True -changes: - - bugfix: "Voice analyzers no longer activate on noise."