shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d4684b5204210d9bc00f8941199dade2a619c7c2
GS13NG/code/modules
History
LetterJay d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424 
[MIRROR] Removes doubled iaa definition.
2018-06-12 08:08:39 -05:00
..
admin
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
antagonists
Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424
2018-06-12 08:08:39 -05:00
assembly
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
atmospherics
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
awaymissions
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
cargo
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
chatter
…
client
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
clothing
Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
2018-06-11 22:29:43 -05:00
crafting
…
detectivework
…
emoji
…
error_handler
…
events
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
fields
…
flufftext
…
food_and_drinks
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
games
…
goonchat
Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup
2018-06-11 22:29:36 -05:00
holiday
…
holodeck
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
hydroponics
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
integrated_electronics
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
jobs
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00: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
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
lighting
AI Multicamera mode (#37695)
2018-05-31 22:41:48 -05:00
mapping
[MIRROR] Fixes loading zlevels with static lighting. (#7051)
2018-06-10 12:32:58 -07:00
mining
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
mob
Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378
2018-06-12 08:03:40 -05:00
modular_computers
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
ninja
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
NTNet
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
orbit
…
paperwork
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
power
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
2018-06-12 07:41:10 -05:00
procedural_mapping
…
projectiles
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
reagents
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
recycling
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
research
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
2018-06-12 07:41:10 -05:00
ruins
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
security_levels
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
shuttle
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
spells
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
station_goals
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
2018-06-09 05:53:25 +00:00
surgery
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
[MIRROR] [s] Fixes syndicate sentience exploit (#7021)
2018-06-05 23:14:48 -07:00
vehicles
Hard upstream sync (#6951)
2018-05-31 16:03:18 -07:00
vending
Merge pull request #38360 from ShizCalev/key-cleanup
2018-06-11 22:29:27 -05:00
VR
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
zombie
…