cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9819 from Ghommie/Ghommie-cit358

Browse Source 
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
This commit is contained in:
kevinz000
2019-11-19 21:29:30 -07:00
committed by GitHub
parent 6831e785de d0580e8ecb
commit a2f85cd19d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mob/dead/observer/observer.dm
View File

@@ -306,7 +306,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(stat == DEAD)
ghostize(1)
else
var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty != CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! 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
if(istype(loc, /obj/machinery/cryopod))
@@ -331,7 +331,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(penalty + world.realtime - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
penalty = CANT_REENTER_ROUND
var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty != CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
if(response != "Ghost")
return
ghostize(0, penalize = TRUE)
@@ -629,8 +629,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Possess!"
set desc= "Take over the body of a mindless creature!"
if(reenter_round_timeout > world.realtime)
to_chat(src, "<span class='warning'>You are unable to re-enter the round yet. Your ghost role blacklist will expire in [DisplayTimeText(reenter_round_timeout - world.realtime)].</span>")
if(!can_reenter_round())
return FALSE
var/list/possessible = list()

14
config/game_options.txt
View File

@@ -481,17 +481,17 @@ MIDROUND_ANTAG_TIME_CHECK 60
## A ratio of living to total crew members, the lower this is, the more people will have to die in order for midround antag to be skipped
MIDROUND_ANTAG_LIFE_CHECK 0.7
## A time, in real-time deciseconds, applied upon suicide, cryosleep or ghosting whilst alive
## during which the player shouldn't be able to come back through
## A "timeout", in real-time minutes, applied upon suicide, cryosleep or ghosting whilst alive,
## during which the player shouldn't be able to come back into the round through
## midround playable roles or mob spawners.
## Set to 0 to completely disable it.
SUICIDE_REENTER_ROUND_TIMER 18000
SUICIDE_REENTER_ROUND_TIMER 30
## A time, in real-time deciseconds, below which the player receives
## a timed penalty, for purposes similar to the aforementioned one (can also stack)
## and equal to this config difference with world.time.
## A world time threshold, in minutes, under which the player receives
## an extra timeout, purposely similar to the above one (and also stacks with),
## equal to the difference between the current world.time and this threshold.
## Both configs are indipendent from each other, disabling one won't affect the other.
ROUNDSTART_SUICIDE_TIME_LIMIT 18000
ROUNDSTART_SUICIDE_TIME_LIMIT 30
##Limit Spell Choices##
## Uncomment to disallow wizards from using certain spells that may be too chaotic/fun for your playerbase