Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Pizza Cutters #6697

Merged
merged 24 commits into from
Aug 21, 2024
Merged

New Pizza Cutters #6697

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
61050c3
Two new pizza cutter variants.
Mensla Dec 10, 2023
4ea44ae
Merge branch 'newpizzacutter' of https://github.com/Mensla/cmss13 int…
Mensla Dec 10, 2023
8249ebe
Two new pizza cutters.
Mensla Dec 10, 2023
68c0572
Two new pizza cutter variants.
Mensla Dec 10, 2023
ab29996
Created subtypes for pizza cutters
Mensla Dec 11, 2023
198aa64
Merge branch 'master' into newpizzacutter
Mensla Dec 11, 2023
bdb4416
Replaced holy relic pizza cutter with regular one
Mensla Dec 12, 2023
5e9e223
Merge branch 'master' into newpizzacutter
Jul 15, 2024
59ceac9
Merge branch 'master' into newpizzacutter
Mensla Jul 15, 2024
4df1a71
Merge branch 'master' into newpizzacutter
Mensla Jul 15, 2024
7aca07d
Merge branch 'cmss13-devs:master' into newpizzacutter
Mensla Jul 16, 2024
e750045
Merge remote-tracking branch 'upstream/master' into newpizzacutter
Jul 21, 2024
373a45e
Update 30.pizzatime.dmm
Mensla Jul 21, 2024
876f981
Updates path to new pizza cutter
Jul 21, 2024
e5f4355
Merge branch 'cmss13-devs:master' into newpizzacutter
Mensla Jul 23, 2024
6736ff7
Merge branch 'cmss13-devs:master' into newpizzacutter
Mensla Aug 5, 2024
53a3e17
Merge remote-tracking branch 'upstream/master' into newpizzacutter
Aug 6, 2024
ca04248
Fixed missing sprites
Aug 6, 2024
7226bfc
Update code/game/objects/items/tools/kitchen_tools.dm
Mensla Aug 6, 2024
555ca4d
Cleaned up code
Aug 6, 2024
bfd06d1
Merge remote-tracking branch 'upstream/master' into newpizzacutter
Aug 10, 2024
e819e14
Fixed sprite issues
Aug 15, 2024
f8be5ab
Moved holyrelic pizza cutter to kitchen tools
Aug 15, 2024
bbbf378
Renamed icon state
Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions code/game/objects/items/tools/kitchen_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,44 @@

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 = 1
Mensla marked this conversation as resolved.
Show resolved Hide resolved
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."
sharp = IS_SHARP_ITEM_ACCURATE
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
force = MELEE_FORCE_VERY_STRONG
edge = 1
Mensla marked this conversation as resolved.
Show resolved Hide resolved

/*
* Bucher's cleaver
*/
Expand Down
11 changes: 0 additions & 11 deletions code/game/objects/items/weapons/blades.dm
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/kitchen_tools.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/weapons.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/map_files/FOP_v3_Sciannex/sprinkles/30.pizzatime.dmm
View file
Open in desktop
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
View file
Open in desktop
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
Loading