From 8f9fd29c5f58a08d674ce1ca1ce9420a00cd9204 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 8 May 2015 22:20:39 +0100 Subject: [PATCH 1/3] Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits) Squashed commits: [2c002f9] Removes sleepy chems from cloning --- code/game/machinery/cloning.dm | 10 +--------- html/changelogs/Yoshax-nomorechems.YML | 5 +++++ 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/Yoshax-nomorechems.YML diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 343c8ab2db..fe96bdf549 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -184,17 +184,9 @@ //So clones don't die of oxyloss in a running pod. if(occupant.reagents.get_reagent_amount("inaprovaline") < 30) occupant.reagents.add_reagent("inaprovaline", 60) - - //So clones will remain asleep for long enough to get them into cryo (Bay RP edit) - if(occupant.reagents.get_reagent_amount("stoxin") < 10) - occupant.reagents.add_reagent("stoxin", 5) - if(occupant.reagents.get_reagent_amount("chloralhydrate") < 1) - occupant.reagents.add_reagent("chloralhydrate", 1) - + occupant.Sleeping(30) //Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!! occupant.adjustOxyLoss(-4) - if(notoxin) - occupant.adjustToxLoss(-2) // If sufficiently upgraded - remove toxin damage from chloral use_power(7500) //This might need tweaking. return diff --git a/html/changelogs/Yoshax-nomorechems.YML b/html/changelogs/Yoshax-nomorechems.YML new file mode 100644 index 0000000000..aeec93b30a --- /dev/null +++ b/html/changelogs/Yoshax-nomorechems.YML @@ -0,0 +1,5 @@ +author: Yoshax +delete-after: True + +changes: + - tweak: "Removes sleepy chems from being cloned, adds a consistent period of 30 tick sleep." \ No newline at end of file From 6618b225a0f010a2ae49767331ffe5ab84042ee4 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 9 May 2015 22:10:39 +0300 Subject: [PATCH 2/3] Made sterile gloves actually start sterile Fixes #9163 --- code/modules/clothing/gloves/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index dfb370d38c..c93db78d4d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -49,7 +49,7 @@ siemens_coefficient = 0.30 permeability_coefficient = 0.01 item_color="white" - + germ_level = 0 cmo item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way. From f3e37861cf3d5b3284a525e481f96555b423dd08 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 10 May 2015 10:44:16 +0200 Subject: [PATCH 3/3] Updates changelog. --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 8 ++++++++ html/changelogs/GinjaNinja32_acting_manifest.yml | 5 ----- html/changelogs/Yoshax-nomorechems.YML | 5 ----- 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/GinjaNinja32_acting_manifest.yml delete mode 100644 html/changelogs/Yoshax-nomorechems.YML diff --git a/html/changelog.html b/html/changelog.html index 9169105593..2340fede16 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,16 @@ -->
+

10 May 2015

+

GinjaNinja32 updated:

+
    +
  • Acting jobs on the manifest will now sort with their non-acting counterparts. All assignments beginning with the word 'acting', 'temporary', or 'interim' will do this.
    • +
+

Yoshax updated:

+
    +
  • Removes sleepy chems from being cloned, adds a consistent period of 30 tick sleep.
    • +
+

09 May 2015

Yoshax updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f51f13ea81..fad13d00cb 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1731,3 +1731,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Yoshax: - rscadd: Maps in the top mounted 9mm practice rounds, .45 practice rounds, and practice shotgun shells into the armory. +2015-05-10: + GinjaNinja32: + - rscadd: Acting jobs on the manifest will now sort with their non-acting counterparts. + All assignments beginning with the word 'acting', 'temporary', or 'interim' + will do this. + Yoshax: + - tweak: Removes sleepy chems from being cloned, adds a consistent period of 30 + tick sleep. diff --git a/html/changelogs/GinjaNinja32_acting_manifest.yml b/html/changelogs/GinjaNinja32_acting_manifest.yml deleted file mode 100644 index 18f2dd32e6..0000000000 --- a/html/changelogs/GinjaNinja32_acting_manifest.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: GinjaNinja32 -delete-after: True - -changes: - - rscadd: "Acting jobs on the manifest will now sort with their non-acting counterparts. All assignments beginning with the word 'acting', 'temporary', or 'interim' will do this." diff --git a/html/changelogs/Yoshax-nomorechems.YML b/html/changelogs/Yoshax-nomorechems.YML deleted file mode 100644 index aeec93b30a..0000000000 --- a/html/changelogs/Yoshax-nomorechems.YML +++ /dev/null @@ -1,5 +0,0 @@ -author: Yoshax -delete-after: True - -changes: - - tweak: "Removes sleepy chems from being cloned, adds a consistent period of 30 tick sleep." \ No newline at end of file