cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shitload of bugfixes.

Browse Source
This commit is contained in:
SkyMarshal
2012-06-18 21:18:26 -07:00
parent 4f12065fbe
commit 57fcff3067
9 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/death.dm
+1 -1
View File
@@ -48,7 +48,7 @@
/mob/proc/death(gibbed)
timeofdeath = world.time
var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
log_file << "Death | \The [get_area(src)] | [bruteloss], [oxyloss], [toxloss], [fireloss][attack_log && attack_log.len? " | attack_log[attack_log.len]" : ""]"
log_file << "Death | \The [get_area(src)] | [bruteloss], [oxyloss], [toxloss], [fireloss][attack_log && attack_log.len? " | [attack_log[attack_log.len]]" : ""]"
if(client)
client.onDeath()
code/modules/mob/new_player/preferences.dm
+1 -2
View File
@@ -448,8 +448,7 @@ datum/preferences
// Modify this if you added more jobs and it looks like a mess. Add the jobs in the splitJobs that you want to trigger and intitate a new table.
if(splitJobs == null)
if (ticker.current_state >= GAME_STATE_PLAYING
)
if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
splitJobs = list()
else
splitJobs = list("Chief Engineer")