mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 06:27:26 +01:00
Attack chain migration: structures. (#30365)
* Attack chain migration: structures. * whoops * wth
This commit is contained in:
@@ -146,7 +146,8 @@
|
||||
. += "<span class='warning'>there's no room for more honeycomb!</span>"
|
||||
|
||||
|
||||
/obj/structure/beebox/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
/obj/structure/beebox/item_interaction(mob/living/user, obj/item/I, list/modifiers)
|
||||
. = ITEM_INTERACT_COMPLETE
|
||||
if(istype(I, /obj/item/honey_frame))
|
||||
var/obj/item/honey_frame/HF = I
|
||||
if(length(honey_frames) < BEEBOX_MAX_FRAMES)
|
||||
|
||||
@@ -38,22 +38,21 @@
|
||||
qdel(G)
|
||||
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
|
||||
|
||||
/obj/structure/fermenting_barrel/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
/obj/structure/fermenting_barrel/item_interaction(mob/living/user, obj/item/I, list/modifiers)
|
||||
var/obj/item/food/grown/G = I
|
||||
if(istype(G))
|
||||
if(!G.can_distill)
|
||||
to_chat(user, "<span class='warning'>You can't distill this into anything...</span>")
|
||||
return FALSE
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
else if(!user.drop_item())
|
||||
to_chat(user, "<span class='warning'>[G] is stuck to your hand!</span>")
|
||||
return FALSE
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
G.forceMove(src)
|
||||
to_chat(user, "<span class='notice'>You place [G] into [src] to start the fermentation process.</span>")
|
||||
addtimer(CALLBACK(src, PROC_REF(makeWine), G), rand(80, 120) * speed_multiplier)
|
||||
else if(I.is_refillable())
|
||||
return FALSE // To refill via afterattack proc
|
||||
else
|
||||
return ..()
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/structure/fermenting_barrel/attack_hand(mob/user)
|
||||
open = !open
|
||||
|
||||
@@ -129,7 +129,6 @@
|
||||
var/light_strength = 6
|
||||
light_color = "#ED9200"
|
||||
anchored = TRUE
|
||||
new_attack_chain = TRUE
|
||||
|
||||
/obj/structure/lightable/proc/CheckOxygen()
|
||||
var/turf/T = get_turf(src)
|
||||
|
||||
Reference in New Issue
Block a user