shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
6c6b2a42ebf16ac42f9ee3099b8fbc6efb4e7a72
GS13NG/code/game
History
ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
..
area
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
gamemodes
Update objective_items.dm
2020-03-20 02:04:25 -04:00
machinery
Merge pull request #11529 from Trilbyspaceclone/patch-312
2020-03-20 22:57:43 -07:00
mecha
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
objects
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
2020-03-21 02:17:13 -04:00
turfs
Fixing a little issue with the musician trait etcetera.
2020-03-16 00:09:03 +01:00
alternate_appearance.dm
…
atoms_movable.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
2020-03-06 04:00:36 +01:00
atoms_movement.dm
some fixes
2020-02-26 05:59:53 -07:00
atoms.dm
Merge pull request #11340 from Ghommie/Ghommie-cit605
2020-03-07 03:26:48 -07:00
communications.dm
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
data_huds.dm
…
say.dm
Makes it compile also custom emote fix.
2020-02-06 01:40:14 +01:00
shuttle_engines.dm
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
sound.dm
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-05 01:47:04 +01:00
world.dm
Merge pull request #11022 from kevinz000/ssprofiler
2020-02-13 15:06:27 +01:00