-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3959 from MistakeNot4892/feature/hatchets
Moving hatchets and machetes onto /tool subtypes.
- Loading branch information
Showing
36 changed files
with
132 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/obj/item/tool/axe | ||
name = "hand axe" | ||
desc = "A handheld tool for chopping things, wood, food, or people." | ||
icon_state = "preview" | ||
icon = 'icons/obj/items/tool/axes/handaxe.dmi' | ||
sharp = TRUE | ||
edge = TRUE | ||
force = 10 | ||
handle_material = /decl/material/solid/organic/wood | ||
material_force_multiplier = 0.3 | ||
thrown_material_force_multiplier = 0.25 // 15 with weight 60 (steel) | ||
max_force = 15 | ||
item_flags = ITEM_FLAG_IS_WEAPON | ||
origin_tech = @'{"materials":2,"combat":1}' | ||
attack_verb = list("chopped", "torn", "cut") | ||
hitsound = "chop" | ||
|
||
/obj/item/tool/axe/get_initial_tool_qualities() | ||
var/static/list/tool_qualities = list( | ||
TOOL_HATCHET = TOOL_QUALITY_DEFAULT | ||
) | ||
return tool_qualities | ||
|
||
// Legacy SS13 hatchet. | ||
/obj/item/tool/axe/hatchet | ||
name = "hatchet" | ||
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." | ||
icon = 'icons/obj/items/tool/axes/hatchet.dmi' | ||
material_force_multiplier = 0.2 // 12 with hardness 60 (steel) | ||
w_class = ITEM_SIZE_SMALL | ||
material_alteration = MAT_FLAG_ALTERATION_NAME | ||
handle_material = /decl/material/solid/organic/plastic | ||
|
||
/obj/item/tool/axe/hatchet/get_handle_color() | ||
return null | ||
|
||
/obj/item/tool/axe/hatchet/unbreakable | ||
max_health = ITEM_HEALTH_NO_DAMAGE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/obj/item/tool/machete | ||
name = "machete" | ||
desc = "A long, sturdy blade with a rugged handle. Leading the way to cursed treasures since before space travel." | ||
icon = 'icons/obj/items/weapon/machetes/machete.dmi' | ||
w_class = ITEM_SIZE_NORMAL | ||
slot_flags = SLOT_LOWER_BODY | ||
material = /decl/material/solid/metal/titanium | ||
base_parry_chance = 50 | ||
max_force = 20 | ||
material_force_multiplier = 0.2 //20 with hardness 80 (titanium) or 15 with hardness 60 (steel) | ||
origin_tech = @'{"materials":2,"combat":1}' | ||
attack_verb = list("chopped", "torn", "cut") | ||
var/static/list/standard_machete_icons = list( | ||
'icons/obj/items/weapon/machetes/machete.dmi', | ||
'icons/obj/items/weapon/machetes/machete_red.dmi', | ||
'icons/obj/items/weapon/machetes/machete_blue.dmi', | ||
'icons/obj/items/weapon/machetes/machete_black.dmi', | ||
'icons/obj/items/weapon/machetes/machete_olive.dmi' | ||
) | ||
|
||
/obj/item/tool/machete/Initialize() | ||
icon = pick(standard_machete_icons) | ||
. = ..() | ||
|
||
/obj/item/tool/machete/get_handle_color() | ||
return null | ||
|
||
/obj/item/tool/machete/get_initial_tool_qualities() | ||
var/static/list/tool_qualities = list( | ||
TOOL_HATCHET = TOOL_QUALITY_MEDIOCRE, | ||
TOOL_HAMMER = TOOL_QUALITY_BAD | ||
) | ||
return tool_qualities | ||
|
||
/obj/item/tool/machete/unbreakable | ||
max_health = ITEM_HEALTH_NO_DAMAGE | ||
|
||
/obj/item/tool/machete/steel | ||
name = "fabricated machete" | ||
desc = "A long, machine-stamped blade with a somewhat ungainly handle. Found in military surplus stores, malls, and horror movies since before interstellar travel." | ||
base_parry_chance = 40 | ||
material = /decl/material/solid/metal/steel | ||
matter = list(/decl/material/solid/organic/plastic = MATTER_AMOUNT_REINFORCEMENT) | ||
|
||
/obj/item/tool/machete/deluxe | ||
name = "deluxe machete" | ||
desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." | ||
icon = 'icons/obj/items/weapon/machetes/machete_dx.dmi' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.