From 703a4ec262509eb9d26a4ff31c2d900a9b4994eb Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 22 Aug 2020 01:47:27 +0100 Subject: [PATCH 1/7] weaker than fists --- code/game/objects/items/weaponry.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index b5f8612244..e05e0c3bd4 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -327,13 +327,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/bokken/attack_self(mob/user) harm = !harm if(harm) - force -= 2 + force -= 4 damtype = BRUTE attack_verb = list("bashed", "smashed", "attacked") bare_wound_bonus = 15 // having your leg smacked by a wooden stick is probably not great for it if it's naked wound_bonus = 0 else - force += 2 + force += 4 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") bare_wound_bonus = 0 From 3cf81dcc6cfc3e1076103449536403258b66cb66 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 22 Aug 2020 01:56:56 +0100 Subject: [PATCH 2/7] this is better --- code/game/objects/items/weaponry.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index e05e0c3bd4..5555040f55 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -272,7 +272,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY - force = 9 + force = 7 //how much harm mode damage we do + var/stamina_damage_increment = 4 //how much extra damage do we do when in non-harm mode throwforce = 10 damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") @@ -323,6 +324,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/bokken/Initialize() . = ..() AddElement(/datum/element/sword_point) + if(!harm) //if initialised in non-harm mode, setup force accordingly + force = force + stamina_damage_increment /obj/item/melee/bokken/attack_self(mob/user) harm = !harm From 236db857dc8dcbc1ab563c45db6ad62d24b69477 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Aug 2020 15:42:20 -0500 Subject: [PATCH 3/7] pda bomb buyonce --- code/modules/uplink/uplink_items/uplink_explosives.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/uplink/uplink_items/uplink_explosives.dm b/code/modules/uplink/uplink_items/uplink_explosives.dm index 6cc1c9fe05..f44966fb3b 100644 --- a/code/modules/uplink/uplink_items/uplink_explosives.dm +++ b/code/modules/uplink/uplink_items/uplink_explosives.dm @@ -80,6 +80,7 @@ item = /obj/item/cartridge/virus/syndicate cost = 5 restricted = TRUE + limited_stock = 1 /datum/uplink_item/explosives/emp name = "EMP Grenades and Implanter Kit" From 093928eab2b112e153379e473d7f5932bbf1ac1c Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Aug 2020 15:46:14 -0500 Subject: [PATCH 4/7] holopara buyonce --- code/modules/uplink/uplink_items/uplink_dangerous.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index a43e3fc2ce..58cb43996d 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -177,6 +177,7 @@ organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host." item = /obj/item/storage/box/syndie_kit/guardian cost = 15 + limited_stock = 1 // you can only have one holopara apparently? refundable = TRUE cant_discount = TRUE surplus = 0 From cdb3647c56d76de8c203bcf3ca59f18dbb24328d Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 24 Aug 2020 15:38:49 +0100 Subject: [PATCH 5/7] thank --- code/game/objects/items/weaponry.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 5555040f55..153be3900e 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -330,13 +330,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/melee/bokken/attack_self(mob/user) harm = !harm if(harm) - force -= 4 + force -= stamina_damage_increment damtype = BRUTE attack_verb = list("bashed", "smashed", "attacked") bare_wound_bonus = 15 // having your leg smacked by a wooden stick is probably not great for it if it's naked wound_bonus = 0 else - force += 4 + force += stamina_damage_increment damtype = STAMINA attack_verb = list("whacked", "smacked", "struck") bare_wound_bonus = 0 From 40eb26a71b823b6c18773a0bd55181a6b0ca422d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Aug 2020 12:07:08 -0500 Subject: [PATCH 6/7] Automatic changelog generation for PR #13237 [ci skip] --- html/changelogs/AutoChangeLog-pr-13237.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13237.yml diff --git a/html/changelogs/AutoChangeLog-pr-13237.yml b/html/changelogs/AutoChangeLog-pr-13237.yml new file mode 100644 index 0000000000..db13b39aad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13237.yml @@ -0,0 +1,5 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "Traitor holoparasites can now only be bought once, because apparently you can only have one active holopara." + - balance: "PDA bombs can now only be bought once per uplink." From 68020ec842958bd5acb5c1aa8850f4cf21e8fe10 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 27 Aug 2020 12:07:34 -0500 Subject: [PATCH 7/7] Automatic changelog generation for PR #13235 [ci skip] --- html/changelogs/AutoChangeLog-pr-13235.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13235.yml diff --git a/html/changelogs/AutoChangeLog-pr-13235.yml b/html/changelogs/AutoChangeLog-pr-13235.yml new file mode 100644 index 0000000000..ff22570b6e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13235.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - tweak: "bokken do two more stamina damage now"