diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 54ca78aa398..9b26e2387dd 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -119,6 +119,15 @@ else ..() + +/obj/item/weapon/brassknuckles + name = "brass knuckles" + desc = "A pair of brass knuckles. Generally used to enhance the user's punches." + icon_state = "brassknuckles" + force = 13 + w_class = 2.0 + attack_verb = list("punched") + /obj/item/weapon/cane/concealed/update_icon() if(concealed_blade) name = initial(name) diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index f87d7b1bb87..d63e4a5ca38 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -22,7 +22,7 @@ recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/kitchen/utensil/knife/plastic, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]") - + recipes += new/datum/stack_recipe("[display_name] brass knuckles", /obj/item/weapon/brassknuckles, 5, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]") /material/steel/generate_recipes() ..() recipes += new/datum/stack_recipe_list("office chairs",list( \ @@ -107,10 +107,10 @@ recipes += new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20) recipes += new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1) recipes += new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0) - recipes += new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1) + recipes += new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1) recipes += new/datum/stack_recipe("beehive assembly", /obj/item/beehive_assembly, 4) - recipes += new/datum/stack_recipe("beehive frame", /obj/item/honey_frame, 1) - recipes += new/datum/stack_recipe("book shelf", /obj/structure/bookcase, 5, time = 15, one_per_turf = 1, on_floor = 1) + recipes += new/datum/stack_recipe("beehive frame", /obj/item/honey_frame, 1) + recipes += new/datum/stack_recipe("book shelf", /obj/structure/bookcase, 5, time = 15, one_per_turf = 1, on_floor = 1) /material/cardboard/generate_recipes() ..() diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 5c8c1cbcd2d..877054a4519 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ