shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,778 Commits 5 Branches 0 Tags
134201d185d4f18fa66fffca1c8a786fe99dfd7e
Commit Graph

593 Commits

Author SHA1 Message Date
LetterJay
06c309fb0c Merge branch 'master' into upstream-merge-33562 2017-12-21 11:30:58 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
678762209a Update ticker.dm 2017-12-19 15:33:31 -06:00
deathride58
d39b0204fa Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307 
[MIRROR] Adds config inclusion system
 2017-12-19 19:49:32 +00:00
deathride58
65412db421 Update game_options.dm 2017-12-19 14:34:06 -05:00
LetterJay
781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 
[MIRROR] Fix shuttle autocalls when the round is already over
 2017-12-17 21:24:12 -06:00
LetterJay
26543ea97f Update configuration.dm 2017-12-17 17:50:43 -06:00
LetterJay
9cbe879b51 Update comms.dm 2017-12-17 17:47:12 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
Jordan Brown
9adb77c5e3 Merge pull request #33530 from AutomaticFrenzy/patch/autocall 
Fix shuttle autocalls when the round is already over
 2017-12-15 14:53:30 -06:00
Jordie
4727d8f73c Fixes LoadEntries return value 2017-12-15 10:01:46 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
oranges
05db439c1e SSinput tweaks to address server side lag 2017-12-14 23:11:52 -06:00
deathride58
fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480 
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
 2017-12-15 04:21:34 +00:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
Jordan Brown
d45b668a39 Adds config inclusion system 2017-12-14 17:24:13 -06:00
deathride58
da65aaab28 Merge pull request #4364 from Citadel-Station-13/upstream-merge-33456 
[MIRROR] Adds a parent level subsystem initialized var
 2017-12-14 03:53:02 +00:00
Emmett Gaines
d517c797ab adds a parent level subsystem initialized var (#33456) 2017-12-13 21:11:51 -06:00
JStheguy
9313fd65cf Adds Additional Electronic_Assembly Designs (#33466) 
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
 2017-12-13 21:10:41 -06:00
Kyle Spier-Swenson
55247e9bdf Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. 2017-12-13 21:04:00 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
deathride58
2a481e69df Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400 
[MIRROR] Fix catch all blackbox vv guard
 2017-12-10 22:36:09 +00:00
deathride58
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58
215a8f47ed Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423 
[MIRROR] Undelaying roundend will now reboot the server normally.
 2017-12-10 21:43:26 +00:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
oranges
4dbac00348 Merge pull request #33279 from Robustin/Reported 
Standardizes false report weighting
 2017-12-10 14:15:50 -06:00
Jordan Brown
309a936c5f Fix catch all blackbox vv guard (#33400) 2017-12-10 13:03:40 -06:00
AnturK
030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
deathride58
80ae897f5e Merge pull request #4285 from Citadel-Station-13/upstream-merge-33373 
[MIRROR] Add a proc to check if a weather type is affecting an area
 2017-12-10 03:09:50 +00:00
oranges
98a0602b1a Add a proc to check if a weather type is affecting an area (#33373) 2017-12-09 01:36:40 -06:00
kevinz000
75eab09dff Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets." 2017-12-08 19:16:49 -08:00
Kyle Spier-Swenson
811517ecb2 [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. (#33098) 
* Timer queuing tweaks: binary sorted inserts and rolling buckets.

Client time timers now uses a binary search algorithm for its sorted inserts.

Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.

Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)

* Fixes some queue management bugs.

* Fixes a Order of Operations goof up in the ticks<->ds macros.

@ninjanomnom your pain is my success

* Remove debug line

* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID

* Fixes initialization-time timers fucking everything up
 2017-12-08 15:02:18 -06:00
deathride58
53ab4feb2f Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324 
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 18:47:56 +00:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
oranges
c5a61bbca5 Merge pull request #33350 from Cyberboss/FixConfig 
panic_address -> panic_server_address
 2017-12-08 10:33:46 -06:00
oranges
193879529c Merge pull request #33308 from tgstation/Cyberboss-patch-3 
Fixes every config flag updating world.sleep_offline
 2017-12-06 16:26:49 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Leo
57b45e8dc3 Merge pull request #33278 from tgstation/Cyberboss-patch-9-1 
Allows read-only VV of feedback
 2017-12-05 14:33:42 -06:00
deathride58
24d205f9c9 Merge pull request #4223 from Citadel-Station-13/upstream-merge-33243 
[MIRROR] Adds a CRASH on invalid calls to record_feedback
 2017-12-05 20:22:38 +00:00
Leo
0f76084794 Merge pull request #33243 from tgstation/Cyberboss-patch-5 
Adds a CRASH on invalid calls to record_feedback
 2017-12-05 03:23:46 -06:00
Jordan Brown
5c1ccad969 Adds server tools version to feedback (#33244) 
* Adds server tools version to feedback

* Fix incorrect call to record_feedback

* Add number to record feedback calls
 2017-12-05 03:23:15 -06:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
deathride58
1a32bdc053 Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013 
[MIRROR] Datumizes saymodes
 2017-12-04 21:19:53 +00:00
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
jammer312
b1e15a0da2 Crash to timers and INFINITY check to beams. (#33219) 
* beams

* timers

* >= instead of !=

* whooops
 2017-12-03 12:45:27 -06:00
Leo
00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook 
Fixes non-advanced diseases vaccines.
 2017-11-27 08:25:55 -06:00