mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
Attack chain migration: structures. (#30365)
* Attack chain migration: structures. * whoops * wth
This commit is contained in:
committed by
GitHub
parent
cd7b4e7292
commit
3208049a8a
@@ -39,11 +39,11 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/attackby__legacy__attackchain(obj/item/W, mob/user)
|
||||
/obj/structure/closet/crate/secure/loot/item_interaction(mob/living/user, obj/item/W, list/modifiers)
|
||||
if(locked)
|
||||
if(istype(W, /obj/item/card/emag))
|
||||
boom(user)
|
||||
return 1
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
if(istype(W, /obj/item/multitool))
|
||||
to_chat(user, "<span class='notice'>DECA-CODE LOCK REPORT:</span>")
|
||||
if(attempts == 1)
|
||||
@@ -67,7 +67,8 @@
|
||||
++cows
|
||||
|
||||
to_chat(user, "<span class='notice'>Last code attempt had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>")
|
||||
return 1
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/emag_act(mob/user)
|
||||
|
||||
@@ -125,7 +125,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
|
||||
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/marker_beacon/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
/obj/structure/marker_beacon/item_interaction(mob/living/user, obj/item/I, list/modifiers)
|
||||
if(istype(I, /obj/item/stack/marker_beacon))
|
||||
var/obj/item/stack/marker_beacon/M = I
|
||||
to_chat(user, "<span class='notice'>You start picking [src] up...</span>")
|
||||
@@ -133,7 +133,8 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
|
||||
M.add(1)
|
||||
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
return ..()
|
||||
|
||||
/obj/structure/marker_beacon/AltClick(mob/living/user)
|
||||
@@ -154,11 +155,9 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
|
||||
base_icon_state = "dockingmarker"
|
||||
flags = NODECONSTRUCT
|
||||
|
||||
/obj/structure/marker_beacon/dock_marker/update_icon_state()
|
||||
set_light(light_range, light_power, LIGHT_COLOR_BLUE)
|
||||
|
||||
/obj/structure/marker_beacon/dock_marker/attackby__legacy__attackchain()
|
||||
return
|
||||
/obj/structure/marker_beacon/dock_marker/Initialize(mapload, set_color)
|
||||
. = ..()
|
||||
RegisterSignal(src, COMSIG_ATTACK_BY, TYPE_PROC_REF(/datum, signal_cancel_attack_by))
|
||||
|
||||
/obj/structure/marker_beacon/dock_marker/attack_hand()
|
||||
return
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
icon_state = "grave_basalt_open"
|
||||
anchored = TRUE
|
||||
layer = BELOW_OBJ_LAYER
|
||||
new_attack_chain = TRUE
|
||||
/// What does the grave contain?
|
||||
var/atom/buried
|
||||
/// What does the headstone say?
|
||||
|
||||
@@ -60,13 +60,15 @@
|
||||
desc = initial(desc)
|
||||
harvested = FALSE
|
||||
|
||||
/obj/structure/flora/ash/attackby__legacy__attackchain(obj/item/W, mob/user, params)
|
||||
/obj/structure/flora/ash/item_interaction(mob/living/user, obj/item/W, list/modifiers)
|
||||
if(!harvested && needs_sharp_harvest && W.sharp)
|
||||
user.visible_message("<span class='notice'>[user] starts to harvest from [src] with [W].</span>","<span class='notice'>You begin to harvest from [src] with [W].</span>")
|
||||
if(do_after(user, harvest_time, target = src))
|
||||
harvest(user)
|
||||
else
|
||||
return ..()
|
||||
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/structure/flora/ash/attack_hand(mob/user)
|
||||
if(!harvested && !needs_sharp_harvest)
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
density = TRUE
|
||||
pressure_resistance = 5 * ONE_ATMOSPHERE
|
||||
|
||||
/obj/structure/ore_box/attackby__legacy__attackchain(obj/item/W, mob/user, params)
|
||||
/obj/structure/ore_box/item_interaction(mob/living/user, obj/item/W, list/modifiers)
|
||||
if(istype(W, /obj/item/stack/ore))
|
||||
if(!user.drop_item())
|
||||
return
|
||||
W.forceMove(src)
|
||||
if(user.drop_item())
|
||||
W.forceMove(src)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
else if(isstorage(W))
|
||||
var/obj/item/storage/S = W
|
||||
S.hide_from(user)
|
||||
@@ -21,6 +21,7 @@
|
||||
for(var/obj/item/stack/ore/O in S.contents)
|
||||
S.remove_from_storage(O, src) //This will move the item to this item's contents
|
||||
to_chat(user, "<span class='notice'>You empty the satchel into the box.</span>")
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
else
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user