shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
29207b22fb6f5d5541d20980c9cc1ac43a87e898
GS13NG/code/modules
History
Arturlang 29207b22fb Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
..
admin
Merge pull request #10623 from Putnam3145/antag-overhaul
2020-02-06 16:25:22 -07:00
antagonists
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
assembly
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
atmospherics
Ported atmos reaction priority fix
2020-02-04 14:32:39 -08:00
awaymissions
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
bsql
…
buildmode
Revert "Merge branch 'master' into Yeehaw"
2020-01-08 12:26:45 +13:00
cargo
Merge pull request #10798 from necromanceranne/secmainsrejoice
2020-02-06 23:52:49 -07:00
chatter
…
client
Merge pull request #10885 from Ghommie/Ghommie-cit553
2020-02-05 23:45:30 -07:00
clothing
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02: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
Correct timer
2020-02-08 23:09:51 -05:00
fields
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
flufftext
yeet
2020-02-04 13:25:14 +08:00
food_and_drinks
Works now
2020-02-04 12:05:15 +01:00
games
update
2019-12-23 13:30:42 -05:00
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
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
hydroponics
Merge pull request #10888 from Ghommie/Ghommie-cit554
2020-02-06 00:49:09 -07:00
integrated_electronics
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
jobs
minor pet peeve with the anomalous honking crystal & co.
2020-01-24 21:51:24 +01:00
keybindings
Merge remote-tracking branch 'citadel/master' into optimization_1
2020-01-24 03:41:40 -07:00
language
Merge pull request #10739 from r4d6/Dwarven_Language
2020-02-05 02:03:42 +01:00
library
Merge pull request #10883 from ancientpower/ghost-newscasters
2020-02-05 23:46:04 -07:00
lighting
ok
2020-01-14 18:04:19 -07:00
mapping
unicode support port wip
2020-01-31 05:32:00 +01:00
mining
Merge pull request #10849 from Ghommie/Ghommie-cit547
2020-02-04 03:39:14 -07:00
mob
o k.
2020-02-07 23:39:09 -07:00
modular_computers
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
ninja
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
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 branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
reagents
Merge pull request #10917 from Arturlang/Hyposprays_QOL
2020-02-06 20:31:46 +01:00
recycling
Forgot this
2020-02-02 13:44:44 +01:00
research
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
ruins
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
security_levels
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
shuttle
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
spells
Merge pull request #10623 from Putnam3145/antag-overhaul
2020-02-06 16:25:22 -07:00
station_goals
Ohkay
2020-01-15 09:41:33 +02:00
surgery
runtime is forever, errors are eternal.
2020-02-05 23:48:17 +01:00
tgs
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
tgui
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
tooltip
…
unit_tests
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
uplink
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
vehicles
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
vending
Merge pull request #10798 from necromanceranne/secmainsrejoice
2020-02-06 23:52:49 -07:00
vore
Merge pull request #10772 from Ghommie/Ghommie-cit537
2020-02-06 00:37:52 -07:00
VR
Update vr_sleeper.dm
2020-01-26 17:25:24 +01:00
zombie
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00