From 1eb3473132e69863d6495ce38fa27b4677a1d1ec Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 27 Aug 2020 19:09:24 -0500 Subject: [PATCH 1/3] absolutely goes apeshit on desword data --- code/game/objects/items/dualsaber.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index cf5c3d4fc5..6cf6a524de 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -26,6 +26,7 @@ wound_bonus = -110 bare_wound_bonus = 20 block_parry_data = /datum/block_parry_data/dual_esword + block_chance = 60 var/hacked = FALSE /// Can this reflect all energy projectiles? var/can_reflect = TRUE @@ -38,7 +39,8 @@ var/wielded = FALSE // track wielded status on item var/slowdown_wielded = 0 -/datum/block_parry_data/dual_esword +/datum/block_parry_data/dual_esword // please run at the man going apeshit with his funny doublesword + can_block_directions = BLOCK_DIR_NORTH | BLOCK_DIR_NORTHEAST | BLOCK_DIR_NORTHWEST | BLOCK_DIR_WEST | BLOCK_DIR_EAST block_damage_absorption = 2 block_damage_multiplier = 0.15 block_damage_multiplier_override = list( @@ -50,10 +52,10 @@ block_lock_sprinting = TRUE // no attacking while blocking block_lock_attacking = TRUE - block_projectile_mitigation = 75 + block_projectile_mitigation = 85 // more efficient vs projectiles block_stamina_efficiency_override = list( - TEXT_ATTACK_TYPE_PROJECTILE = 4 + TEXT_ATTACK_TYPE_PROJECTILE = 6 ) parry_time_windup = 0 From cba2a1645be8d75fa071bb6d0646d8d8d7ecf3e5 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 30 Aug 2020 06:16:21 -0700 Subject: [PATCH 2/3] Makes pool actually check for the reagent instead of checking for a number. --- code/modules/pool/pool_controller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm index c9bc6be3e5..17faa7a3e3 100644 --- a/code/modules/pool/pool_controller.dm +++ b/code/modules/pool/pool_controller.dm @@ -210,7 +210,7 @@ for(var/datum/reagent/R in reagents.reagent_list) if(R.reagent_state == SOLID) R.reagent_state = LIQUID - if(!swimee.reagents.has_reagent(POOL_NO_OVERDOSE_MEDICINE_MAX)) + if(!swimee.reagents.has_reagent(R.type,POOL_NO_OVERDOSE_MEDICINE_MAX)) swimee.reagents.add_reagent(R.type, 0.5) //osmosis reagents.reaction(swimee, VAPOR, 0.03) //3 percent. Need to find a way to prevent this from stacking chems at some point like the above. for(var/obj/objects in W) From 678e170ab30ffd4e392e40135e0dc86d548ada5b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 6 Sep 2020 00:14:31 +0000 Subject: [PATCH 3/3] Automatic changelog compile [ci skip] --- html/changelog.html | 47 ++++++++-------------- html/changelogs/.all_changelog.yml | 9 +++++ html/changelogs/AutoChangeLog-pr-13244.yml | 5 --- html/changelogs/AutoChangeLog-pr-13339.yml | 4 -- html/changelogs/AutoChangeLog-pr-13341.yml | 4 -- html/changelogs/AutoChangeLog-pr-13348.yml | 4 -- 6 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13244.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13339.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13341.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13348.yml diff --git a/html/changelog.html b/html/changelog.html index fef7849cce..75939ac553 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,22 @@ -->
+

06 September 2020

+

Putnam3145 updated:

+
    +
  • Dynamic no longer pushes events.
    • +
  • Made spontaneous brain trauma a good deal less annoying.
    • +
+

lolman360, NecromancerAnne updated:

+
    +
  • The ancient art of blacksmithing, now in pixels.
    • +
  • cool swords and shit (thanks anne)
    • +
+

raspy-on-osu updated:

+
    +
  • thermomachine examine text
    • +
+

05 September 2020

Bhijn updated:

    @@ -1420,37 +1436,6 @@
  • Fixed the "Move it to the threshold" button; it now does what it says.
  • Reworded some text to be clearer.
- -

05 July 2020

-

Ghommie updated:

-
    -
  • You can now actually gain wiring experience from using cable coils.
    • -
  • Opening the View Skill Panel shouldn't trigger messages about insufficient admin priviledges anymore.
    • -
-

Yakumo Chen, kappa-sama updated:

-
    -
  • Removes improvised handguns
    • -
  • removed handsaws, improvised gun barrels (you can use atmos pipes again)
    • -
  • Guncrafting is less time and resource intensive
    • -
  • Item names in guncrafting are user-friendly.
    • -
-

kappa-sama updated:

-
    -
  • cloth string to replace durathread string
    • -
  • durathread string
    • -
  • All bows and arrows have had crafting times significantly reduced, coming out at up to 6 times faster crafting speeds. Improvised bows no longer require durathread; instead, they use cloth materials.
    • -
-

silicons updated:

-
    -
  • active blocking now has a toggle keybind
    • -
  • auto bunker override verb has been added
    • -
  • shields take 2.5 stam instead of 3.5 stam per second to maintain block
    • -
  • Cybernetic implant shields will auto-extend and be used to block if the user has no item to block with
    • -
-

timothyteakettle updated:

-
    -
  • cooking oil is now far less lethal, requiring a higher volume of the reagent to deal more damage
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 106e678bd1..b1683cdf5f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27228,3 +27228,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. raspy-on-osu: - tweak: supermatter shard examine text - tweak: protolathe item categories +2020-09-06: + Putnam3145: + - rscdel: Dynamic no longer pushes events. + - balance: Made spontaneous brain trauma a good deal less annoying. + lolman360, NecromancerAnne: + - rscadd: The ancient art of blacksmithing, now in pixels. + - imageadd: cool swords and shit (thanks anne) + raspy-on-osu: + - tweak: thermomachine examine text diff --git a/html/changelogs/AutoChangeLog-pr-13244.yml b/html/changelogs/AutoChangeLog-pr-13244.yml deleted file mode 100644 index 305d5f3584..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13244.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "lolman360, NecromancerAnne" -delete-after: True -changes: - - rscadd: "The ancient art of blacksmithing, now in pixels." - - imageadd: "cool swords and shit (thanks anne)" diff --git a/html/changelogs/AutoChangeLog-pr-13339.yml b/html/changelogs/AutoChangeLog-pr-13339.yml deleted file mode 100644 index 360b528911..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13339.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscdel: "Dynamic no longer pushes events." diff --git a/html/changelogs/AutoChangeLog-pr-13341.yml b/html/changelogs/AutoChangeLog-pr-13341.yml deleted file mode 100644 index ff06d19bb9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13341.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Made spontaneous brain trauma a good deal less annoying." diff --git a/html/changelogs/AutoChangeLog-pr-13348.yml b/html/changelogs/AutoChangeLog-pr-13348.yml deleted file mode 100644 index f804025be6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13348.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "raspy-on-osu" -delete-after: True -changes: - - tweak: "thermomachine examine text"