cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refacors Electrocution

Browse Source
This commit is contained in:
Fox McCloud
2019-04-10 18:09:14 -04:00
parent 5414aef35d
commit 90c9f3f479
29 changed files with 149 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+3 -3
View File
@@ -1553,12 +1553,12 @@
else if(href_list["take_question"])
var/index = text2num(href_list["take_question"])
if(href_list["is_mhelp"])
SSmentor_tickets.takeTicket(index)
else //Ahelp
SStickets.takeTicket(index)
else if(href_list["cult_nextobj"])
if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes")
return
@@ -1886,7 +1886,7 @@
var/logmsg = null
switch(punishment)
if("Lightning bolt")
M.electrocute_act(5, "Lightning Bolt", safety=1)
M.electrocute_act(5, "Lightning Bolt", safety = TRUE, override = TRUE)
playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1)
M.adjustFireLoss(75)
M.Weaken(5)