From 5f100df030076ae1d66b31a00e631602738685f4 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 13 Jun 2021 01:51:40 -0300 Subject: [PATCH 1/2] ghost changes --- code/modules/mob/dead/observer/observer.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 752094a3..b8142624 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -300,17 +300,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp succumb() if(stat == DEAD) ghostize(1) - else - //Low RP, removing. - /* + else if(!(ishuman(src))) var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you won't be able to re-enter this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return //didn't want to ghost after-all ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 suicide_log(TRUE) - */ + else to_chat(usr, "You cannot ghost, if you wish to remove yourself from the round, please locate a cryogenic freezer.") - message_admins("[usr] attempted to ghost.") + message_admins("[src] attempted to ghost.") /mob/camera/verb/ghost() set category = "OOC" From 4d1b608e9c374fbd1f96a49f73e7a71b29333902 Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 13 Jun 2021 01:55:13 -0300 Subject: [PATCH 2/2] silicon --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index b8142624..2c20a22f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -300,7 +300,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp succumb() if(stat == DEAD) ghostize(1) - else if(!(ishuman(src))) + else if(!(ishuman(src)) && !(issilicon(src))) var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you won't be able to re-enter this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return //didn't want to ghost after-all