shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,905 Commits 5 Branches 0 Tags
13ebff97df7f94ffb0f386dccebb68bc3c8b4fbe
Commit Graph

6094 Commits

Author SHA1 Message Date
AnturK
13ebff97df Fixes AI door hotkeys & other weirdness 2017-11-15 02:03:17 -06:00
LetterJay
809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
LetterJay
44d15b07fb Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607 
[MIRROR] Alt clicking additions
 2017-11-14 15:57:06 -06:00
LetterJay
7ce3b246ad Merge pull request #3941 from Citadel-Station-13/upstream-merge-32707 
[MIRROR] More nuanced damage examination
 2017-11-14 15:56:57 -06:00
LetterJay
b4c1ca31d9 Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687 
[MIRROR] Fixes leg day
 2017-11-14 15:56:47 -06:00
LetterJay
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
LetterJay
aea2e8716d Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636 
[MIRROR] Heirophant Relay sprites
 2017-11-14 15:55:55 -06:00
LetterJay
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
LetterJay
7fa3a16a0b Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598 
[MIRROR] Cult Scaling Refactor
 2017-11-14 15:54:08 -06:00
LetterJay
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
LetterJay
d9ce438bbb Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656 
[MIRROR] Directional computer sprites
 2017-11-14 15:51:35 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
AutomaticFrenzy
b9c9b87441 Alt clicking additions (#32607) 
Adds alt clicking to lock/unlock for apc and air alarm
 2017-11-14 13:49:32 -06:00
Robustin
2fc1e5c8e5 More nuanced damage examination (#32707) 
* More nuanced damage examinations

* Tweaking examination values

* Redundancy Removal
 2017-11-14 13:48:20 -06:00
Jordan Brown
9708ed6003 Merge pull request #32687 from AnturK/client_timer_fix 
Fixes leg day
 2017-11-14 13:16:26 -06:00
kevinz000
eba429f5b1 Hand teleporter and portal fixes. (#32689) 2017-11-14 13:11:55 -06:00
LetterJay
e0d291eb19 Update weakrefs.dm 2017-11-14 13:06:53 -06:00
LetterJay
8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
KorPhaeron
594da93554 Heirophant Relay sprites (#32636) 2017-11-14 13:04:34 -06:00
Tad Hardesty
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
Robustin
bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
Jalleo
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
ike709
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 Smith
d486d784ad Update AI Airlock UI to use TGUI 2017-11-14 05:00:58 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
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
deathride58
2f4c556ad8 reeeeEEEEEEEEEEEEEEE 2017-11-13 22:55:18 -05:00
deathride58
1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
LetterJay
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
LetterJay
d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJay
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
LetterJay
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
LetterJay
a4c2084404 Merge pull request #3910 from Citadel-Station-13/upstream-merge-32557 
[MIRROR] Adds Extended Drill Hair
 2017-11-13 11:51:30 -06:00
LetterJay
32bfa75c3a Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558 
[MIRROR] Prevent placing posters on diagonal wall corners
 2017-11-13 11:50:36 -06:00
LetterJay
bc23305ef9 Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613 
[MIRROR]  Fixes cryo overlay system
 2017-11-13 11:50:23 -06:00
LetterJay
f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640 
[MIRROR] Adds a multitool_act and a proper check on tool_check
 2017-11-13 11:46:41 -06:00
LetterJay
083100a4df Merge branch 'master' into upstream-merge-32570 2017-11-13 11:45:39 -06:00
LetterJay
0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642 
[MIRROR] Makes clown box consistent with the rest of the boxes
 2017-11-13 11:45:13 -06:00
LetterJay
f610a6110b Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597 
[MIRROR] Fixes stimulum decay
 2017-11-13 11:45:00 -06:00
LetterJay
228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546 
[MIRROR] Refactor of base machinery a tiny bit more. DONE
 2017-11-13 11:44:46 -06:00
LetterJay
55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566 
[MIRROR] Space vacuum damage doubled
 2017-11-13 11:44:33 -06:00
LetterJay
6e3e6ef6b8 Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585 
[MIRROR] adjusted default internet song volume to 25
 2017-11-13 11:44:25 -06:00