Skip to content

Commit

Permalink
GET READY FOR A FISTING aka 2handed melee gloves. (#264)
Browse files Browse the repository at this point in the history
  • Loading branch information
@oprimeolt
oprimeolt authored Dec 10, 2024
1 parent 45998cf commit 449337a
Show file tree
Hide file tree
Showing 5 changed files with 327 additions and 13 deletions.
85 changes: 85 additions & 0 deletions code/datums/components/crafting/recipes/recipes_forge.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/*
/datum/crafting_recipe/melee/forged/sap
name = "Sappers"
result = /obj/item/melee/unarmed/sappers
Expand All @@ -359,7 +360,36 @@
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE
*/

/datum/crafting_recipe/melee/forged/dualsapper
name = "Dual Sappers"
result = /obj/item/melee/unarmed/sappers/dual
time = 240
reqs = list(/obj/item/melee/unarmed/sappers = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/duallacerator
name = "Dual Lacerators"
result = /obj/item/melee/unarmed/lacerator/dual
time = 240
reqs = list(/obj/item/melee/unarmed/lacerator = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualtigerclaw
name = "Dual Tiger Claws"
result = /obj/item/melee/unarmed/tigerclaw/dual
time = 240
reqs = list(/obj/item/melee/unarmed/tigerclaw = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/*
/datum/crafting_recipe/melee/forged/maceglove
name = "Mace Glove"
result = /obj/item/melee/unarmed/maceglove
Expand All @@ -368,6 +398,61 @@
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE
*/

/datum/crafting_recipe/melee/forged/dualmaceglove
name = "Dual Mace Gloves"
result = /obj/item/melee/unarmed/maceglove/dual
time = 240
reqs = list(/obj/item/melee/unarmed/maceglove = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualpowerfist
name = "Dual Powerfists"
result = /obj/item/melee/powerfist/f13/dual
time = 240
reqs = list(/obj/item/melee/powerfist/f13 = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualgoliath
name = "Dual Goliaths"
result = /obj/item/melee/powerfist/f13/dual/goliath
time = 240
reqs = list(/obj/item/melee/powerfist/f13/goliath = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualballisticfist
name = "Dual ballistic fists"
result = /obj/item/gun/ballistic/revolver/ballisticfist/dual
time = 240
reqs = list(/obj/item/gun/ballistic/revolver/ballisticfist = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualclawgauntlet
name = "Dual Deathclaw Gauntlets"
result = /obj/item/melee/unarmed/deathclawgauntlet/dual
time = 240
reqs = list(/obj/item/melee/unarmed/deathclawgauntlet = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE

/datum/crafting_recipe/melee/forged/dualyaoguuai
name = "Dual Yao Guai Gauntlets"
result = /obj/item/melee/unarmed/yaoguaigauntlet/dual
time = 240
reqs = list(/obj/item/melee/unarmed/yaoguaigauntlet = 2)
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE


///////////
Expand Down
180 changes: 168 additions & 12 deletions code/game/objects/items/melee/f13onehanded.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,14 +771,42 @@ obj/item/melee/onehanded/knife/switchblade
force = 27

/obj/item/melee/unarmed/sappers/attack(mob/living/M, mob/living/user)
. = ..()
if(!istype(M))
return
M.apply_damage(7, STAMINA, "chest", M.run_armor_check("chest", "melee"))

// Dual Sappers Keywords: Damage 27, fast attack, +3 stam damage
/obj/item/melee/unarmed/sappers/dual
name = "sappers"
desc = "Lead filled gloves which are ideal for beating the crap out of opponents. Deals significant stamina damage. I mean, I wouldn't want to get punched in the chest with it..."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "sapper_dual"
item_state = "sapper_dual"
w_class = WEIGHT_CLASS_BULKY
force = 27
attack_speed = CLICK_CD_MELEE * 0.6

/obj/item/melee/unarmed/sappers/dual/attack(mob/living/M, mob/living/user)
. = ..()
if(!istype(M))
return
M.apply_damage(10, STAMINA, "chest", M.run_armor_check("chest", "melee"))

// Tiger claws Keywords: Damage 33, Pointy
/obj/item/melee/unarmed/sappers/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/sappers/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

// Tiger claws Keywords: Damage 33, Pointyű
/obj/item/melee/unarmed/tigerclaw
name = "tiger claws"
name = "Tiger Claws"
desc = "Gloves with short claws built into the palms."
icon_state = "tiger_claw"
item_state = "tiger_claw"
Expand All @@ -788,10 +816,35 @@ obj/item/melee/onehanded/knife/switchblade
force = 33
hitsound = 'sound/weapons/bladeslice.ogg'

// Dual Tiger claws Keywords: Damage 33, Pointy, Fast
/obj/item/melee/unarmed/tigerclaw/dual
name = "Dual Tiger Claws"
desc = "Gloves with short claws built into the palms."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "tiger_claw_dual"
item_state = "tiger_claw_dual"
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = SHARP_POINTY
force = 35
hitsound = 'sound/weapons/bladeslice.ogg'
attack_speed = CLICK_CD_MELEE * 0.6

/obj/item/melee/unarmed/tigerclaw/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/tigerclaw/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

// Lacerator Keywords: Damage 29, Edged, Wound bonus
/obj/item/melee/unarmed/lacerator
name = "lacerator"
desc = "Leather gloves with razor blades built into the back of the hand."
name = "Lacerator"
desc = "Leather glove with razor blades built into the back of the hand."
icon_state = "lacerator"
item_state = "lacerator"
w_class = WEIGHT_CLASS_NORMAL
Expand All @@ -802,15 +855,65 @@ obj/item/melee/onehanded/knife/switchblade
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'

// Mace Glove Keywords: Damage 20
// Dual Lacerator Keywords: Damage 29, Edged, Wound bonus, Fast
/obj/item/melee/unarmed/lacerator/dual
name = "Dual Lacerators"
desc = "Leather gloves with razor blades built into the back of the hand."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "lacerator_dual"
item_state = "lacerator_dual"
w_class = WEIGHT_CLASS_BULKY
force = 29
armour_penetration = 0 //my brother in christ it is razor blades on tape
bare_wound_bonus = 5
sharpness = SHARP_EDGED
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
attack_speed = CLICK_CD_MELEE * 0.6

/obj/item/melee/unarmed/lacerator/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/lacerator/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

// Mace Glove Keywords: amage 10
/obj/item/melee/unarmed/maceglove
name = "mace glove"
desc = "Weighted metal gloves that are covered in spikes. Don't expect to grab things with this."
name = "Mace Glove"
desc = "Weighted metal glove that is covered in spikes. Don't expect to grab things with this."
icon_state = "mace_glove"
item_state = "mace_glove"
w_class = WEIGHT_CLASS_BULKY
force = 10
force = 9
sharpness = SHARP_NONE

// Dual Mace Glove Keywords: Damage 15, Fast
/obj/item/melee/unarmed/maceglove/dual
name = "Dual Mace Gloves"
desc = "Weighted metal gloves that are covered in spikes. Don't expect to grab things with this."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "mace_glove_dual"
item_state = "mace_glove_dual"
w_class = WEIGHT_CLASS_BULKY
force = 12
sharpness = SHARP_NONE
attack_speed = CLICK_CD_MELEE * 0.6

/obj/item/melee/unarmed/maceglove/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/maceglove/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

// Punch Dagger Keywords: Damage 24, Pointy
/obj/item/melee/unarmed/punchdagger
Expand All @@ -831,9 +934,9 @@ obj/item/melee/unarmed/punchdagger/cyborg
item_state = "tiger_claw"
force = 40 //Assaultron, so, makes sense.

// Deathclaw Gauntlet Keywords: Damage 35, AP 1
// Deathclaw Gauntlet Keywords: Damage 35, AP 0.15
/obj/item/melee/unarmed/deathclawgauntlet
name = "deathclaw gauntlet"
name = "Deathclaw Gauntlet"
desc = "The severed hand of a mighty Deathclaw, cured, hollowed out, and given a harness to turn it into the deadliest gauntlet the wastes have ever seen."
icon_state = "deathclaw_g"
item_state = "deathclaw_g"
Expand All @@ -845,9 +948,36 @@ obj/item/melee/unarmed/punchdagger/cyborg
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'

//Yao Guai Gauntlet Keywords: Damage 25, Fast, "Saw Bleed" Effect
// Dual Deathclaw Gauntlet Keywords: Damage 35, AP 0.2, Fast
/obj/item/melee/unarmed/deathclawgauntlet/dual
name = "Dual Deathclaw Gauntlets"
desc = "The severeds hand of a mighty Deathclaw, cured, hollowed out, and given a harness to turn it into the deadliest gauntlet the wastes have ever seen."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "deathclaw_g_dual"
item_state = "deathclaw_g_dual"
slot_flags = ITEM_SLOT_GLOVES
w_class = WEIGHT_CLASS_BULKY
force = 35
armour_penetration = 0.2
sharpness = SHARP_EDGED
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
attack_speed = CLICK_CD_MELEE * 0.6

/obj/item/melee/unarmed/deathclawgauntlet/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/deathclawgauntlet/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

//Yao Guai Gauntlet Keywords: Damage 23, Fast, "Saw Bleed" Effect
/obj/item/melee/unarmed/yaoguaigauntlet
name = "yao guai gauntlet"
name = "Yao Guai Gauntlet"
desc = "The severed hand of a yao guai, the hide cured, the muscles and bone removed, and given a harness to turn it into a deadly gauntlet. A weapon worthy of the Sulfurs."
icon_state = "yao_guai_g"
item_state = "deathclaw_g"
Expand All @@ -865,6 +995,32 @@ obj/item/melee/unarmed/punchdagger/cyborg
return
target.apply_status_effect(/datum/status_effect/stacking/saw_bleed/yaoguaigauntlet)

//Dual Yao Guai Gauntlet Keywords: Damage 23, Really Fast, "Saw Bleed" Effect
/obj/item/melee/unarmed/yaoguaigauntlet/dual
name = "Dual Yao Guai Gauntlets"
desc = "The severed hands of a yao guai, the hide cured, the muscles and bone removed, and given a harness to turn it into a deadly gauntlet. A weapon worthy of the Sulfurs."
icon = 'icons/fallout/objects/melee/melee.dmi'
lefthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
righthand_file = 'icons/fallout/onmob/clothes/hand.dmi'
icon_state = "yao_guai_g_dual"
item_state = "deathclaw_g_dual"
slot_flags = ITEM_SLOT_GLOVES
w_class = WEIGHT_CLASS_BULKY
force = 23
sharpness = SHARP_EDGED
attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
attack_speed = CLICK_CD_MELEE * 0.45 //6

/obj/item/melee/unarmed/yaoguaigauntlet/dual/equipped(mob/user, slot)
. = ..()
if(ishuman(user) && user.mind && slot == SLOT_HANDS)
ADD_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)

/obj/item/melee/unarmed/yaoguaigauntlet/dual/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_CLUMSY, CLOTHING_TRAIT)


///////////
// TOOLS //
Expand Down
Loading

0 comments on commit 449337a

Please sign in to comment.