Skip to content

Commit

Permalink
New Pizza Cutters (#6697)
Browse files Browse the repository at this point in the history
# About the pull request

Re-trying this PR as last time I got caught up with IRL stuff and let it
rot.

Adds two new pizza cutter sprites, one with a plastic handle and one
with a wooden handle. Adds item sprites and hand-holding sprites.

No more comically large pizza cutter as they're now appropriately sized
sprites in your hand.

# Explain why it's good for the game

Allows for people to use a normal and non-memey pizza cutter. 

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/102622741/8d8e3232-0f1f-49cc-b897-d94ed0b365cd)

![image](https://github.com/cmss13-devs/cmss13/assets/102622741/590cd27f-b51b-4878-b9a5-6d3427303185)

</details>


# Changelog

:cl:
add: Added new pizza cutter sprites.
/:cl:

<!-- Mensla -->

---------

Co-authored-by: Your Name <[email protected]>
Co-authored-by: Drathek <[email protected]>
  • Loading branch information
3 people authored Aug 21, 2024
1 parent cab914d commit 229c3b6
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 14 deletions.
36 changes: 36 additions & 0 deletions code/game/objects/items/tools/kitchen_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/items/weapons/blades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/mob/humans/onmob/items_lefthand_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/kitchen_tools.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/weapons.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/templates/lazy_templates/pizza_ert_station.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down

0 comments on commit 229c3b6

Please sign in to comment.