shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6f98efb18ef30852aa5abc47b328b453b0be374f
GS13NG/code/modules
History
BlackMajor 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
..
admin
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-14 22:31:48 -08:00
antagonists
Merge pull request #9885 from Commandersand/cuckcult
2019-11-23 11:45:24 -07:00
assembly
…
atmospherics
Merge pull request #9836 from Ghommie/Ghommie-cit364
2019-11-19 21:32:42 -07:00
awaymissions
Merge pull request #9530 from Ghommie/Ghommie-cit245
2019-11-22 02:37:49 +00:00
bsql
…
buildmode
…
cargo
Partly Reverts "Fixes loadout name, adds DAB outf-
2019-11-17 19:44:22 +03:00
chatter
…
client
Merge pull request #9898 from Ghommie/Ghommie-cit387
2019-11-23 05:52:44 +00:00
clothing
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277
2019-11-22 18:53:58 +01:00
crafting
mining winter coat shtuff
2019-11-17 22:27:09 +08:00
detectivework
…
emoji
…
error_handler
…
events
aaa
2019-11-21 06:48:26 +01:00
fields
…
flufftext
Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
2019-11-14 16:24:10 -07:00
food_and_drinks
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
2019-11-14 16:00:45 -07:00
games
…
goonchat
…
holiday
Merge pull request #9487 from Citadel-Station-13/spooky
2019-11-20 23:00:09 -06:00
holodeck
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
hydroponics
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
integrated_electronics
Merge pull request #9656 from Ghommie/Ghommie-cit290
2019-11-14 15:55:04 -07:00
jobs
Merge pull request #9530 from Ghommie/Ghommie-cit245
2019-11-22 02:37:49 +00:00
keybindings
FUCK
2019-11-15 20:12:54 +01:00
language
…
library
…
lighting
…
mapping
…
mining
Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
2019-11-23 11:39:35 -07:00
mob
Merge pull request #9625 from Ghommie/Ghommie-cit277
2019-11-25 11:30:31 +13:00
modular_computers
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
ninja
Merge pull request #9530 from Ghommie/Ghommie-cit245
2019-11-22 02:37:49 +00:00
NTNet
…
oracle_ui
…
paperwork
…
photography
…
power
Merge pull request #9632 from Ghommie/Ghommie-cit281
2019-11-14 15:58:53 -07:00
procedural_mapping
…
projectiles
Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111
2019-11-20 22:51:11 -06:00
reagents
Merge pull request #9902 from Useroth/new-tg-plants
2019-11-25 11:30:43 +13:00
recycling
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
research
Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110
2019-11-20 22:51:32 -06:00
ruins
Merge pull request #9530 from Ghommie/Ghommie-cit245
2019-11-22 02:37:49 +00:00
security_levels
…
shuttle
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
spells
Fixing some wizard den teleportation issues.
2019-11-18 02:04:49 +01:00
station_goals
…
surgery
Merge pull request #9811 from Ghommie/Ghommie-cit353
2019-11-20 21:49:58 -07:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Merge pull request #9866 from Useroth/tatorstrangeseeds
2019-11-20 22:09:53 -07:00
vehicles
…
vending
adds janitor winter coat
2019-11-17 15:45:12 +08:00
vore
…
VR
…
zombie
…