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

Merge remote-tracking branch 'upstream/master' into more_ss_ports

Browse Source 
# Conflicts:
#	paradise.dme
This commit is contained in:
tigercat2000
2018-04-30 09:27:11 -07:00
parent 695d7b7c23 008e903993
commit 7fb8f8d76c
102 changed files with 1311 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/telesci/gps.dm
+1 -1
View File
@@ -26,7 +26,7 @@ var/list/GPS_list = list()
emped = 1
overlays -= "working"
overlays += "emp"
addtimer(src, "reboot", 300)
addtimer(CALLBACK(src, .proc/reboot), 300)
/obj/item/gps/proc/reboot()
emped = FALSE