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

Drone suicide fix (#16128)

Browse Source
This commit is contained in:
SabreML
2021-06-04 19:23:32 +01:00
committed by GitHub
parent 0efa44aa2d
commit dfa17e9d07
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/drone/drone.dm
+1 -1
View File
@@ -239,7 +239,7 @@
health = 35
stat = CONSCIOUS
return
health = 35 - (getBruteLoss() + getFireLoss())
health = 35 - (getBruteLoss() + getFireLoss() + getOxyLoss())
update_stat("updatehealth([reason])")
/mob/living/silicon/robot/drone/death(gibbed)
code/modules/mob/living/silicon/robot/drone/drone_console.dm
+2 -1
View File
@@ -114,7 +114,8 @@
var/mob/living/silicon/robot/drone/D = locateUID(params["uid"])
if(D)
to_chat(usr, "<span class='warning'>You issue a kill command for the unfortunate drone.</span>")
message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
if(D != usr) // Don't need to bug admins about a suicide
message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
log_game("[key_name(usr)] issued kill order for [key_name(D)] from control console.")
D.shut_down()