From b39092f0bd190f1607e0829139b26f9f30dfde49 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Mon, 20 Jun 2022 19:43:56 -0500 Subject: [PATCH 01/11] i hate miners i want to kill them --- .../LavaRuins/lavaland_surface_cultritual.dmm | 5 ++- .../lavaland_surface_legionbarracks.dmm | 3 +- _maps/RandomRuins/SpaceRuins/Academy.dmm | 7 +++- code/game/objects/items/weaponry.dm | 37 ++++++++++--------- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm index 5d00b4357a12..dbd1dde015db 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm @@ -187,7 +187,10 @@ /area/lavaland/surface/outdoors) "O" = ( /obj/item/claymore{ - name = "Excalibur" + name = "Excalibur"; + desc = "A legendary sword passed down through the ages, though it seems to have lost its magic."; + force = 21; + block_chance = 30 }, /obj/item/clothing/shoes/plate, /obj/effect/decal/cleanable/blood/old, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm index 085742c05818..d74ecdec65f9 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm @@ -83,9 +83,10 @@ "S" = ( /obj/structure/rack, /obj/item/claymore{ + name = "Ancient Sword"; desc = "It's cracked and blunted"; force = 21; - name = "Ancient Sword" + block_chance = 30 }, /obj/item/shield/riot/roman{ block_chance = 25; diff --git a/_maps/RandomRuins/SpaceRuins/Academy.dmm b/_maps/RandomRuins/SpaceRuins/Academy.dmm index 53c01be96542..ee5ba82b073a 100644 --- a/_maps/RandomRuins/SpaceRuins/Academy.dmm +++ b/_maps/RandomRuins/SpaceRuins/Academy.dmm @@ -1171,7 +1171,12 @@ /area/awaymission/academy/academycellar) "mn" = ( /obj/structure/rack, -/obj/item/claymore, +/obj/item/claymore[ + name = "Lapis-Adorned Blade"; + desc = "A sword made of enchanted lapis. Though, it seems to have lost its magic."; + force = 21; + block_chance = 30 +], /obj/item/toy/figure/wizard, /turf/open/floor/vault, /area/awaymission/academy/academycellar) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index a028326a5442..512b45d7f8ff 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -64,7 +64,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK force = 40 throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 50 sharpness = SHARP_EDGED @@ -205,6 +205,24 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 name = new_name playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) +/obj/item/claymore/bone + name = "Bone Sword" + desc = "Jagged pieces of bone are tied to what looks like a goliaths femur." + icon = 'icons/obj/weapons/swords.dmi' + icon_state = "bone_sword" + item_state = "bone_sword" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + force = 15 + throwforce = 10 + armour_penetration = 15 + w_class = WEIGHT_CLASS_HUGE + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut") + block_chance = 30 + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) + /obj/item/katana name = "katana" desc = "Woefully underpowered in D20." @@ -801,20 +819,3 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 to_chat(user, span_warning("[M] is too close to use [src] on.")) return M.attack_hand(user) - -/obj/item/claymore/bone - name = "Bone Sword" - desc = "Jagged pieces of bone are tied to what looks like a goliaths femur." - icon = 'icons/obj/weapons/swords.dmi' - icon_state = "bone_sword" - item_state = "bone_sword" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK - force = 15 - throwforce = 10 - armour_penetration = 15 - w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "ripped", "diced", "cut") - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) From d061b41f65abda2ebcf06fc120b72cd9936a7743 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Mon, 20 Jun 2022 19:48:19 -0500 Subject: [PATCH 02/11] Update lavaland_surface_legionbarracks.dmm uh makes this description less shit? --- _maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm index d74ecdec65f9..4ce56e5959a0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm @@ -84,7 +84,7 @@ /obj/structure/rack, /obj/item/claymore{ name = "Ancient Sword"; - desc = "It's cracked and blunted"; + desc = "A cracked and blunted sword, clearly weathered over the ages."; force = 21; block_chance = 30 }, From 19fcefc5eb2b9c9dfabad4c0b3e26c4d30daa67c Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Mon, 20 Jun 2022 20:02:19 -0500 Subject: [PATCH 03/11] removes academy changes because ??? --- _maps/RandomRuins/SpaceRuins/Academy.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/Academy.dmm b/_maps/RandomRuins/SpaceRuins/Academy.dmm index ee5ba82b073a..53c01be96542 100644 --- a/_maps/RandomRuins/SpaceRuins/Academy.dmm +++ b/_maps/RandomRuins/SpaceRuins/Academy.dmm @@ -1171,12 +1171,7 @@ /area/awaymission/academy/academycellar) "mn" = ( /obj/structure/rack, -/obj/item/claymore[ - name = "Lapis-Adorned Blade"; - desc = "A sword made of enchanted lapis. Though, it seems to have lost its magic."; - force = 21; - block_chance = 30 -], +/obj/item/claymore, /obj/item/toy/figure/wizard, /turf/open/floor/vault, /area/awaymission/academy/academycellar) From d6f66fafd1f795fd96ecf6d33a26a41deb0126d0 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:39:10 -0500 Subject: [PATCH 04/11] fixed borked mapvaredits Co-authored-by: Byemoh --- _maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm index dbd1dde015db..21dec8d8f44f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm @@ -187,9 +187,9 @@ /area/lavaland/surface/outdoors) "O" = ( /obj/item/claymore{ - name = "Excalibur"; - desc = "A legendary sword passed down through the ages, though it seems to have lost its magic."; - force = 21; + name = "Excalibur" + desc = "A legendary sword passed down through the ages, though it seems to have lost its magic." + force = 21 block_chance = 30 }, /obj/item/clothing/shoes/plate, From 5db7ac96376145a8e9ab03de2196d9a51a891367 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:43:27 -0500 Subject: [PATCH 05/11] makes the funny ruin claymores new items --- code/game/objects/items/weaponry.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 512b45d7f8ff..a576706272cf 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -79,6 +79,18 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/suicide_act(mob/user) user.visible_message(span_suicide("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(BRUTELOSS) + +/obj/item/claymore/excalibur + name = "Excalibur" + desc = "A legendary sword passed down through the ages, though it seems to have lost its magic." + force = 21 + block_chance = 30 + +/obj/item/claymore/ruin + name = "Ancient Sword" + desc = "A cracked and blunted sword, clearly weathered over the ages." + force = 21 + block_chance = 30 /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." From 36dfcaae749feb6cec835ac1fcc5394044dced3d Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:44:04 -0500 Subject: [PATCH 06/11] new claymore for dragon land --- .../RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm index 21dec8d8f44f..da0675593b4d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm @@ -186,12 +186,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "O" = ( -/obj/item/claymore{ - name = "Excalibur" - desc = "A legendary sword passed down through the ages, though it seems to have lost its magic." - force = 21 - block_chance = 30 - }, +/obj/item/claymore/excalibur, /obj/item/clothing/shoes/plate, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/ash/large, From 05dc9a8cbb6ea4c1f45565353be154282d1b6c4b Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Wed, 22 Jun 2022 18:44:40 -0500 Subject: [PATCH 07/11] makes ancient sword exist --- .../LavaRuins/lavaland_surface_legionbarracks.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm index 4ce56e5959a0..a61f9210bb95 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_legionbarracks.dmm @@ -82,12 +82,7 @@ /area/ruin/unpowered) "S" = ( /obj/structure/rack, -/obj/item/claymore{ - name = "Ancient Sword"; - desc = "A cracked and blunted sword, clearly weathered over the ages."; - force = 21; - block_chance = 30 - }, +/obj/item/claymore/ruin, /obj/item/shield/riot/roman{ block_chance = 25; desc = "Bears an inscription on the inside: \"Necropolis venio domus\"."; From a087f7d2ee10e55fe62c99e88f88de85422cd22a Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:41:24 -0500 Subject: [PATCH 08/11] adds an apostrophe to bone sword inspect --- code/game/objects/items/weaponry.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index a576706272cf..448acf9007df 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -219,7 +219,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/bone name = "Bone Sword" - desc = "Jagged pieces of bone are tied to what looks like a goliaths femur." + desc = "Jagged pieces of bone are tied to what looks like a goliath's femur." icon = 'icons/obj/weapons/swords.dmi' icon_state = "bone_sword" item_state = "bone_sword" From 73028165d37a9c184b3538b81f0435ba42644337 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:43:27 -0500 Subject: [PATCH 09/11] Update lavaland_surface_cultritual.dmm --- _maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm index da0675593b4d..4204e9ca4c22 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultritual.dmm @@ -186,7 +186,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "O" = ( -/obj/item/claymore/excalibur, +/obj/item/claymore/ruin/excalibur, /obj/item/clothing/shoes/plate, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/ash/large, From 3eaff1d7dc16cc88e5f8e23bc38f6fe94cff47c6 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Thu, 23 Jun 2022 19:46:05 -0500 Subject: [PATCH 10/11] Update weaponry.dm --- code/game/objects/items/weaponry.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 448acf9007df..054469cd4f32 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -80,17 +80,15 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 user.visible_message(span_suicide("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return(BRUTELOSS) -/obj/item/claymore/excalibur - name = "Excalibur" - desc = "A legendary sword passed down through the ages, though it seems to have lost its magic." - force = 21 - block_chance = 30 - /obj/item/claymore/ruin - name = "Ancient Sword" + name = "ancient sword" desc = "A cracked and blunted sword, clearly weathered over the ages." force = 21 block_chance = 30 + +/obj/item/claymore/ruin/excalibur + name = "Excalibur" + desc = "A legendary sword passed down through the ages, though it seems to have lost its magic." /obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." From 0d9834681b2970af7a91c44078e8c06af90348e6 Mon Sep 17 00:00:00 2001 From: Skrem_7 <98909416+Skrem7@users.noreply.github.com> Date: Mon, 27 Jun 2022 19:44:36 -0500 Subject: [PATCH 11/11] shoudl make it so it can't block bullets --- code/game/objects/items/weaponry.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 054469cd4f32..d6466d0188bd 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -75,6 +75,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/claymore/Initialize() . = ..() AddComponent(/datum/component/butchering, 40, 105) + +/obj/item/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) + if(attack_type == PROJECTILE_ATTACK) + final_block_chance = 0 //Don't bring a sword to a gunfight + return ..() /obj/item/claymore/suicide_act(mob/user) user.visible_message(span_suicide("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!"))