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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-05-13 22:14:38 +02:00
parent bc91f78c93 c639b5d0f6
commit 0f98a95666
233 changed files with 1774 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/colossus_loot.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/machinery/smartfridge/black_box/process()
..()
if(!memory_saved && ticker.current_state == GAME_STATE_FINISHED)
if(!memory_saved && SSticker.current_state == GAME_STATE_FINISHED)
WriteMemory()
/obj/machinery/smartfridge/black_box/proc/WriteMemory()