cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7255 from SamHPurp/earlier-karma-reminder

Browse Source 
Adds a Karma Reminder line while shuttle in flight
This commit is contained in:
Fox McCloud
2017-05-18 00:28:31 -04:00
committed by GitHub
parent a8169f2955 b7c87c041b
commit f7aa7f4fce
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gameticker.dm
-13
View File
@@ -406,18 +406,6 @@ var/round_start_time = 0
if(F.name == name)
return F
/datum/controller/gameticker/proc/karmareminder()
for(var/mob/living/player in player_list)
if(player.client)
if(player.client.karma_spent == 0)
if(!player.get_preference(DISABLE_KARMA_REMINDER))
var/dat
dat += {"<html><head><title>Karma Reminder</title></head><body><h1><B>Karma Reminder</B></h1><br>
You have not yet spent your karma for the round, surely there is a player who was worthy of receiving<br>
your reward? Look under 'OOC' for the 'Award Karma' button, and use it once a round for best results!</table></body></html>"}
player << browse(dat, "window=karmareminder;size=400x300")
/datum/controller/gameticker/proc/declare_completion()
nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point.
@@ -472,7 +460,6 @@ var/round_start_time = 0
call(mode, handler)()
scoreboard()
karmareminder()
// Declare the completion of the station goals
mode.declare_station_goal_completion()
code/modules/shuttle/emergency.dm
+4
View File
@@ -262,6 +262,10 @@
mode = SHUTTLE_ESCAPE
timer = world.time
priority_announcement.Announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.")
for(var/mob/M in player_list)
if(!isnewplayer(M) && !M.client.karma_spent && !M.get_preference(DISABLE_KARMA_REMINDER))
to_chat(M, "<i>You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under OOC tab, Award Karma.</i>")
if(SHUTTLE_ESCAPE)
if(time_left <= 0)
//move each escape pod to its corresponding escape dock