diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 756e74a8cff..c8f0a9b66b5 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -193,11 +193,12 @@ #define ui_ghost_spawners_menu "SOUTH:6,CENTER-3:24" #define ui_ghost_orbit "SOUTH:6,CENTER-2:24" #define ui_ghost_reenter_corpse "SOUTH:6,CENTER-1:24" -#define ui_ghost_teleport "SOUTH:6,CENTER:24" -#define ui_ghost_settings "SOUTH: 6, CENTER+1:24" -#define ui_ghost_minigames "SOUTH: 6, CENTER+2:24" -#define ui_ghost_language_menu "SOUTH: 6, CENTER+3:22" -#define ui_ghost_floor_changer "SOUTH: 6, CENTER+3:7" +#define ui_dnr "SOUTH:6,CENTER:24" +#define ui_ghost_teleport "SOUTH:6,CENTER+1:24" +#define ui_ghost_settings "SOUTH: 6, CENTER+2:24" +#define ui_ghost_minigames "SOUTH: 6, CENTER+3:24" +#define ui_ghost_language_menu "SOUTH: 6, CENTER+4:22" +#define ui_ghost_floor_changer "SOUTH: 6, CENTER+4:7" //Blobbernauts #define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19" diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index 0600436348c..9a293ccf4d9 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -29,6 +29,14 @@ var/mob/dead/observer/G = usr G.reenter_corpse() +/atom/movable/screen/ghost/dnr + name = "Do Not Resuscitate" + icon_state = "dnr" + +/atom/movable/screen/ghost/dnr/Click() + var/mob/dead/observer/dnring = usr + dnring.do_not_resuscitate() + /atom/movable/screen/ghost/teleport name = "Teleport" icon_state = "teleport" @@ -72,6 +80,10 @@ using.screen_loc = ui_ghost_reenter_corpse static_inventory += using + using = new /atom/movable/screen/ghost/dnr(null, src) + using.screen_loc = ui_dnr + static_inventory += using + using = new /atom/movable/screen/ghost/teleport(null, src) using.screen_loc = ui_ghost_teleport static_inventory += using diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index cd2655f6338..c05682c513b 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -36,7 +36,8 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) Brain damage: [src.get_organ_loss(ORGAN_SLOT_BRAIN) || "0"]
\ [get_bloodtype()?.get_blood_name() || "Blood"] volume: [src.blood_volume]cl ([round((src.blood_volume / BLOOD_VOLUME_NORMAL) * 100, 0.1)]%)
\ Reagents:
[reagents_readout()]", INVESTIGATE_DEATHS) - to_chat(src, span_warning("You have died. Barring complete bodyloss, you can in most cases be revived by other players. If you do not wish to be brought back, use the \"Do Not Resuscitate\" verb in the ghost tab.")) + to_chat(src, span_warning("You have died. Barring complete bodyloss, you can in most cases be revived by other players. \ + If you do not wish to be brought back, use the \"Do Not Resuscitate\" button at the bottom of your screen.")) /mob/living/carbon/human/proc/reagents_readout() var/readout = "[get_bloodtype()?.get_blood_name() || "Blood"]stream:" diff --git a/icons/hud/screen_ghost.dmi b/icons/hud/screen_ghost.dmi index f7a3d67cfbd..44c04566ed1 100644 Binary files a/icons/hud/screen_ghost.dmi and b/icons/hud/screen_ghost.dmi differ