diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e50024d2..29c71e76 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -69,6 +69,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("apc frame", /obj/item/apc_frame, 2), \ new/datum/stack_recipe("air alarm frame", /obj/item/alarm_frame, 2), \ new/datum/stack_recipe("fire alarm frame", /obj/item/firealarm_frame, 2), \ + new/datum/stack_recipe("metal bat", /obj/item/weapon/metal_bat, 5), \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \ ) @@ -102,6 +103,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ */ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \ + new/datum/stack_recipe("plasteel bat", /obj/item/weapon/pla_bat, 5), \ new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \ new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/rust_fuel_assembly_port_frame, 12, time = 50, one_per_turf = 1), \ new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/rust_fuel_compressor_frame, 12, time = 50, one_per_turf = 1), \ @@ -134,6 +136,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \ new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("wooden bat", /obj/item/weapon/wood_bat, 5), \ // new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0) ) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 7fb8077d..90b53fa5 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -179,4 +179,43 @@ force = 20 throwforce = 10 w_class = 4 //there ain't no way in fuck you're shuving this inside your rucksack. No way. - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") \ No newline at end of file + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/weapon/metal_bat + desc = "The quality is a swing and a miss." + name = "Metal Bat" + icon_state = "metalbat" + item_state = "bat_l" + force = 15.0 + throwforce = 5.0 + throw_speed = 5 + throw_range = 10 + w_class = 3.0 + flags = FPRINT | TABLEPASS + attack_verb = list("struck out", "beat", "bludgeoned", "homerunned") + +/obj/item/weapon/pla_bat + desc = "The quality is a swing and a miss." + name = "Plasteel Bat" + icon_state = "plabat" + item_state = "bat_l" + force = 20.0 + throwforce = 5.0 + throw_speed = 5 + throw_range = 10 + w_class = 3.0 + flags = FPRINT | TABLEPASS + attack_verb = list("struck out", "beat", "bludgeoned", "homerunned") + +/obj/item/weapon/wood_bat + desc = "The quality is a swing and a miss." + name = "Wooden Bat" + icon_state = "woodbat" + item_state = "bat_l" + force = 10.0 + throwforce = 5.0 + throw_speed = 5 + throw_range = 10 + w_class = 3.0 + flags = FPRINT | TABLEPASS + attack_verb = list("struck out", "beat", "bludgeoned", "homerunned") \ No newline at end of file diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 882de67f..dc1ddc75 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index a720fe27..ca8c78e1 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 83c36ae7..47dc4319 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ