shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,845 Commits 5 Branches 0 Tags
969a8ac9efcc7e9c8df698cfca27fc43c30fda02
Commit Graph

11845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 969a8ac9ef Automatic changelog generation for PR #4828 [ci skip] 2018-01-14 20:09:47 -06:00
deathride58 0933e33db2 Merge pull request #4828 from Citadel-Station-13/upstream-merge-34246 
[MIRROR] Added tooltips to roundend traitor purchase logs
 2018-01-15 02:09:44 +00:00
deathride58 071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -06:00
deathride58 f9b7d872e6 Merge pull request #4827 from Citadel-Station-13/upstream-merge-34392 
[MIRROR] fixes chest being behind the tentacle
 2018-01-14 22:05:26 +00:00
CitadelStationBot 2235a05977 fixes chest being behind the tentacle 2018-01-14 15:42:06 -06:00
Tlaltecuhtli ac14a5b4e8 sfds (#34392) 2018-01-14 15:42:06 -06:00
CitadelStationBot 8ebe0760ff Automatic changelog generation for PR #4821 [ci skip] 2018-01-14 15:12:03 -06:00
deathride58 c3ce0d8f28 Merge pull request #4821 from Citadel-Station-13/wagfix2018 
Fixes *wag for mammals
 2018-01-14 21:12:01 +00:00
CitadelStationBot 2935a9f713 Automatic changelog generation for PR #4825 [ci skip] 2018-01-14 14:42:42 -06:00
deathride58 6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123 
[MIRROR] Moves GLOB.movement_keys into SSinput and adds movement direction badminry
 2018-01-14 20:42:40 +00:00
CitadelStationBot 45e4374a0d Automatic changelog generation for PR #4823 [ci skip] 2018-01-14 14:42:15 -06:00
deathride58 96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility 
Fixes message visibility for vorish play
 2018-01-14 20:42:13 +00:00
CitadelStationBot 1d80b18d6f Automatic changelog generation for PR #4822 [ci skip] 2018-01-14 14:41:44 -06:00
deathride58 2c6ef0a90a Merge pull request #4822 from Citadel-Station-13/ak47s4er1 
Re-adds AK-47s button
 2018-01-14 20:41:42 +00:00
CitadelStationBot 0d3362f174 Moves GLOB.movement_keys into SSinput and adds movement direction badminry 2018-01-14 13:39:01 -06:00
Emmett Gaines e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123) 
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
 2018-01-14 13:39:01 -06:00
deathride58 f2539f2b34 Merge pull request #4824 from Citadel-Station-13/upstream-merge-34434 
[MIRROR] Enforces utf-8 encoding on all changelog files.
 2018-01-14 19:21:37 +00:00
CitadelStationBot afe0e9b53f Enforces utf-8 encoding on all changelog files. 2018-01-14 12:39:49 -06:00
AnturK 597111234e Enforces utf-8 encoding on all changelog files. (#34434) 
* Enforces utf-8 encoding on all changelog files.

* Lets python3 use pip

* py2.7 begone
 2018-01-14 12:39:49 -06:00
Poojawa e385ab090e Fixes message visibility for vorish play 
It's the little things I have to prune.
 2018-01-14 12:01:24 -06:00
Poojawa 7498bae414 Re-adds AK-47s button 
ستالين هو أعظم

You're welcome.
 2018-01-14 04:18:17 -06:00
Poojawa 655067471a Fixes *wag for mammals 
Someone forgot that we have snowflake bodyparts.
 2018-01-14 03:50:26 -06:00
LetterJay 703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276 
[MIRROR] Update TGS API to 3.2.0.2
 2018-01-14 03:12:31 -06:00
deathride58 33954016b8 Merge pull request #4820 from Citadel-Station-13/upstream-merge-34407 
[MIRROR] Make traitor panel clearer when toggling completion state
 2018-01-14 06:49:38 +00:00
CitadelStationBot 30264e5e19 Make traitor panel clearer when toggling completion state 2018-01-13 23:21:46 -06:00
Jordan Brown f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent 
Make traitor panel clearer when toggling completion state
 2018-01-13 23:21:46 -06:00
CitadelStationBot b8a93b6ca1 Automatic changelog generation for PR #4818 [ci skip] 2018-01-13 22:24:57 -06:00
deathride58 1c2bcd7f3f Merge pull request #4818 from deathride58/preffix 
Fixes character slot changing erroring out due to attempt_vr runtimes
 2018-01-14 04:24:54 +00:00
deathride58 9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05:00
CitadelStationBot cc29b029c8 Automatic changelog generation for PR #4817 [ci skip] 2018-01-13 22:01:35 -06:00
deathride58 87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338 
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
 2018-01-14 04:01:33 +00:00
deathride58 ef29d783e9 Merge pull request #4816 from Citadel-Station-13/upstream-merge-34328 
[MIRROR] Updates TIMER_UNIQUE documentation
 2018-01-14 04:01:15 +00:00
CitadelStationBot 942eb9f59e Automatic changelog generation for PR #4815 [ci skip] 2018-01-13 22:00:56 -06:00
deathride58 8717e2f04e Merge pull request #4815 from Citadel-Station-13/upstream-merge-34359 
[MIRROR] Makes the NT Lepton Violet over lava windows lava proof
 2018-01-14 04:00:54 +00:00
deathride58 1cbc4596d3 Merge pull request #4814 from Citadel-Station-13/upstream-merge-34376 
[MIRROR] Fixes mecha pilot speed.
 2018-01-14 04:00:39 +00:00
deathride58 3b0cb3a6c2 Merge pull request #4813 from Citadel-Station-13/upstream-merge-34365 
[MIRROR] Fixes cables/lattices for lateloaded templates.
 2018-01-14 04:00:24 +00:00
CitadelStationBot 94c3069e6f Replaces cached get_area vars to grab area names with get_area_name() 2018-01-13 20:56:11 -06:00
ShizCalev 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
CitadelStationBot 551b86356e Updates TIMER_UNIQUE documentation 2018-01-13 17:23:47 -06:00
Jordan Brown effea9f679 Updates TIMER_UNIQUE documentation (#34328) 2018-01-13 17:23:47 -06:00
CitadelStationBot 99d1fa4784 Makes the NT Lepton Violet over lava windows lava proof 2018-01-13 14:52:21 -06:00
Dax Dupont 077ec06f78 Rebases and redoes it with the fix with mapmerge2 2018-01-13 14:52:21 -06:00
CitadelStationBot 9b2d395d28 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
AnturK 50529187d6 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
CitadelStationBot 0722f96e8b Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
AnturK 269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
CitadelStationBot 3a2ac4d102 Automatic changelog generation for PR #4812 [ci skip] 2018-01-13 14:29:28 -06:00
deathride58 bfd2f6cd24 Merge pull request #4812 from Citadel-Station-13/upstream-merge-34362 
[MIRROR] Code fix for stat_entry on NO_FIRE subsystems
 2018-01-13 20:29:26 +00:00
deathride58 257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360 
[MIRROR] Fixes clownborg sprays not recharging
 2018-01-13 20:29:01 +00:00