shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
fb58f7066552ba9a992f2192bbbeb11ba753f208
GS13NG/code/modules
History
LetterJay fb58f70665 Merge pull request #6917 from Citadel-Station-13/upstream-merge-38046 
[MIRROR] Fixes backslot not counting towards assess_threat
2018-05-27 14:41:36 -05:00
..
admin
Merge pull request #6891 from Citadel-Station-13/upstream-merge-38047
2018-05-25 22:52:27 -05:00
antagonists
Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019
2018-05-25 22:50:40 -05:00
assembly
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
2018-05-27 01:32:02 -05:00
atmospherics
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
2018-05-27 01:32:02 -05:00
awaymissions
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
cargo
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
chatter
…
client
Merge pull request #37963 from AutomaticFrenzy/patch/finally
2018-05-25 21:25:13 -05:00
clothing
Ports gloves of the north star from Hippie (#37864)
2018-05-27 11:40:47 -05:00
crafting
…
detectivework
…
emoji
…
error_handler
…
events
Merge pull request #6899 from Citadel-Station-13/upstream-merge-37993
2018-05-26 18:38:19 -05:00
fields
…
flufftext
…
food_and_drinks
Eatting fried items actually consumes the item (#38054)
2018-05-27 11:40:39 -05:00
games
…
goonchat
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
2018-05-21 16:40:29 -05:00
holiday
…
holodeck
…
hydroponics
Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486
2018-05-22 07:18:34 -05:00
integrated_electronics
Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1
2018-05-21 16:43:42 -05:00
jobs
Adjust antag rep values
2018-05-25 14:14:24 -05:00
keybindings
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
language
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -05:00
library
…
lighting
…
mapping
…
mining
Merge pull request #38027 from AutomaticFrenzy/patch/jacobs-ladder-vr
2018-05-25 10:46:47 -05:00
mob
Fixes backslot not counting towards assess_threat (#38046)
2018-05-27 11:41:06 -05:00
modular_computers
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
ninja
Merge branch 'master' into upstream-merge-37486
2018-05-21 11:59:57 -05:00
NTNet
…
orbit
…
paperwork
Update photocopier.dm
2018-05-22 07:56:25 -05:00
power
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
2018-05-27 01:32:02 -05:00
procedural_mapping
…
projectiles
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
reagents
Disallow effects from being scanned by the chameleon projector (#38017)
2018-05-25 07:38:01 -05:00
recycling
…
research
Capitalizes CentCom (#38086)
2018-05-27 11:40:12 -05:00
ruins
…
security_levels
…
shuttle
Merge pull request #38014 from tgstation/KorPhaeron-patch-1
2018-05-25 10:50:34 -05:00
spells
Fixes mimery blockade showing up under spell tab (#38004)
2018-05-23 19:44:16 -05:00
station_goals
…
stock_market
…
surgery
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
tgs
…
tgui
…
tooltip
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
2018-05-14 16:51:20 -05:00
unit_tests
…
uplink
Merge pull request #6915 from Citadel-Station-13/upstream-merge-37864
2018-05-27 14:41:19 -05:00
vehicles
…
vending
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
2018-05-27 01:32:02 -05:00
VR
Adds a sprite for the "quit vr" action button (#37994)
2018-05-23 21:18:54 -05:00
zombie
…