shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2d8002ca3606123d920a5c3c0abd3e96b2d6fd12
GS13NG/code/modules
History
deathride58 2d8002ca36 Merge pull request #6826 from Citadel-Station-13/upstream-merge-37935 
[MIRROR] Fix formatting when emagging an R&D console
2018-05-22 02:29:38 +00:00
..
admin
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
2018-05-21 16:33:42 -05:00
antagonists
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
2018-05-21 11:23:02 -05:00
assembly
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:11:16 -05:00
atmospherics
Merge pull request #37965 from AnturK/whatthecommentsays
2018-05-21 16:27:55 -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 pull request #6830 from Citadel-Station-13/upstream-merge-37943
2018-05-22 02:27:55 +00: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 pull request #6550 from Citadel-Station-13/upstream-merge-37476
2018-05-21 11:23:02 -05:00
fields
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
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
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
hydroponics
Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays
2018-05-21 16:58:31 -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
everything but mob stuff
2018-04-23 01:06:17 -05:00
lighting
everything but mob stuff
2018-04-23 01:06:17 -05:00
mapping
Merge pull request #37549 from ShizCalev/bounce_away-fixes
2018-04-30 12:51:40 -05:00
mining
Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter
2018-05-21 17:03:46 -05:00
mob
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
2018-05-21 16:33:42 -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:12:07 -05:00
procedural_mapping
everything but mob stuff
2018-04-23 01:06:17 -05:00
projectiles
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -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
Fix formatting when emagging an R&D console
2018-05-21 11:25:48 -05:00
ruins
Kills off /obj/item/device (#6561)
2018-04-30 00:06:58 -05:00
security_levels
…
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:12:07 -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
Replace nauseous with nauseated (#37927)
2018-05-21 03:06:39 -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
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
vending
Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
2018-05-19 09:15:46 -05:00
VR
…
zombie
…