cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Move death(), gib(), and dust() from /mob to /mob/living (#1634)

Browse Source 
* Move death(), gib(), and dust() from /mob to /mob/living

* a

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-11-10 22:01:47 +01:00
committed by GitHub
parent a144a5e9e2
commit 2ff5f9b259
37 changed files with 169 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+18 -11
View File
@@ -664,7 +664,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
return
/client/proc/cmd_admin_gib(mob/M in GLOB.mob_list)
/client/proc/cmd_admin_gib(mob/victim in GLOB.mob_list)
set category = "Admin.Fun"
set name = "Gib"
@@ -675,19 +675,23 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(confirm == "Cancel")
return
//Due to the delay here its easy for something to have happened to the mob
if(!M)
if(!victim)
return
log_admin("[key_name(usr)] has gibbed [key_name(M)]")
message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]")
log_admin("[key_name(usr)] has gibbed [key_name(victim)]")
message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(victim)]")
if(isobserver(M))
new /obj/effect/gibspawner/generic(get_turf(M))
if(isobserver(victim))
new /obj/effect/gibspawner/generic(get_turf(victim))
return
if(confirm == "Yes")
M.gib()
else
M.gib(1)
var/mob/living/living_victim = victim
if (istype(living_victim))
if(confirm == "Yes")
living_victim.gib()
else
living_victim.gib(TRUE)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Gib") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_gib_self()
@@ -699,7 +703,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[key_name(usr)] used gibself.")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] used gibself.</span>")
SSblackbox.record_feedback("tally", "admin_verb", 1, "Gib Self") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
mob.gib(1, 1, 1)
var/mob/living/ourself = mob
if (istype(ourself))
ourself.gib(TRUE, TRUE, TRUE)
/client/proc/cmd_admin_check_contents(mob/living/M in GLOB.mob_list)
set category = "Debug"