shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,981 Commits 5 Branches 0 Tags
cfd65d812aa545c7fc1d80bcdbe07fa98d74ffec
Commit Graph

494 Commits

Author SHA1 Message Date
kevinz000
831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
keronshb
a7af5203e7 This is a test to see if they all work together 
Title
 2020-01-06 20:29:44 -05:00
keronshb
35cd77d433 Adds the nanite remote for some programs 
Adds a new remote function from tg
 2020-01-06 20:28:33 -05:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo 
cargo tweaks, new shit, why do digitigrade sprites exist
 2020-01-06 21:47:15 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Hatterhat
7c98656939 upstream merge 2020-01-04 01:48:50 -06:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Linzolle
74c308c16c runtime fix 2020-01-01 22:23:16 -06:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
keronshb
baf8b28f3a Fixes Reduced Diagnostics and adds disks 
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
 2019-12-29 16:03:38 -05:00
kappa-sama
3fad4edae0 mouth 2019-12-28 23:57:07 -05:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Ghommie
d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05:00
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Lin
237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462 
[s] virtual reality component improvements, fixes and documentation.
 2019-12-17 01:05:10 +00:00
Ghommie
80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
Ghommie
081d3df750 This is one serious Pepe Silvia complex. 2019-12-14 22:52:40 +01:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
TrilbySpaceClone
c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05:00
Ghommie
343420f343 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2019-12-06 21:37:11 +01:00
Ghommie
27af7b271f qdeleted to qdeleting 2019-12-06 20:12:30 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
72c093d14e Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2019-12-06 19:05:50 +01:00
Ghommie
91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Linzolle
04e9466465 and we don't have this span... 2019-12-01 16:06:13 -06:00
Linzolle
560ad9cce2 tfw we don't have these defines 2019-12-01 16:03:36 -06:00
Linzolle
ce04739ccb neck slice 2019-12-01 15:53:40 -06:00
Linzolle
efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle
a20b975d68 copy paste errors lol 2019-12-01 14:40:25 -06:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
1795072f94 Mistakes were made. 2019-11-28 02:47:09 +01:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00