shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
54cd2585cfdfebadeec5dd04b34d403c51cb0852
GS13NG/code/modules
History
Artur 54cd2585cf Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
..
admin
Merge pull request #10151 from Ghommie/Ghommie-cit450
2020-01-25 19:33:26 -07:00
antagonists
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
assembly
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
atmospherics
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
awaymissions
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
bsql
…
buildmode
Revert "Merge branch 'master' into Yeehaw"
2020-01-08 12:26:45 +13:00
cargo
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
chatter
…
client
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
clothing
Merge pull request #10759 from Ghommie/Ghommie-cit534
2020-01-29 19:58:26 +00:00
crafting
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
detectivework
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
emoji
…
error_handler
Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time
2019-04-02 01:11:29 -04:00
events
Merge branch 'master' into hugbox_meteor_time
2020-01-29 02:28:12 +01: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
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
food_and_drinks
Conflict fix
2020-01-24 23:06:32 +01:00
games
update
2019-12-23 13:30:42 -05:00
goonchat
Ready for testmerge
2020-01-15 09:44:29 +02:00
holiday
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +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
Update seeds.dm
2020-01-25 08:56:06 -07:00
integrated_electronics
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-15 15:57:32 -08:00
jobs
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
keybindings
Merge remote-tracking branch 'citadel/master' into optimization_1
2020-01-24 03:41:40 -07:00
language
Ohkay
2020-01-15 09:41:33 +02:00
library
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
lighting
ok
2020-01-14 18:04:19 -07:00
mapping
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
mining
Conflict fix
2020-01-24 23:06:32 +01:00
mob
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
modular_computers
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02: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
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
oracle_ui
…
paperwork
Merge pull request #10701 from Ghommie/Ghommie-cit527
2020-01-28 17:57:26 -07:00
photography
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
power
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
procedural_mapping
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
projectiles
Update dueling.dm
2020-01-29 19:06:11 -07:00
reagents
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
recycling
Fixes.
2020-01-30 19:23:38 +01:00
research
Merge pull request #10761 from Putnam3145/fix-forced-gender
2020-01-29 05:31:18 +01: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
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
spells
Merge pull request #10073 from Ghommie/Ghommie-cit435
2020-01-24 00:25:53 -07:00
station_goals
Ohkay
2020-01-15 09:41:33 +02:00
surgery
Merge pull request #10690 from Ghommie/Ghommie-cit525
2020-01-25 05:54:35 -07: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
WEBEDITS
2019-10-29 03:50:49 +00:00
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
Conflict fix
2020-01-24 23:06:32 +01:00
vehicles
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
vending
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
vore
I'm exiting this code. 👀
2020-01-24 22:15:33 +01:00
VR
Update vr_sleeper.dm
2020-01-26 17:25:24 +01:00
zombie
…