From 259ebdcc5d0ce63236ccaff4f0595e33f52937d8 Mon Sep 17 00:00:00 2001 From: Fikou Date: Sat, 14 Sep 2019 00:36:10 +0200 Subject: [PATCH] makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467) * who did this * boner * a * a * hhhhhhhhhhhhhhhhhhhhh * a * a * Update recipes.dm * hhhh --- code/datums/components/crafting/recipes.dm | 9 ++++---- code/game/objects/items/twohanded.dm | 22 +++++-------------- code/game/objects/structures/headpike.dm | 4 ++-- code/modules/clothing/suits/cloaks.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 2 +- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 70998b489dd..468f3713a07 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -39,7 +39,7 @@ result = /obj/item/twohanded/spear reqs = list(/obj/item/twohanded/spear = 1, /obj/item/grenade = 1) - blacklist = list(/obj/item/twohanded/spear/explosive) + blacklist = list(/obj/item/twohanded/spear/explosive, /obj/item/twohanded/spear/bonespear) parts = list(/obj/item/twohanded/spear = 1, /obj/item/grenade = 1) time = 15 @@ -584,7 +584,7 @@ /datum/crafting_recipe/bonespear name = "Bone Spear" - result = /obj/item/twohanded/bonespear + result = /obj/item/twohanded/spear/bonespear time = 30 reqs = list(/obj/item/stack/sheet/bone = 4, /obj/item/stack/sheet/sinew = 1) @@ -626,16 +626,17 @@ /obj/item/bodypart/head = 1) parts = list(/obj/item/bodypart/head = 1, /obj/item/twohanded/spear = 1) + blacklist = list(/obj/item/twohanded/spear/explosive, /obj/item/twohanded/spear/bonespear) result = /obj/structure/headpike category = CAT_PRIMAL /datum/crafting_recipe/headpikebone name = "Spike Head (Bone Spear)" time = 65 - reqs = list(/obj/item/twohanded/bonespear = 1, + reqs = list(/obj/item/twohanded/spear/bonespear = 1, /obj/item/bodypart/head = 1) parts = list(/obj/item/bodypart/head = 1, - /obj/item/twohanded/bonespear = 1) + /obj/item/twohanded/spear/bonespear = 1) result = /obj/structure/headpike/bone category = CAT_PRIMAL diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index e9b45dd10a8..3c165096796 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -627,13 +627,10 @@ //GREY TIDE /obj/item/twohanded/spear/grey_tide - icon_state = "spearglass0" name = "\improper Grey Tide" desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces." force_unwielded = 15 force_wielded = 25 - throwforce = 20 - throw_speed = 4 attack_verb = list("gored") /obj/item/twohanded/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity) @@ -785,26 +782,17 @@ /* * Bone Spear */ -/obj/item/twohanded/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/obj/item/twohanded/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. icon_state = "bone_spear0" - lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' name = "bone spear" desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." - force = 11 - w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_BACK - force_unwielded = 11 - force_wielded = 20 //I have no idea how to balance + force = 12 + force_unwielded = 12 + force_wielded = 20 throwforce = 22 - throw_speed = 4 - embedding = list("embedded_impact_pain_multiplier" = 3) armour_penetration = 15 //Enhanced armor piercing - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "poked", "jabbed", "torn", "gored") - sharpness = IS_SHARP -/obj/item/twohanded/bonespear/update_icon() +/obj/item/twohanded/spear/bonespear/update_icon() icon_state = "bone_spear[wielded]" /obj/item/twohanded/binoculars diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index 48dd500b52d..99501c9486d 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -19,7 +19,7 @@ name = "[victim.name] on a spear" update_icon() if(bonespear) - spear = locate(/obj/item/twohanded/bonespear) in parts_list + spear = locate(/obj/item/twohanded/spear/bonespear) in parts_list else spear = locate(/obj/item/twohanded/spear) in parts_list @@ -45,4 +45,4 @@ victim = null spear.forceMove(drop_location()) spear = null - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index bd89649ba7a..eb4c418b745 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -53,7 +53,7 @@ name = "goliath cloak" icon_state = "goliath_cloak" desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits." - allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival) armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 8135b1d56d6..ee7c5fbfbeb 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -307,7 +307,7 @@ suit = /obj/item/clothing/suit/armor/bone gloves = /obj/item/clothing/gloves/bracer if(prob(5)) - back = pickweight(list(/obj/item/twohanded/bonespear = 3, /obj/item/twohanded/fireaxe/boneaxe = 2)) + back = pickweight(list(/obj/item/twohanded/spear/bonespear = 3, /obj/item/twohanded/fireaxe/boneaxe = 2)) if(prob(10)) belt = /obj/item/storage/belt/mining/primitive if(prob(30))