cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +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
co-authored by Jared-Fogle Azarak
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/game/objects/items/food/pizza.dm
+1 -1
View File
@@ -188,7 +188,7 @@
user.visible_message("<span class='warning'>\The [src] breaks off [user]'s arm!</span>", "<span class='warning'>\The [src] breaks off your arm!</span>")
playsound(user, "desecration", 50, TRUE, -1)
/obj/item/food/proc/i_kill_you(obj/item/I, mob/user)
/obj/item/food/proc/i_kill_you(obj/item/I, mob/living/user)
if(istype(I, /obj/item/reagent_containers/food/snacks/pineappleslice))
to_chat(user, "<font color='red' size='7'>If you want something crazy like pineapple, I'll kill you.</font>") //this is in bigger text because it's hard to spam something that gibs you, and so that you're perfectly aware of the reason why you died
user.gib() //if you want something crazy like pineapple, i'll kill you
code/game/objects/items/grenades/plastic.dm
+1 -1
View File
@@ -143,7 +143,7 @@
message_say = "FOR THE FEDERATION!"
M.say(message_say, forced="C4 suicide")
/obj/item/grenade/c4/suicide_act(mob/user)
/obj/item/grenade/c4/suicide_act(mob/living/user)
message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_VERBOSEJMP(user)]")
log_game("[key_name(user)] suicided with [src] at [AREACOORD(user)]")
user.visible_message("<span class='suicide'>[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
code/game/objects/items/theft_tools.dm
+3 -4
View File
@@ -177,13 +177,12 @@
..()
if(!isliving(user) || user.status_flags & GODMODE) //try to keep this in sync with supermatter's consume fail conditions
return FALSE
var/mob/ded = user
user.visible_message("<span class='danger'>[ded] reaches out and tries to pick up [src]. [ded.p_their()] body starts to glow and bursts into flames before flashing into dust!</span>",\
user.visible_message("<span class='danger'>[user] reaches out and tries to pick up [src]. [user.p_their()] body starts to glow and bursts into flames before flashing into dust!</span>",\
"<span class='userdanger'>You reach for [src] with your hands. That was dumb.</span>",\
"<span class='hear'>Everything suddenly goes silent.</span>")
radiation_pulse(user, 500, 2)
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
ded.dust()
user.dust()
/obj/item/nuke_core_container/supermatter
name = "supermatter bin"
@@ -270,7 +269,7 @@
update_icon()
return ..()
/obj/item/hemostat/supermatter/proc/Consume(atom/movable/AM, mob/user)
/obj/item/hemostat/supermatter/proc/Consume(atom/movable/AM, mob/living/user)
if(ismob(AM))
if(!isliving(AM))
return