shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,891 Commits 5 Branches 0 Tags
b4c1ca31d954c183848eb1e02724ade5e15d5c64
Commit Graph
8891 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub b4c1ca31d9 Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687 
[MIRROR] Fixes leg day
 2017-11-14 15:56:47 -06:00
LetterJayandGitHub 62c7cfc4e7 Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689 
[MIRROR] Fixes a bunch of hand tele/portal issues.
 2017-11-14 15:56:08 -06:00
LetterJayandGitHub aea2e8716d Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636 
[MIRROR] Heirophant Relay sprites
 2017-11-14 15:55:55 -06:00
LetterJayandGitHub 528255833f Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684 
[MIRROR] Fix the station integrity report to read the correct Z
 2017-11-14 15:54:44 -06:00
LetterJayandGitHub 7fa3a16a0b Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598 
[MIRROR] Cult Scaling Refactor
 2017-11-14 15:54:08 -06:00
LetterJayandGitHub 19abbdfd5f Merge pull request #3931 from Citadel-Station-13/upstream-merge-32685 
[MIRROR] Little things 2 Revenge of atmos components
 2017-11-14 15:52:32 -06:00
LetterJayandGitHub d9ce438bbb Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656 
[MIRROR] Directional computer sprites
 2017-11-14 15:51:35 -06:00
LetterJayandGitHub 829d981fa5 Merge pull request #3928 from Citadel-Station-13/upstream-merge-32594 
[MIRROR] Update AI Airlock UI to use TGUI
 2017-11-14 15:51:18 -06:00
LetterJayandGitHub bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481 
[MIRROR] [READY]integrated circuitry port+upgrade.
 2017-11-14 15:51:03 -06:00
LetterJayandGitHub e46c584eb2 Merge pull request #3926 from Citadel-Station-13/upstream-merge-32734 
[MIRROR] Changelog for integrated circuits
 2017-11-14 15:50:22 -06:00
LetterJayandGitHub 9c7da6a133 Merge pull request #3905 from Citadel-Station-13/upstream-merge-32570 
[MIRROR] Checks for nulls in weakrefs
 2017-11-14 14:58:07 -06:00
LetterJayandGitHub c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371 
[MIRROR] SSoverlay improvements and tweaks
 2017-11-14 14:56:34 -06:00
LetterJay 1dbf2173ab recompiles gui 2017-11-14 13:35:01 -06:00
CitadelStationBot 01ad847e38 Fixes leg day 2017-11-14 13:16:26 -06:00
Jordan BrownandCitadelStationBot 9708ed6003 Merge pull request #32687 from AnturK/client_timer_fix 
Fixes leg day
 2017-11-14 13:16:26 -06:00
CitadelStationBot cfa3282178 Fixes a bunch of hand tele/portal issues. 2017-11-14 13:11:56 -06:00
kevinz000andCitadelStationBot eba429f5b1 Hand teleporter and portal fixes. (#32689) 2017-11-14 13:11:55 -06:00
LetterJayandGitHub 851c862ddf Update game_options.txt 2017-11-14 13:08:07 -06:00
LetterJayandGitHub e0d291eb19 Update weakrefs.dm 2017-11-14 13:06:53 -06:00
LetterJayandGitHub 8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
CitadelStationBot 950657a422 Heirophant Relay sprites 2017-11-14 13:04:34 -06:00
KorPhaeronandCitadelStationBot 594da93554 Heirophant Relay sprites (#32636) 2017-11-14 13:04:34 -06:00
CitadelStationBot 6350977df4 Fix the station integrity report to read the correct Z 2017-11-14 12:45:47 -06:00
Tad HardestyandCitadelStationBot aa8581d430 Fix the station integrity report to read the correct Z 
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
 2017-11-14 12:45:47 -06:00
CitadelStationBot 9a48b098d8 Cult Scaling Refactor 2017-11-14 07:44:28 -06:00
RobustinandCitadelStationBot bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
CitadelStationBot f2f816c489 Little things 2 Revenge of atmos components 2017-11-14 05:01:25 -06:00
JalleoandCitadelStationBot 23983c48bf Old debug objects which one has been replaced and another nobody needs at the moment. Also removal of comments that I forgot to removal at _machinery.dm (#32685) 2017-11-14 05:01:25 -06:00
CitadelStationBot bd12125f8c Directional computer sprites 2017-11-14 05:01:09 -06:00
ike709andCitadelStationBot a23935c037 Directional computer sprites (#32656) 
Technically I did fix it. It just wasn't a good fix. That's a good description of most of my coding.
 2017-11-14 05:01:09 -06:00
Matt SmithandCitadelStationBot d486d784ad Update AI Airlock UI to use TGUI 2017-11-14 05:00:58 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
orangesandCitadelStationBot 48ee5f8cac Changelog for integrated circuits 2017-11-14 05:00:39 -06:00
LetterJayandGitHub 4afc4f5b39 Merge pull request #3922 from deathride58/earlygoonchatfixmirror 
Early mirror of https://github.com/tgstation/tgstation/pull/32705
 2017-11-13 23:23:03 -06:00
LetterJayandGitHub e641ef4e67 Merge pull request #3921 from deathride58/flavortextsanitationfix 
Fixes flavortext sanitation so it doesn't break quotes and newlines
 2017-11-13 23:22:49 -06:00
deathride58 2f4c556ad8 reeeeEEEEEEEEEEEEEEE 2017-11-13 22:55:18 -05:00
deathride58 1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
CitadelStationBot 7fc04dbe5f Automatic changelog generation for PR #3920 [ci skip] 2017-11-13 13:14:28 -06:00
LetterJayandGitHub ab42a6242f Merge pull request #3920 from Citadel-Station-13/LetterJay-patch-2 
Fixes flavor text on examine
 2017-11-13 13:14:25 -06:00
LetterJayandGitHub d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
CitadelStationBot 3ba974c9fe Automatic changelog generation for PR #3919 [ci skip] 2017-11-13 11:53:24 -06:00
LetterJayandGitHub 36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623 
[MIRROR] Adds ambience for Reebe.
 2017-11-13 11:53:21 -06:00
LetterJayandGitHub 648477ebe1 Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637 
[MIRROR] Adds a timer to falsewall code
 2017-11-13 11:53:08 -06:00
CitadelStationBot e0ec263ef8 Automatic changelog generation for PR #3916 [ci skip] 2017-11-13 11:53:00 -06:00
LetterJayandGitHub 301497dfb0 Merge pull request #3916 from Citadel-Station-13/upstream-merge-32667 
[MIRROR] Fixes the broken cable cuffs sprite
 2017-11-13 11:52:58 -06:00
LetterJayandGitHub 5591672deb Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618 
[MIRROR] Fixes readapt removing hivemind communication.
 2017-11-13 11:52:48 -06:00
LetterJayandGitHub 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
CitadelStationBot 97c4372a86 Automatic changelog generation for PR #3913 [ci skip] 2017-11-13 11:52:03 -06:00
LetterJayandGitHub 07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553 
[MIRROR] Xrays go through walls but stop on mobs/blob
 2017-11-13 11:51:59 -06:00
LetterJayandGitHub f0a852ef1e Merge pull request #3911 from Citadel-Station-13/upstream-merge-32658 
[MIRROR] Fixes latejoin chaplains not getting their weapon on spawn
 2017-11-13 11:51:38 -06:00