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

17032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vuonojenmustaturska
f2fdbab0cb Adjust antag rep values 2018-05-25 14:14:24 -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
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJay
d19ecc5a4f Update magweapon.dm 2018-05-24 11:21:33 -05:00
LetterJay
e79113faca Update all_nodes.dm 2018-05-24 11:21:04 -05:00
CitadelStationBot
8860b57b33 Automatic changelog generation for PR #6748 [ci skip] 2018-05-24 01:00:19 -05:00
LetterJay
cefa34ba48 Merge pull request #6748 from deathride58/poojgoneplzrevert 
Emag QoL and addition of emag recharge devices
 2018-05-24 01:00:17 -05:00
deathride58
99d78cb07a Merge branch 'master' into poojgoneplzrevert 2018-05-24 03:28:39 +00:00
CitadelStationBot
3deb3f4fa1 Automatic changelog generation for PR #6620 [ci skip] 2018-05-23 22:26:46 -05:00
LetterJay
9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598 
[MIRROR] Adds grenadine.
 2018-05-23 22:26:44 -05:00
LetterJay
63a857901f Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623 
[MIRROR] Some dbadmin fixes
 2018-05-23 22:26:22 -05:00
letterjay
4e8e7eb1d2 Adds a sprite for the "quit vr" action button[cast ur mf votes inside] 2018-05-23 21:18:54 -05:00
MrDoomBringer
1a40822f17 Adds a sprite for the "quit vr" action button (#37994) 
* is that a motherfucking 90s reference

* WHEN YA FUCK UP BADLY ENOUGH ON ADDING A SPRITE TGHAT YA GOTTA MANUALLY CHANGE CHANGELOG.HTML
 2018-05-23 21:18:54 -05:00
letterjay
1e7e682d0b Removes a couple thousand empty lists 2018-05-23 21:15:41 -05:00
vuonojenmustaturska
36b3cbe4bf Removes a couple thousand empty lists (#38000) 
door.shockedby
 2018-05-23 21:15:41 -05:00
letterjay
fe24ef6bab Fixes reactive repulse armour not throwing people 2018-05-23 21:00:10 -05:00
KorPhaeron
64ead10924 Fixes reactive repulse armour (#37999) 2018-05-23 21:00:10 -05:00
letterjay
5c8b1025c5 Fixes mimery blockade showing up under spell tab 2018-05-23 19:44:16 -05:00
AlexTheSysop42
14de47bd4b Fixes mimery blockade showing up under spell tab (#38004) 2018-05-23 19:44:16 -05:00
letterjay
eac0c0cd68 Fix outdated R&D console comment 2018-05-23 16:12:05 -05:00
Tad Hardesty
aec2e19b94 Fix outdated R&D console comment (#38020) 2018-05-23 16:12:04 -05:00
CitadelStationBot
0e02725648 Automatic changelog generation for PR #6761 [ci skip] 2018-05-23 14:16:00 -05:00
deathride58
be4902d195 tones down particle defender stamloss (#6761) 2018-05-23 12:15:58 -07:00
CitadelStationBot
8b0b750203 Automatic changelog generation for PR #6615 [ci skip] 2018-05-23 14:14:20 -05:00
deathride58
5f60f30700 Adds custom say verbs, makes yelling echo and penetrate walls, makes distant voices have small text (#6615) 
* adds custom say emotes, makes yelling penetrate walls and echo throughout areas

* Update say.dm

* Update say.dm

* Update say.dm

* Update mob.dm

* makes yelling unable to penetrate space
 2018-05-23 12:14:18 -07:00
CitadelStationBot
4c5ad0b6d9 Automatic changelog generation for PR #6782 [ci skip] 2018-05-23 14:12:59 -05:00
deathride58
fc4debd4ca makes small tweaks to the hub entry (#6782) 2018-05-23 12:12:57 -07:00
CitadelStationBot
1b5238e58e Automatic changelog generation for PR #6860 [ci skip] 2018-05-23 13:56:38 -05:00
Hatterhat
88382c1058 fixes flash icons (#6860) 
because people keep whining about it and because kev wanted me to do it for him with a webeditor pr
 2018-05-23 11:56:34 -07:00
LetterJay
2b8dd6851b Merge pull request #6752 from Citadel-Station-13/upstream-merge-37665 
[MIRROR] Splits up round table initialize, start, end and shutdown
 2018-05-23 10:52:27 -05:00
LetterJay
de44ac926e Merge branch 'master' into upstream-merge-37665 2018-05-23 10:14:10 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
db87f3dbae Merge branch 'master' into upstream-merge-37598 2018-05-23 07:44:52 -05:00
CitadelStationBot
469b7772da Automatic changelog generation for PR #6859 [ci skip] 2018-05-23 06:49:46 -05:00
LetterJay
130db93543 Merge pull request #6859 from Citadel-Station-13/upstream-merge-37982 
[MIRROR] Fix flipping of trinary pipe fittings and related RPD tooltips
 2018-05-23 06:49:44 -05:00
CitadelStationBot
90f797e9fa Automatic changelog generation for PR #6858 [ci skip] 2018-05-23 06:49:33 -05:00
LetterJay
938c590ce1 Merge pull request #6858 from Citadel-Station-13/upstream-merge-37984 
[MIRROR] Fix entertainment monitors viewing the wrong Thunderdome
 2018-05-23 06:49:31 -05:00
CitadelStationBot
3b1304e1a2 Automatic changelog generation for PR #6856 [ci skip] 2018-05-23 06:46:04 -05:00
LetterJay
dcaebec121 Merge pull request #6856 from Citadel-Station-13/upstream-merge-37962 
[MIRROR] Fixes gulag teleporter runtime, now automatically sets the default goal of an ID
 2018-05-23 06:46:02 -05:00
LetterJay
521b07ce62 Merge pull request #6855 from Citadel-Station-13/upstream-merge-37986 
[MIRROR] Fix global proccalls not working
 2018-05-23 06:45:49 -05:00