cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime when lightning smiting non-humans (#43537)

Browse Source
This commit is contained in:
Tad Hardesty
2019-04-08 12:54:32 -07:00
committed by moo
parent b992620011
commit bbef4190f8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/verbs/randomverbs.dm
View File

@@ -1242,7 +1242,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Hub Visibility", "[GLOB.hub_visibility ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Hub Visibility", "[GLOB.hub_visibility ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/smite(mob/living/carbon/human/target as mob) /client/proc/smite(mob/living/target as mob)
set name = "Smite" set name = "Smite"
set category = "Fun" set category = "Fun"
if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
@@ -1260,7 +1260,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
var/turf/T = get_step(get_step(target, NORTH), NORTH) var/turf/T = get_step(get_step(target, NORTH), NORTH)
T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5) T.Beam(target, icon_state="lightning[rand(1,12)]", time = 5)
target.adjustFireLoss(75) target.adjustFireLoss(75)
target.electrocution_animation(40) if(ishuman(target))
var/mob/living/carbon/human/H = target
H.electrocution_animation(40)
to_chat(target, "<span class='userdanger'>The gods have punished you for your sins!</span>") to_chat(target, "<span class='userdanger'>The gods have punished you for your sins!</span>")
if(ADMIN_PUNISHMENT_BRAINDAMAGE) if(ADMIN_PUNISHMENT_BRAINDAMAGE)
target.adjustBrainLoss(199, 199) target.adjustBrainLoss(199, 199)