shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,109 Commits 5 Branches 0 Tags
6d6c10104490dff5341e893bf6fb5a78a35ad4e0
Commit Graph

521 Commits

Author SHA1 Message Date
kevinz000
b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation 
made engine rotation properly blacklist 0-weighted ones
 2020-01-26 14:04:31 -07:00
Putnam
52e473ba07 argh 2020-01-25 19:42:36 -08:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450 
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
 2020-01-25 19:33:26 -07:00
Ghommie
721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
Ghom
047059617c Merge pull request #10645 from r4d6/Modular-Lavaland 
Modularize the mining base
 2020-01-23 02:53:34 +01:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
kevinz000
8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01: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
kappa-sama
3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05: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
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kappa-sama
25422542c9 this 2020-01-10 22:19:00 -05:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
r4d6
f6fef84984 Make the RCD effect not right-clickable. 2020-01-07 11:23:25 -05:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08:00
kevinz000
07885a399a Update muzzle.dm 2020-01-05 15:04:13 -08:00
kevinz000
6e1e1aac3e Update impact.dm 2020-01-05 15:03:42 -08:00
kevinz000
eea8d353b6 Update tracer.dm 2020-01-05 15:03:14 -08: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
Ghommie
f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
r4d6
7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6
37d50e2aaf Add RCD effects 
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
 2020-01-03 02:13:20 -05:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
Ghommie
d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
Ghom
9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -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
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -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
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
r4d6
dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05: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
Ghommie
5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
BlackMajor
59d0376985 finished 2019-12-14 17:31:26 +13:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +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
025a7cd79a more ports 
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
 2019-12-07 03:04:02 -05:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +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
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her 
Ports AI console focus loss fix and fixes an error in my trimline code
 2019-11-28 05:37:36 -08:00