diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index a4c4925fba2c..a29bf97cacd3 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -135,6 +135,42 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") +/* + * Plastic Pizza Cutter + */ +/obj/item/tool/kitchen/pizzacutter + name = "pizza cutter" + icon_state = "plasticpizzacutter" + desc = "A circular blade used for cutting pizzas. This one has a cheap plastic handle." + flags_atom = FPRINT|CONDUCT + sharp = IS_SHARP_ITEM_ACCURATE + edge = TRUE + force = 10 + w_class = SIZE_MEDIUM + hitsound = 'sound/weapons/bladeslice.ogg' + throwforce = 6 + throw_speed = SPEED_VERY_FAST + throw_range = 6 + matter = list("metal" = 12000) + + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/* + * Wood Pizza Cutter + */ +/obj/item/tool/kitchen/pizzacutter/wood + icon_state = "woodpizzacutter" + desc = "A circular blade used for cutting pizzas. This one has an authentic wooden handle." + +/* + * Holy Relic Pizza Cutter + */ +/obj/item/tool/kitchen/pizzacutter/holyrelic + name = "\improper PIZZA TIME" + icon_state = "holyrelicpizzacutter" + desc = "Before you is a holy relic of a bygone era when the great Pizza Lords reigned supreme. You know either that or it's just a big damn pizza cutter." + force = MELEE_FORCE_VERY_STRONG + /* * Bucher's cleaver */ diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index ce1bb2ded072..b1aca8db29b4 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -138,17 +138,6 @@ throwforce = MELEE_FORCE_STRONG edge = 1 - -/obj/item/weapon/pizza_cutter - name = "\improper PIZZA TIME" - icon = 'icons/obj/items/weapons/weapons.dmi' - icon_state = "pizza_cutter" - item_state = "pizza_cutter" - desc = "Before you is a holy relic of a bygone era when the great Pizza Lords reigned supreme. You know either that or it's just a big damn pizza cutter." - sharp = IS_SHARP_ITEM_ACCURATE - force = MELEE_FORCE_VERY_STRONG - edge = 1 - ///For digging shrapnel out of OTHER people, not yourself. Triggered by human/attackby() so target is definitely human. User might not be. /obj/item/proc/dig_out_shrapnel_check(mob/living/carbon/human/target, mob/living/carbon/human/user) if(user.a_intent == INTENT_HELP && (target == user || skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC))) //Squad medics and above, or yourself diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index d9535b796dda..434765ed34fd 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index a245e89b6c48..5be50a08fd8e 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/obj/items/kitchen_tools.dmi b/icons/obj/items/kitchen_tools.dmi index 625d992f014c..572053258961 100644 Binary files a/icons/obj/items/kitchen_tools.dmi and b/icons/obj/items/kitchen_tools.dmi differ diff --git a/icons/obj/items/weapons/weapons.dmi b/icons/obj/items/weapons/weapons.dmi index aa99545cb577..6c5f4ad34509 100644 Binary files a/icons/obj/items/weapons/weapons.dmi and b/icons/obj/items/weapons/weapons.dmi differ diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm index 8b840ec4ec8c..f9816fe31821 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm @@ -249,7 +249,7 @@ /area/template_noop) "K" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, -/obj/item/weapon/pizza_cutter, +/obj/item/tool/kitchen/pizzacutter, /turf/open/floor/prison/kitchen, /area/template_noop) "L" = ( diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm index c52f388356c8..a3cc4e7a02ec 100644 --- a/maps/templates/lazy_templates/pizza_ert_station.dmm +++ b/maps/templates/lazy_templates/pizza_ert_station.dmm @@ -1391,7 +1391,7 @@ /area/adminlevel/ert_station/pizza_station) "sp" = ( /obj/structure/surface/table/reinforced, -/obj/item/weapon/pizza_cutter, +/obj/item/tool/kitchen/pizzacutter, /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "sx" = ( @@ -2986,7 +2986,7 @@ "MB" = ( /obj/structure/surface/table/reinforced, /obj/item/pizzabox/meat, -/obj/item/weapon/pizza_cutter, +/obj/item/tool/kitchen/pizzacutter, /turf/open/floor/cmo, /area/adminlevel/ert_station/pizza_station) "MK" = (