From 965efe6dabd4660258e0c6079c01947752ac2054 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 7 Aug 2020 03:13:43 -0500 Subject: [PATCH 1/4] funny timestop katana adminbus only --- code/game/objects/items/weaponry.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 0ab1f1b4fd..39362fa21a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -249,6 +249,16 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1) return(BRUTELOSS) +/obj/item/katana/timestop + item_flags = ITEM_CAN_PARRY + block_parry_data = /datum/block_parry_data/bokken/quick_parry/proj + +/obj/item/katana/timestop/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time) + if(ishuman(owner)) + var/mob/living/carbon/human/flynn = owner + flynn.emote("me",1,"smirks.",FALSE) + new /obj/effect/timestop(get_turf(owner), 2, 50, list(owner)) + /obj/item/melee/bokken // parrying stick name = "bokken" desc = "A space-Japanese training sword made of wood and shaped like a katana." @@ -301,6 +311,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 parry_failed_clickcd_duration = 1 SECONDS // more forgiving punishments for missed parries // still, don't fucking miss your parries or you're down stamina and staggered to shit +/datum/block_parry_data/bokken/quick_parry/proj + parry_efficiency_perfect_override = list() + /obj/item/melee/bokken/Initialize() . = ..() AddElement(/datum/element/sword_point) From 32a1c90b670046eee06505d5e3c94d31db3c7db1 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 7 Aug 2020 03:25:05 -0500 Subject: [PATCH 2/4] what are we in for --- code/game/objects/items/weaponry.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 39362fa21a..6210ce7ea3 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -250,6 +250,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 return(BRUTELOSS) /obj/item/katana/timestop + name = "temporal katana" + desc = "Delicately balanced, this finely-crafted blade hums with barely-restrained potential." item_flags = ITEM_CAN_PARRY block_parry_data = /datum/block_parry_data/bokken/quick_parry/proj From 029d88ac9d78d98dc3f892b395561fd7431c6040 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 7 Aug 2020 03:32:54 -0500 Subject: [PATCH 3/4] play a real shin megami tensei game --- code/game/objects/items/weaponry.dm | 2 +- code/modules/mob/living/emote.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 6210ce7ea3..ac461118d1 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -258,7 +258,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/katana/timestop/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time) if(ishuman(owner)) var/mob/living/carbon/human/flynn = owner - flynn.emote("me",1,"smirks.",FALSE) + flynn.emote("smirk") new /obj/effect/timestop(get_turf(owner), 2, 50, list(owner)) /obj/item/melee/bokken // parrying stick diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index d11ad4474a..e6ad8fcd38 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -326,6 +326,11 @@ key_third_person = "smiles" message = "smiles." +/datum/emote/living/smirk + key = "smirk" + key_third_person = "smirks" + message = "smirks." + /datum/emote/living/sneeze key = "sneeze" key_third_person = "sneezes" From 7c7eff12c399632fb059c1766b85063716922b04 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 8 Aug 2020 00:52:39 -0500 Subject: [PATCH 4/4] wizard buyable --- code/modules/antagonists/wizard/equipment/spellbook.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index 4c29c53a2e..d4d117f8ee 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -294,6 +294,11 @@ dat += "[surplus] left.
" return dat +/datum/spellbook_entry/item/timestop_katana + name = "Temporal Katana" + desc = "An oddly-weighted katana, reinforced to allow parrying, with a temporal anomaly magically shoved into it. Successful ripostes prove devastating to those unprepared." + item_path = /obj/item/katana/timestop + /datum/spellbook_entry/item/staffchange name = "Staff of Change" desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."