shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d45c85bf7804eefc0e98ae9025677bf47010f073
GS13NG/code/modules
History
LetterJay d45c85bf78 Merge pull request #6854 from Citadel-Station-13/upstream-merge-37968 
[MIRROR] Field generators are now workable by silicons again... but not wirelessly
2018-05-23 06:45:37 -05:00
..
admin
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
2018-05-21 16:33:42 -05:00
antagonists
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
assembly
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
atmospherics
Fixes digital valves not working for silicons (#37969)
2018-05-22 22:12:14 -05:00
awaymissions
Merge branch 'master' into upstream-merge-37529
2018-05-22 08:02:46 -05:00
cargo
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
chatter
…
client
Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943
2018-05-22 02:27:55 +00:00
clothing
Update _ears.dm
2018-05-22 22:14:41 -05:00
crafting
replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-02 13:14:43 -05:00
detectivework
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
emoji
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
error_handler
…
events
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
fields
…
flufftext
[s] Hallucinations 4.0
2018-05-09 16:15:58 -05:00
food_and_drinks
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
games
…
goonchat
Merge pull request #37934 from AutomaticFrenzy/patch/ssping
2018-05-21 16:40:29 -05:00
holiday
drone masks for holidays
2018-05-09 13:42:54 -05:00
holodeck
replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-02 13:14:43 -05:00
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
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
keybindings
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
language
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
library
…
lighting
…
mapping
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
mining
Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486
2018-05-22 07:18:34 -05:00
mob
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -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
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
power
Merge pull request #6854 from Citadel-Station-13/upstream-merge-37968
2018-05-23 06:45:37 -05:00
procedural_mapping
…
projectiles
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
reagents
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
recycling
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
research
Merge branch 'master' into upstream-merge-37597
2018-05-23 05:21:19 -05:00
ruins
…
security_levels
…
shuttle
…
spells
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
station_goals
…
stock_market
Removes stock market
2018-05-02 17:48:55 -05:00
surgery
Merge branch 'master' into upstream-merge-37530
2018-05-22 07:19:06 -05:00
tgs
Update DMAPI to version 3.2.1.0
2018-05-08 21:33:58 -05:00
tgui
…
tooltip
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
2018-05-14 16:51:20 -05:00
unit_tests
…
uplink
fixes some inconsistency in the bulldog shotgun ammo (#37548)
2018-05-09 16:24:17 -05:00
vehicles
…
vending
Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
2018-05-19 09:15:46 -05:00
VR
…
zombie
…