mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Pizza Overhaul 2022 (#18278)
* wip * goodbye two pizzas * commit to pizza time * pizzaaaaaaaa * getting there * hopefully final * pizza * do you like me now CL? * Update code/modules/food_and_drinks/recipes/recipes_oven.dm Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * fixing suggestions * Update paradise.dme * back on track * removing tablecrafting recipies, switch back to oven recipeis * remove unused raw pizza sprites * re-add KalevTait's suggestion * fix merge conflict * merge conflict fix i guess??? * i swear if this is still conflicted * fixing trailing newlines * moves parent calls Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
desc = "It seems inactive."
|
||||
icon_state = "pizzabox_bomb"
|
||||
timer_set = 1
|
||||
timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10
|
||||
timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) SECONDS
|
||||
if(!in_range(src, usr) || issilicon(usr) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || usr.restrained())
|
||||
timer_set = 0
|
||||
name = "pizza box"
|
||||
@@ -40,7 +40,7 @@
|
||||
if(!primed)
|
||||
name = "pizza bomb"
|
||||
desc = "OH GOD THAT'S NOT A PIZZA"
|
||||
icon_state = "pizzabox_bomb"
|
||||
icon_state = "pizzabox_bomb_active"
|
||||
audible_message("<span class='warning'>[bicon(src)] *beep* *beep*</span>")
|
||||
to_chat(user, "<span class='danger'>That's no pizza! That's a bomb!</span>")
|
||||
message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [key_name_admin(armer)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>(JMP)</a>.")
|
||||
|
||||
Reference in New Issue
Block a user