shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d0297e326d6d4925e320f54b7ab82164de604cca
GS13NG/code/modules
History
deathride58 ce0dac200b Merge pull request #6828 from Citadel-Station-13/upstream-merge-37965 
[MIRROR] Fixes fire_act working on deleted things.
2018-05-22 02:28: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
…
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
…
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
…
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
…
lighting
…
mapping
…
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
…
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
…
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
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
2018-05-21 11:23:02 -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
…
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
…
vending
Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
2018-05-19 09:15:46 -05:00
VR
…
zombie
…