Skip to content

Commit

Permalink
oops
Browse files Browse the repository at this point in the history
  • Loading branch information
thgvr committed Mar 11, 2024
1 parent 9abfb73 commit f409384
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
6 changes: 3 additions & 3 deletions code/__DEFINES/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#define TOOL_SAW "saw"
#define TOOL_KNIFE "knife"
#define TOOL_ROLLINGPIN "rollingpin"
#define TOOL_BIKEHORN "bike horn"
// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
// tool sound is only played when op is started. If not, it's played twice.

/// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
/// tool sound is only played when op is started. If not, it's played twice.
#define MIN_TOOL_SOUND_DELAY 20

/// When a tooltype_act proc is successful
Expand Down
21 changes: 18 additions & 3 deletions code/game/objects/items/kitchen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,21 @@
custom_price = 20
tool_behaviour = TOOL_ROLLINGPIN

/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS
/* Trays moved to /obj/item/storage/bag */

/obj/item/kitchen/spoon/plastic
name = "plastic spoon"
desc = "Just be careful your food doesn't melt the spoon first."
icon_state = "plastic_spoon"
force = 0
w_class = WEIGHT_CLASS_TINY
throwforce = 0
custom_materials = list(/datum/material/plastic=120)
custom_price = 50
var/break_chance = 25

/obj/item/kitchen/knife/plastic/afterattack(mob/living/carbon/user)
.=..()
if(prob(break_chance))
user.visible_message(span_danger("[user]'s spoon snaps into tiny pieces in their hand."))
qdel(src)
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/food/snacks_spaghetti.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/item/reagent_containers/food/snacks/spaghetti
name = "spaghetti"
desc = "Now that's a nic'e pasta!"
icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon = 'icons/obj/food/spaghetti.dmi'
icon_state = "spaghetti"
list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
cooked_type = /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti
Expand Down
5 changes: 0 additions & 5 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1222,13 +1222,8 @@
#include "code\game\objects\items\devices\radio\headset.dm"
#include "code\game\objects\items\devices\radio\intercom.dm"
#include "code\game\objects\items\devices\radio\radio.dm"
#include "code\game\objects\items\food\_food.dm"
#include "code\game\objects\items\food\bread.dm"
#include "code\game\objects\items\food\burgers.dm"
#include "code\game\objects\items\food\cake.dm"
#include "code\game\objects\items\food\pizza.dm"
#include "code\game\objects\items\food\spaghetti.dm"
#include "code\game\objects\items\grenades\_grenade.dm"
#include "code\game\objects\items\grenades\antigravity.dm"
#include "code\game\objects\items\grenades\chem_grenade.dm"
#include "code\game\objects\items\grenades\clusterbuster.dm"
Expand Down

0 comments on commit f409384

Please sign in to comment.