shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,070 Commits 5 Branches 0 Tags
cfe5c7a96256ae00a0704b670d2f11cc84159c19
Commit Graph

17070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
 2018-05-25 23:28:01 -05:00
CitadelStationBot
f8a2693de5 Automatic changelog generation for PR #6894 [ci skip] 2018-05-25 23:03:29 -05:00
LetterJay
3d57f4e360 Merge pull request #6894 from Citadel-Station-13/upstream-merge-38026 
[MIRROR] Fix frost spiders injecting a nonexistent reagent
 2018-05-25 23:03:27 -05:00
CitadelStationBot
008a65ee04 Automatic changelog generation for PR #6893 [ci skip] 2018-05-25 23:03:04 -05:00
LetterJay
dd777f8ef2 Merge pull request #6893 from Citadel-Station-13/upstream-merge-38068 
[MIRROR] Fixes navbeacon access reqs
 2018-05-25 23:03:02 -05:00
LetterJay
60b1774131 Merge pull request #6892 from Citadel-Station-13/upstream-merge-38027 
[MIRROR] [s] Fix Jacob's Ladder allowing access to VR
 2018-05-25 22:52:46 -05:00
LetterJay
45dcee8f29 Merge pull request #6891 from Citadel-Station-13/upstream-merge-38047 
[MIRROR] Sync permanent admin removals to the players table immediately
 2018-05-25 22:52:27 -05:00
CitadelStationBot
2888c8f9eb Automatic changelog generation for PR #6890 [ci skip] 2018-05-25 22:51:53 -05:00
LetterJay
1a87aa1b33 Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052 
[MIRROR] Fixes accidental empty ahelp replies
 2018-05-25 22:51:51 -05:00
CitadelStationBot
2e1a50a4ed Automatic changelog generation for PR #6889 [ci skip] 2018-05-25 22:50:42 -05:00
LetterJay
d4d8c89fea Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019 
[MIRROR] Fixes drones being able to magically sense invisible revenants
 2018-05-25 22:50:40 -05:00
CitadelStationBot
09bc3a047b Automatic changelog generation for PR #6888 [ci skip] 2018-05-25 22:50:27 -05:00
LetterJay
25bd4a2d55 Merge pull request #6888 from Citadel-Station-13/upstream-merge-38017 
[MIRROR] Disallow effects from being scanned by the chameleon projector
 2018-05-25 22:50:25 -05:00
CitadelStationBot
0d856ec3ce Automatic changelog generation for PR #6887 [ci skip] 2018-05-25 22:50:13 -05:00
LetterJay
79584bd08a Merge pull request #6887 from Citadel-Station-13/upstream-merge-37971 
[MIRROR] Fix template preview being invisible on space turfs
 2018-05-25 22:50:11 -05:00
CitadelStationBot
f985fa633c Automatic changelog generation for PR #6886 [ci skip] 2018-05-25 21:41:25 -05:00
LetterJay
9740bb86f6 Merge pull request #6886 from Citadel-Station-13/upstream-merge-37946 
[MIRROR] Small QoL improvement on smartfridge item release
 2018-05-25 21:41:23 -05:00
LetterJay
0c422d7267 Merge pull request #6908 from Citadel-Station-13/nullentry 
Removes VR SLEEPER entry from Biotech Node
 2018-05-25 20:51:46 -05:00
LetterJay
8c77b2d700 vr sleeper removal 2018-05-25 17:35:06 -05:00
letterjay
247a3c0381 Fix various bugs with telekinesis 2018-05-25 10:49:21 -05:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
letterjay
9f7f3f562f Fix frost spiders injecting a nonexistent reagent 2018-05-25 10:48:09 -05:00
Jordan Brown
b89dcd7e23 Merge pull request #38026 from AutomaticFrenzy/patch/frostoil 
Fix frost spiders injecting a nonexistent reagent
 2018-05-25 10:48:09 -05:00
letterjay
9a6bf47c3a Fixes navbeacon access reqs 2018-05-25 10:48:00 -05:00
81Denton
52665b744a req_one_access (#38068) 2018-05-25 10:48:00 -05:00
letterjay
2764ed2ce4 [s] Fix Jacob's Ladder allowing access to VR 2018-05-25 10:46:47 -05:00
Jordan Brown
4d1bc5ed3b Merge pull request #38027 from AutomaticFrenzy/patch/jacobs-ladder-vr 
[s] Fix Jacob's Ladder allowing access to VR
 2018-05-25 10:46:47 -05:00
letterjay
acaf37e9d9 Sync permanent admin removals to the players table immediately 2018-05-25 10:37:22 -05:00
Jordan Brown
ccb8a98a85 Merge pull request #38047 from tgstation/MrStonedOne-patch-1 
Sync permanent admin removals to the players table immediately
 2018-05-25 10:37:22 -05:00
letterjay
b6a03872df Fixes accidental empty ahelp replies 2018-05-25 09:36:23 -05:00
Dax Dupont
6ecadf6d93 Fixes accidental empty ahelp replies (#38052) 2018-05-25 09:36:23 -05:00
letterjay
517503f24e Fixes drones being able to magically sense invisible revenants 2018-05-25 08:08:58 -05:00
vuonojenmustaturska
10327267bb Fixes drones being able to magically sense invisible revenants (#38019) 
* revfix

* Update revenant.dm
 2018-05-25 08:08:57 -05:00
letterjay
1d2f5f6a8f Disallow effects from being scanned by the chameleon projector 2018-05-25 07:38:02 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
letterjay
f221490f7e Fix template preview being invisible on space turfs 2018-05-25 07:35:31 -05:00
Tad Hardesty
f41df8a925 Fix template preview being invisible on space turfs (#37971) 2018-05-25 07:35:31 -05:00
letterjay
d74a9fedb3 Small QoL improvement on smartfridge item release 2018-05-25 04:51:15 -05:00
yorii
01de74c83c Small QoL improvement on smartfridge item release (#37946) 
* item goes to hand

* this will compile

* Ugly hack give me a medal if this compiles.

* This one is real ugly now, speedmerge please
 2018-05-25 04:51:15 -05:00
CitadelStationBot
cc088d9113 Automatic changelog generation for PR #6866 [ci skip] 2018-05-25 02:37:41 -05:00
LetterJay
2d52fed76d Merge pull request #6866 from Citadel-Station-13/upstream-merge-37994 
[MIRROR] Adds a sprite for the "quit vr" action button[cast ur mf votes inside]
 2018-05-25 02:37:39 -05:00
CitadelStationBot
34bf101429 Automatic changelog generation for PR #6865 [ci skip] 2018-05-25 02:37:20 -05:00
LetterJay
273e2aa13d Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000 
[MIRROR] Removes a couple thousand empty lists
 2018-05-25 02:37:18 -05:00
LetterJay
567118067f Merge pull request #6864 from Citadel-Station-13/upstream-merge-37999 
[MIRROR] Fixes reactive repulse armour not throwing people
 2018-05-25 02:36:49 -05:00
CitadelStationBot
098e0f8a38 Automatic changelog generation for PR #6863 [ci skip] 2018-05-25 02:36:21 -05:00
LetterJay
ac8640c9b5 Merge pull request #6863 from Citadel-Station-13/upstream-merge-38004 
[MIRROR] Fixes mimery blockade showing up under spell tab
 2018-05-25 02:36:19 -05:00
LetterJay
6750abeb9e Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020 
[MIRROR] Fix outdated R&D console comment
 2018-05-25 02:35:58 -05:00
CitadelStationBot
c8f5fbd14f Automatic changelog generation for PR #6857 [ci skip] 2018-05-25 02:35:45 -05:00
LetterJay
2908431bac Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951 
[MIRROR] adds logging to mayhem bottle and blood frenzy
 2018-05-25 02:35:43 -05:00
CitadelStationBot
37f2768380 [MIRROR] Adds a missing + in techwebs point adjustment code (#6845) 
* Adds a missing + in techwebs point adjustment code

* Update _techweb.dm
 2018-05-24 20:55:23 -07:00