cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2021-06-25 00:35:29 -07:00
committed by Darlantan
parent ad122fdd96
commit 24f67188ab
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/__defines/misc.dm
View File

@@ -462,17 +462,9 @@ GLOBAL_LIST_INIT(all_volume_channels, list(
#ifndef HTTP_POST_DLL_LOCATION
#define HTTP_POST_DLL_LOCATION (world.system_type == MS_WINDOWS ? WINDOWS_HTTP_POST_DLL_LOCATION : UNIX_HTTP_POST_DLL_LOCATION)
<<<<<<< HEAD
#endif
||||||| parent of da19f6f9b3... Merge pull request #10740 from ShadowLarkens/ux_fixes
#endif
#define DOCK_ATTEMPT_TIMEOUT 200 //how long in ticks we wait before assuming the docking controller is broken or blown up.
=======
#endif
#define DOCK_ATTEMPT_TIMEOUT 200 //how long in ticks we wait before assuming the docking controller is broken or blown up.
#define SMES_TGUI_INPUT 1
#define SMES_TGUI_OUTPUT 2
>>>>>>> da19f6f9b3... Merge pull request #10740 from ShadowLarkens/ux_fixes