mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
[FIX] Better slices (#27807)
* Slices have a base class /food/slice * Refactor * Small fix * Adds default reagent for empy slices * Looks good * adds_list_reagents * "Reverted snake_case_remap files to state from original commit * I don't know how to resolve merge conflicts :) --------- Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
|
||||
/obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user)
|
||||
to_chat(user, "<span class='warning'>[src] turns into a wedge of cheese!</span>")
|
||||
var/obj/item/food/cheesewedge/presliced/book_cheese = new
|
||||
var/obj/item/food/sliced/cheesewedge/presliced/book_cheese = new
|
||||
user.drop_item()
|
||||
user.put_in_hands(book_cheese)
|
||||
qdel(src)
|
||||
@@ -35,7 +35,7 @@
|
||||
overlay = null
|
||||
action_icon_state = "cheese_wedge"
|
||||
action_background_icon_state = "bg_spell"
|
||||
summon_type = list(/obj/item/food/cheesewedge/presliced)
|
||||
summon_type = list(/obj/item/food/sliced/cheesewedge/presliced)
|
||||
summon_amt = 9
|
||||
aoe_range = 1
|
||||
summon_ignore_prev_spawn_points = TRUE
|
||||
|
||||
@@ -830,7 +830,7 @@
|
||||
/obj/item/toy/plushie/ipcplushie/attack_by(obj/item/attacking, mob/user, params)
|
||||
if(..())
|
||||
return FINISH_ATTACK
|
||||
if(istype(attacking, /obj/item/food/breadslice))
|
||||
if(istype(attacking, /obj/item/food/sliced/bread))
|
||||
new /obj/item/food/toast(get_turf(loc))
|
||||
to_chat(user, "<span class='notice'>You insert bread into the toaster.</span>")
|
||||
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
|
||||
|
||||
Reference in New Issue
Block a user