shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
732a1ca4381a59255cc99cf3a5e0c7ca2d5a0e14
GS13NG/code/modules
History
Artur 732a1ca438 Fixes linter and conflict shit
2020-07-13 16:35:12 +03:00
..
admin
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
antagonists
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
arousal
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
assembly
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
asset_cache
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
atmospherics
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
awaymissions
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
bsql
…
buildmode
…
cargo
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
chatter
…
client
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
clothing
Fixes hair falling out of hoodies
2020-07-07 22:31:00 -05:00
detectivework
Fixed scanner export
2020-07-13 16:20:21 +03:00
economy
…
emoji
^w^
2020-07-09 14:32:23 +08:00
error_handler
…
events
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
fields
…
flufftext
Fixing the snore-pocalypse, and another not so critical issue.
2020-06-24 23:08:40 +02:00
food_and_drinks
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
games
…
goonchat
woops
2020-07-08 16:59:22 +08:00
holiday
last ones
2020-06-17 21:37:19 -07:00
holodeck
…
hydroponics
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
instruments
…
integrated_electronics
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
jobs
Update shaft_miner.dm
2020-06-28 02:03:35 +02:00
keybindings
Update combat.dm
2020-06-29 23:20:52 -07:00
language
…
library
…
lighting
…
mapping
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
mining
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
mob
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
modular_computers
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
movespeed
…
newscaster
…
ninja
…
NTNet
…
paperwork
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
photography
…
pool
…
power
Fixes linter and conflict shit
2020-07-13 16:35:12 +03:00
procedural_mapping
…
projectiles
Merge pull request #12660 from YakumoChen/master
2020-07-04 18:35:22 +02:00
reagents
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
recycling
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
research
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
ruins
Conflicts!!!
2020-06-22 17:39:24 +03:00
security_levels
…
shuttle
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
spells
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
station_goals
…
surgery
Merge pull request #12624 from Citadel-Station-13/policy
2020-07-11 16:40:38 -05:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
vehicles
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
2020-06-17 19:33:14 -05:00
vending
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
vore
…
VR
…
zombie
…