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

4871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay 9ca0d6588d Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400 
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
 2017-09-07 10:22:17 -05:00
LetterJay 8d854a53d8 Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426 
[MIRROR] Fixes swarmers breaking the SM's containment
 2017-09-07 10:21:57 -05:00
CitadelStationBot 06649108c5 Adds a unique suicide to the hierophant club, plus some attack verbs 2017-09-07 10:01:55 -05:00
Ashe Higgs 938c10ad1c Adds a unique suicide to the hierophant club, plus some attack verbs (#30400) 
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
 2017-09-07 10:01:55 -05:00
CitadelStationBot 73aaf8a90b Automatic changelog generation for PR #2608 [ci skip] 2017-09-07 10:01:37 -05:00
LetterJay 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay 2768aa68f9 Merge pull request #2638 from Citadel-Station-13/upstream-merge-30441 
[MIRROR] Fixes tgstation-server autotagging
 2017-09-07 07:37:40 -05:00
LetterJay eee21d496d oops 2017-09-07 07:23:52 -05:00
LetterJay 2ec925f66b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-07 07:21:56 -05:00
LetterJay b5d80219ac donation item 2017-09-07 07:21:42 -05:00
LetterJay 766fa16b67 Merge pull request #2612 from Citadel-Station-13/upstream-merge-30431 
[MIRROR] Make add_details faster and fix the lag. (maybe)
 2017-09-07 06:48:14 -05:00
CitadelStationBot 3379cb9427 Automatic changelog generation for PR #2632 [ci skip] 2017-09-07 06:26:53 -05:00
LetterJay 1162edad65 Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452 
[MIRROR] Alters the pressure plate crafting recipe
 2017-09-07 06:26:51 -05:00
LetterJay be65159138 fixes donation cloak 2017-09-07 06:11:20 -05:00
Jordan Brown 34315805ba Fixes tgstation-server autotagging 2017-09-07 05:20:03 -05:00
CitadelStationBot 13a1eb5742 Fixes swarmers breaking the SM's containment 2017-09-07 05:17:51 -05:00
ShizCalev 7fb4426011 Fixes swarmers breaking the SM's containment (#30426) 
* Fixes swamers breaking the SM

* Switched checks to use get_area
 2017-09-07 05:17:51 -05:00
CitadelStationBot f7ed0b2165 CERESTATION DOES NOT EXIST, COMRADE. (#2618) 2017-09-06 21:40:17 -07:00
LetterJay 5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 
[MIRROR] Adds more round id tracking
 2017-09-06 21:31:28 -05:00
LetterJay 3c1bce5c21 Update merge-upstream-pull-request.sh 2017-09-06 21:20:29 -05:00
CitadelStationBot 7f07205de3 Alters the pressure plate crafting recipe 2017-09-06 20:35:50 -05:00
Anonmare ee41b3da6f Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00
CitadelStationBot 382b25fb5b Automatic changelog generation for PR #2631 [ci skip] 2017-09-06 20:18:29 -05:00
LetterJay 3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416 
[MIRROR] Adds "shiny" variants of lavaland mobs
 2017-09-06 20:18:27 -05:00
LetterJay fec0c13ff1 Merge pull request #2630 from Citadel-Station-13/upstream-merge-30418 
[MIRROR] Cleans up more paper fluff varedits.
 2017-09-06 20:18:05 -05:00
LetterJay 6078f653cb Merge pull request #2627 from Citadel-Station-13/upstream-merge-30445 
[MIRROR] Remove unused nightvision var
 2017-09-06 20:17:24 -05:00
LetterJay ac84046180 Merge pull request #2626 from Citadel-Station-13/upstream-merge-30438 
[MIRROR] Converts map_config.dm to tabs
 2017-09-06 20:17:10 -05:00
CitadelStationBot 57679f0514 Large bun hair substitution (#2629) 2017-09-06 17:16:25 -07:00
CitadelStationBot 2a6140dcea Adds "shiny" variants of lavaland mobs 2017-09-06 19:15:26 -05:00
Ashe Higgs dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) 
* Shiny lavaland mobs!

* Changes based on feedback
 2017-09-06 19:15:25 -05:00
CitadelStationBot 2b1b00e45d Cleans up more paper fluff varedits. 2017-09-06 18:42:43 -05:00
ShizCalev 849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
LetterJay 3f71fdcb4e Merge pull request #2628 from Citadel-Station-13/mirrorRebase 
another mirror rebase for the PRMirror being down
 2017-09-06 18:00:50 -05:00
LetterJay 2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay 9265694418 Update _compile_options.dm 2017-09-06 17:41:02 -05:00
LetterJay f9ef2bb068 commit 2017-09-06 17:36:32 -05:00
CitadelStationBot 188966c14a Remove unused nightvision var 2017-09-06 17:32:57 -05:00
pubby cb51ffca31 Remove unused nightvision var (#30445) 2017-09-06 17:32:57 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
CitadelStationBot 5f3c0ccc30 Converts map_config.dm to tabs 2017-09-06 17:32:45 -05:00
KorPhaeron b028ef41cd Merge pull request #30438 from Cyberboss/FixSpaces 
Converts map_config.dm to tabs
 2017-09-06 17:32:45 -05:00
LetterJay bbab9d8d5a donation 2017-09-06 14:41:35 -05:00
Poojawa 8a723c664b OOOOGGG 2017-09-06 11:21:29 -05:00
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 4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079 
[MIRROR] Fixes missing inhands
 2017-09-06 10:11:08 -05:00
CitadelStationBot 3104d36330 Automatic changelog generation for PR #2440 [ci skip] 2017-09-06 10:11:00 -05:00
LetterJay d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866 
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
 2017-09-06 10:10:58 -05:00
LetterJay 82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
LetterJay ce1e5c69dc Delete blackbox.dm.rej 2017-09-06 09:27:55 -05:00