shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
ee7064840dce9cb24e510b7ee68d15014b1501de
GS13NG/code/modules
History
Seris02 ee7064840d merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
..
admin
Merge pull request #10840 from Putnam3145/easier_bunker
2020-02-04 21:15:37 +01:00
antagonists
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
assembly
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
atmospherics
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
awaymissions
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
bsql
…
buildmode
…
cargo
Merge pull request #10855 from Trilbyspaceclone/patch-274
2020-02-05 01:10:21 -07:00
chatter
…
client
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
clothing
Merge pull request #10788 from Seris02/crushboots
2020-02-05 07:36:14 +01:00
detectivework
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
emoji
unicode support port wip
2020-01-31 05:32:00 +01:00
error_handler
unicode support port wip
2020-01-31 05:32:00 +01:00
events
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
fields
…
flufftext
yeet
2020-02-04 13:25:14 +08:00
food_and_drinks
Works now
2020-02-04 12:05:15 +01:00
games
…
goonchat
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
holiday
unicode support port wip
2020-01-31 05:32:00 +01:00
holodeck
…
hydroponics
Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine
2020-02-04 03:32:57 -07:00
integrated_electronics
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
jobs
…
keybindings
…
language
Merge pull request #10739 from r4d6/Dwarven_Language
2020-02-05 02:03:42 +01:00
library
unicode support port wip
2020-01-31 05:32:00 +01:00
lighting
…
mapping
unicode support port wip
2020-01-31 05:32:00 +01:00
mining
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
mob
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
modular_computers
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
ninja
…
NTNet
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
oracle_ui
…
paperwork
not-so-wip now.
2020-01-31 19:20:59 +01:00
photography
not-so-wip now.
2020-01-31 19:20:59 +01:00
power
Merge pull request #10849 from Ghommie/Ghommie-cit547
2020-02-04 03:39:14 -07:00
procedural_mapping
not-so-wip now.
2020-01-31 19:20:59 +01:00
projectiles
Merge pull request #10849 from Ghommie/Ghommie-cit547
2020-02-04 03:39:14 -07:00
reagents
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
recycling
Forgot this
2020-02-02 13:44:44 +01:00
research
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
ruins
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
security_levels
…
shuttle
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
spells
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
station_goals
…
surgery
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Merge pull request #10788 from Seris02/crushboots
2020-02-05 07:36:14 +01:00
vehicles
…
vending
Merge pull request #10837 from Owai-Seek/tinytweaks
2020-02-02 18:07:25 +01:00
vore
Merge pull request #10583 from Putnam3145/arousal-tweaks
2020-02-05 07:19:37 +01:00
VR
…
zombie
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00