shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,567 Commits 5 Branches 0 Tags
bcec131eff951c2da19032bece96b3ea1bfce4db
Commit Graph

35567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EmeraldSundisk
bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
EmeraldSundisk
166ad02d6b Update OmegaStation.dmm 2020-07-19 22:26:35 -07:00
EmeraldSundisk
f9222485bf Update OmegaStation.dmm 2020-07-18 22:56:27 -07:00
EmeraldSundisk
61c0ded9ff Merge pull request #52 from Citadel-Station-13/master 
7/17
 2020-07-17 21:38:46 -07:00
CitadelStationBot
94c6ec9963 Automatic changelog generation for PR #12761 [ci skip] 2020-07-17 19:11:25 -05:00
silicons
f8ad4d3186 Merge pull request #12761 from EmeraldSundisk/deltadive 
A pool and lighting fixes for Delta Station.
 2020-07-17 17:11:22 -07:00
CitadelStationBot
7a518f84d2 Automatic changelog generation for PR #12762 [ci skip] 2020-07-17 19:11:05 -05:00
silicons
b98102a824 Merge pull request #12762 from zeroisthebiggay/a 
drops martial art minpops down to twenty pop
 2020-07-17 17:11:02 -07:00
CitadelStationBot
de39f32904 Automatic changelog generation for PR #12763 [ci skip] 2020-07-17 19:10:43 -05:00
silicons
a8e2b84ad8 Merge pull request #12763 from zeroisthebiggay/b 
hopefully fixes records possibly
 2020-07-17 17:10:40 -07:00
CitadelStationBot
32e6d99bb5 Automatic changelog generation for PR #12733 [ci skip] 2020-07-17 19:10:35 -05:00
silicons
c924290cd1 Merge pull request #12733 from TheObserver-sys/Finally,moreblorble 
Slime Extractification
 2020-07-17 17:10:32 -07:00
CitadelStationBot
88940b30db Automatic changelog generation for PR #12750 [ci skip] 2020-07-17 19:10:18 -05:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
8caf063765 Merge pull request #12757 from Owai-Seek/better-snack-comments 
Updates some comments.
 2020-07-17 17:09:50 -07:00
CitadelStationBot
f2ea90d71b Automatic changelog generation for PR #12758 [ci skip] 2020-07-17 19:09:29 -05:00
silicons
b22848b3f7 Merge pull request #12758 from MrJWhit/pubby-extra-light 
Adds another light to pubby next to the kitchen
 2020-07-17 17:09:25 -07:00
CitadelStationBot
dd4ffa8fee Automatic changelog generation for PR #12759 [ci skip] 2020-07-17 19:09:20 -05:00
silicons
93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox 
set hierophant friendly fire check to on by default
 2020-07-17 17:09:17 -07:00
silicons
f135dde538 Merge pull request #12785 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/lodash-4.17.19 
Bump lodash from 4.17.15 to 4.17.19 in /tgui
 2020-07-17 17:08:36 -07:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
CitadelStationBot
deccc1dfaf Automatic changelog generation for PR #12779 [ci skip] 2020-07-17 19:08:09 -05:00
silicons
3d5c77f62b Merge pull request #12779 from b1tt3r1n0/circlegame 
Circle Game, Updated
 2020-07-17 17:08:06 -07:00
CitadelStationBot
295cfaf093 Automatic changelog generation for PR #12776 [ci skip] 2020-07-17 19:07:50 -05:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00
CitadelStationBot
fc5c5932f0 Automatic changelog generation for PR #12775 [ci skip] 2020-07-17 19:07:09 -05:00
silicons
183a929e42 Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix 
wrestling rotation fix
 2020-07-17 17:07:06 -07:00
Lin
76c6c767d9 Merge pull request #12784 from silicons/shields 
fixes active block toggle not existing
 2020-07-17 14:43:40 -05:00
BlackMajor
9b671b7dd1 I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list 2020-07-18 03:08:52 +12:00
BlackMajor
eb9b3da581 Blacklist logic fix 2020-07-17 16:13:18 +12:00
dependabot[bot]
0484ec412f Bump lodash from 4.17.15 to 4.17.19 in /tgui 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-17 00:30:09 +00:00
CitadelStationBot
aeacc3ab62 Automatic changelog generation for PR #12229 [ci skip] 2020-07-16 19:28:47 -05:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Changelogs
501153168c Automatic changelog compile [ci skip] 2020-07-17 00:10:16 +00:00
CitadelStationBot
1d6bfbe9b4 Automatic changelog generation for PR #12799 [ci skip] 2020-07-16 18:18:40 -05:00
nik707
2c8c48a429 Merge pull request #12799 from timothyteakettle/small-edge-case 
fixes a tiny pickle edge case
 2020-07-16 18:18:37 -05:00
Timothy Teakettle
5a1caf8798 thank you rag very cool 2020-07-16 18:37:32 +01:00
Timothy Teakettle
ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle
a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
CitadelStationBot
d9ceab6553 Automatic changelog generation for PR #12798 [ci skip] 2020-07-16 11:33:01 -05:00
silicons
c5ccad1aa3 Merge pull request #12798 from LetterN/vunerability-bad 
[s] Ports lots of vunerability fix
 2020-07-16 09:32:58 -07:00
Artur
6add1efd11 Rerun Travis 2020-07-16 18:27:34 +03:00
Artur
9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor
fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N
abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Letter N
8083efd1ad https://github.com/tgstation/tgstation/pull/51864 2020-07-16 20:29:56 +08:00