shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ea9b3622fd8f0f8ccc4fd4d340cdb0a30b972a8e
GS13NG/code/modules
T
History
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
..
admin
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
antagonists
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
assembly
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
atmospherics
Merge branch 'master' into upstream-merge-37406
2018-05-13 03:28:37 -05:00
awaymissions
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
cargo
Bring gender equality to Corgi crates (#37748)
2018-05-10 19:57:20 -05:00
chatter
…
client
Merge branch 'master' into upstream-merge-37749
2018-05-15 00:50:13 -05:00
clothing
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
crafting
Merge pull request #37580 from 81Denton/craftable-hudsunglasses
2018-05-01 15:35:22 -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-37476
2018-05-06 07:07:02 +00:00
fields
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
flufftext
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
food_and_drinks
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
games
…
goonchat
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
holiday
drone masks for holidays
2018-05-09 13:42:54 -05:00
holodeck
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
hydroponics
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
integrated_electronics
Integrated Circuits: String parsing update (#37571)
2018-05-09 00:44:59 -05:00
jobs
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
keybindings
…
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 branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
mob
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
modular_computers
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
ninja
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
NTNet
NTNet improvements!
2018-04-27 20:24:28 -05:00
orbit
…
paperwork
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
power
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
procedural_mapping
…
projectiles
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
reagents
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -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-37476
2018-05-20 23:11:16 -05:00
ruins
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
security_levels
…
server_tools
…
shuttle
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
spells
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
station_goals
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
stock_market
Removes stock market
2018-05-02 17:48:55 -05:00
surgery
Plasmamen organs GET sprites! (#37595)
2018-05-02 21:21:11 -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
Replaces loose tech storage boards with spawners
2018-05-14 15:18:17 -05:00
VR
…
zombie
…