shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b89254ced7a50a5b60a1f6342c86c08ad06248cd
GS13NG/code/modules
History
LetterJay b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
..
admin
Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623
2018-05-23 22:26:22 -05:00
antagonists
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
assembly
fixes flash icons (#6860)
2018-05-23 11:56:34 -07:00
atmospherics
Fixes digital valves not working for silicons (#37969)
2018-05-22 22:12:14 -05:00
awaymissions
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -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
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -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
Readds dropped #endif (#37174)
2018-04-13 22:10:47 -05:00
events
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -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 pull request #6620 from Citadel-Station-13/upstream-merge-37598
2018-05-23 22:26:44 -05:00
games
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
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
Merge branch 'master' into upstream-merge-37582
2018-05-21 08:35:21 -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 branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
mob
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
2018-05-24 11:58:57 -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
NTNet improvements!
2018-04-27 20:24:28 -05:00
orbit
…
paperwork
Update photocopier.dm
2018-05-22 07:56:25 -05:00
power
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
2018-05-24 11:58:57 -05:00
procedural_mapping
everything but mob stuff
2018-04-23 01:06:17 -05:00
projectiles
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
reagents
Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598
2018-05-23 22:26:44 -05:00
recycling
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
research
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
2018-05-24 11:58:57 -05:00
ruins
Makes more messages pronoun sensitive
2018-05-03 17:46:25 -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-37582
2018-05-22 07:22:42 -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
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
2018-05-23 07:46:26 -05:00
tgs
Update DMAPI to version 3.2.1.0
2018-05-08 21:33:58 -05:00
tgui
things with stuff (#6233)
2018-04-07 23:07:09 -04:00
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 branch 'master' into upstream-merge-37598
2018-05-23 07:44:52 -05:00
VR
Merge branch 'master' into upstream-merge-36974
2018-04-10 07:48:12 +00:00
zombie
…