cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 07:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Part 2

Browse Source 
Fixes and now cannot respawn as the same character for roleplay reasons.
This commit is contained in:
QuoteFox
2020-09-25 18:08:32 +01:00
parent 1d5cf4bde1
commit 27b33f04bc
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/new_player/new_player.dm
+7 -1
View File
@@ -123,6 +123,10 @@
LateChoices()
return
if(client.prefs.real_name in client.pastcharacters) //if character has been spawned before
to_chat(usr, "<span class='notice'>You have played that character before this round, please select a new one!</span>")
return
if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums)))
to_chat(usr, "<span class='danger'>[CONFIG_GET(string/hard_popcap_message)]</span>")
@@ -272,7 +276,7 @@
ready = PLAYER_NOT_READY
return FALSE
var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe?","Player Setup","Yes","No")
if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
ready = PLAYER_NOT_READY
@@ -284,6 +288,8 @@
spawning = TRUE
observer.started_as_observer = TRUE
src.client.respawn_observing = 1
src.client.lastrespawn = world.time + 1800 SECONDS //reset respawn.
close_spawn_windows()
var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
to_chat(src, "<span class='notice'>Now teleporting.</span>")
code/modules/mob/mob.dm
+11 -5
View File
@@ -423,15 +423,17 @@
to_chat(usr, "<span class='boldnotice'>You must be dead to use this!</span>")
return
if(usr.client.lastrespawn <= world.time)
usr.client.lastrespawn = world.time + 1800 SECONDS
else
if(usr.client.lastrespawn >= world.time)
to_chat(usr, "<span class='warning'>You must wait [DisplayTimeText(usr.client.lastrespawn - world.time)] before respawning!</span>")
return
log_game("[key_name(usr)] used abandon mob.")
//if they didnt join as a observer, add their name to the past character list so they cannot play them again.
to_chat(usr, "<span class='boldnotice'>Please roleplay correctly, do not meta-game, and use information from a different character or characters, to influence your actions!</span>")
if(!usr.client.respawn_observing)
var/responserespawn = alert(src,"If you respawn now, you cannot rejoin the game as your current character! Are you sure you want to respawn?","Warning","Yes","No")
if(responserespawn != "Yes")
return
usr.client.pastcharacters += usr.real_name
if(!client)
log_game("[key_name(usr)] AM failed due to disconnect.")
@@ -448,6 +450,10 @@
qdel(M)
return
to_chat(usr, "<span class='boldnotice'>Please roleplay correctly, do not meta-game, and use information from a different character or characters, to influence your actions!</span>")
usr.client.lastrespawn = world.time + 1800 SECONDS
usr.client.respawn_observing = 0
message_admins("[client.ckey] respawned.")
M.key = key
// M.Login() //wat