shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,826 Commits 5 Branches 0 Tags
dcd0fa67f0b2084c5b3b4c73473dbb0cd81d9416
Commit Graph

289 Commits

Author SHA1 Message Date
LetterJay
a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
 2017-09-06 10:11:16 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJay
72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJay
b6f6970ebb Update disease.dm 2017-09-06 09:06:59 -05:00
LetterJay
1f872675b0 Update disease.dm 2017-09-06 09:06:30 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
7617164617 Update blackbox.dm 2017-09-02 06:50:35 -05:00
LetterJay
96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJay
b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121 
[MIRROR] Converts npc saves to jsons
 2017-09-02 05:20:31 -05:00
kevinz000
e8bb79d7c9 kk 2017-09-01 07:12:08 -07:00
kevinz000
b193d77c1c hm 2017-09-01 03:36:18 -07:00
CitadelStationBot
c2a792d577 Converts npc saves to jsons 2017-08-30 08:01:36 -05:00
kevinz000
93647d77ad [DNM] Fixes the codebase (#2556) 
* fixes stuff

* goddamnit flags
 2017-08-30 00:08:40 -07:00
kevinz000
0925cb108b wew 2017-08-29 22:09:42 -07:00
kevinz000
5f5065eb46 kek 2017-08-29 09:59:57 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
fce68d3b76 Removes text restriction on add/set_details (#2474) 2017-08-24 18:31:41 -07:00
CitadelStationBot
e8b1e104ee [MIRROR] ssgarbage now runs every 2 seconds. (#2461) 
Lets hope this fixes some lag - [MIRROR] ssgarbage now runs every 2 seconds.
 2017-08-24 18:29:37 -07:00
CitadelStationBot
483d31dee8 reduces communications cooldown (#2483) 2017-08-24 18:27:47 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot
3862fb5d5e Add logging of deathgasp last words and suicide stats to the death table 2017-08-20 19:41:58 -05:00
CitadelStationBot
196c9d0597 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. 2017-08-20 06:01:24 -05:00
CitadelStationBot
5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -05:00
CitadelStationBot
bc121da0af Gives SSdisease SS_NO_INIT 2017-08-19 18:40:18 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
0c957efee1 The station explosion cinematic now uses the old "far explosion" sound 2017-08-17 09:18:58 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot
7faec45053 Tiny bit better splitting on add_details 2017-08-14 09:07:03 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
633952d302 Enables goonchat restart notification 2017-08-06 03:08:42 -05:00
CitadelStationBot
ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot
6cd0855b5a Unifies datum var definitions (#2237) 2017-08-03 06:02:58 -07:00
LetterJay
0392f761d0 Merge pull request #2117 from Citadel-Station-13/upstream-merge-29324 
[MIRROR] DCS Continued
 2017-08-01 23:55:14 -05:00
LetterJay
b3eaf226ac Merge pull request #2217 from Citadel-Station-13/upstream-merge-29598 
[MIRROR] Removes spaces to underline from add_details
 2017-08-01 17:08:14 -05:00
LetterJay
03e508475f Merge pull request #2216 from Citadel-Station-13/upstream-merge-29601 
[MIRROR] Spellchecking
 2017-08-01 17:07:56 -05:00
CitadelStationBot
d6fdd618e8 Removes spaces to underline from add_details 2017-08-01 08:46:27 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot
d176fcf24c Refactors pie throwing and fixes throwing not finalizing in some cases 2017-08-01 07:48:16 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
556699d562 Fixes timer id collision (#2136) 2017-07-26 00:04:47 -07:00
CitadelStationBot
ba0c60a697 Adds logging of shuttle request reasons. 2017-07-25 09:53:46 -05:00