shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Ghommie-cit222

Browse Source
This commit is contained in:
deathride58
2019-10-12 11:20:32 -04:00
committed by GitHub
parent fce6f13471 f57fa7f471
commit 0c8b82168d
445 changed files with 61756 additions and 57805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/misc.dm
+1 -1
View File
@@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
#define MAP_MAXZ 6
// Defib stats
#define DEFIB_TIME_LIMIT 120
#define DEFIB_TIME_LIMIT 960
#define DEFIB_TIME_LOSS 60
// Diagonal movement