From 3f03b72ea20ad2dfe4f60dd853535b62a4fd8540 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 16 Apr 2020 13:12:35 -0400 Subject: [PATCH] Adjust icon --- code/__defines/admin_vr.dm | 1 + code/modules/admin/verbs/smite_vr.dm | 14 +++++++++++--- icons/obj/discs_vr.dmi | Bin 4350 -> 4365 bytes 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/__defines/admin_vr.dm b/code/__defines/admin_vr.dm index bd3cdd9fd8..62c4add906 100644 --- a/code/__defines/admin_vr.dm +++ b/code/__defines/admin_vr.dm @@ -2,3 +2,4 @@ #define SMITE_SHADEKIN_NOMF "Shadekin (Devour)" #define SMITE_REDSPACE_ABDUCT "Redspace Abduction" #define SMITE_AUTOSAVE "10 Second Autosave" +#define SMITE_AUTOSAVE_WIDE "10 Second Autosave (AoE)" diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm index 71fc821b1d..fb52f18b50 100644 --- a/code/modules/admin/verbs/smite_vr.dm +++ b/code/modules/admin/verbs/smite_vr.dm @@ -8,7 +8,7 @@ if(!istype(target)) return - var/list/smite_types = list(SMITE_SHADEKIN_ATTACK,SMITE_SHADEKIN_NOMF,SMITE_REDSPACE_ABDUCT,SMITE_AUTOSAVE) + var/list/smite_types = list(SMITE_SHADEKIN_ATTACK,SMITE_SHADEKIN_NOMF,SMITE_REDSPACE_ABDUCT,SMITE_AUTOSAVE,SMITE_AUTOSAVE_WIDE) var/smite_choice = input("Select the type of SMITE for [target]","SMITE Type Choice") as null|anything in smite_types if(!smite_choice) @@ -125,6 +125,9 @@ if(SMITE_AUTOSAVE) fake_autosave(target, src) + if(SMITE_AUTOSAVE_WIDE) + fake_autosave(target, src, TRUE) + else return //Injection? Don't print any messages. @@ -215,9 +218,14 @@ var/redspace_abduction_z target.transforming = FALSE -/proc/fake_autosave(mob/living/target, user) +/proc/fake_autosave(var/mob/living/target, var/client/user, var/wide) if(!istype(target) || !target.client) - to_chat(user, "Not a living mob or no client, so no point!") + to_chat(user, "Skipping [target] because they are not a /mob/living or have no client.") + return + + if(wide) + for(var/mob/living/L in orange(user.view, user.mob)) + fake_autosave(L, user) return target.move_delay = 99999999 diff --git a/icons/obj/discs_vr.dmi b/icons/obj/discs_vr.dmi index f2d511fc496de74ad075b97c5daeb1d0b3e06ce6..90c5a7e0c9e8145c340ac943385996a93dfc92e4 100644 GIT binary patch delta 4071 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μ{G`n^DEVIh98{pa0<{EHeI8qX>D9Ve7% z`6Bh@!VqwI-f_wko$;j{F{u03*~QDWwtO^YpcYZPYreZk@R8m}>BWYq}IdH#!=+YEi}DOp}XW-(E9F>xi4 zrnyVbH37!}`Ulb+OM2KE=c}Y8mW?Pw*zVIg7M*mvK$Rh)=}697-k+m%MG0TRfT}R& nha!@v%pD@{E8Y9>WGjRB)K#EO_W0eG0JE8!SQ^(Dy2bn-)q5^b delta 4074 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