From 9dc65f5cf022411bbd66f504cc80b31c90f3ecc4 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue, 14 Jun 2022 09:56:28 -0400 Subject: [PATCH] Meteor shield sats can now shoot meaty ores (#17957) * Meteor shield sats can now shoot meaty ores * Update code/modules/station_goals/shield.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/modules/events/dust.dm | 5 +++++ code/modules/station_goals/shield.dm | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 596e3e31b5a..4dda72abf86 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -39,6 +39,7 @@ var/endy = 0 var/endx = 0 var/startside = pick(GLOB.cardinal) + GLOB.meteor_list += src switch(startside) if(NORTH) @@ -100,3 +101,7 @@ /obj/effect/space_dust/ex_act(severity) qdel(src) + +/obj/effect/space_dust/Destroy() + GLOB.meteor_list -= src + return ..() diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index e13f77f4667..6d6b4493ded 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -162,13 +162,15 @@ /obj/machinery/satellite/meteor_shield/process() if(!active) return - for(var/obj/effect/meteor/M in GLOB.meteor_list) + for(var/obj/effect/M in GLOB.meteor_list) if(M.z != z) continue if(get_dist(M, src) > kill_range) continue if(!emagged && space_los(M)) Beam(get_turf(M), icon_state = "sat_beam", time = 5, maxdistance = kill_range) + if(istype(M, /obj/effect/space_dust/meaty)) + new /obj/item/reagent_containers/food/snacks/meatsteak(get_turf(M)) qdel(M) /obj/machinery/satellite/meteor_shield/toggle(user)