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

545 Commits

Author SHA1 Message Date
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01: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
kevinz000
88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
kevinz000
8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
Ghommie
ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01: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
kevinz000
088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-01-19 16:10:56 -07:00
Ghom
536900a7ac Merge pull request #10520 from Hatterhat/tg-40920 
you like examining things? - port of tgstation 40920
 2020-01-19 16:37:40 +01:00
Hatterhat
590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06: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
kevinz000
aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
Ghom
34872f6969 Merge pull request #10570 from kevinz000/map_network_helpers 
Power cable + atmos pipe auto mapping helpers
 2020-01-17 22:34:38 +01:00
kevinz000
512b112154 happythink 2020-01-15 20:45:05 -07:00
Ghom
70c1b0635a early returns. 2020-01-16 03:14:39 +01:00
kevinz000
554f23e790 aight bet 2020-01-15 18:04:05 -07:00
kevinz000
872628d9aa Apply suggestions from code review 
thank you gamer

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-15 18:02:23 -07:00
kevinz000
8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Hatterhat
9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06: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
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:49:58 -06:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08: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
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
kevinz000
4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage 
Increase radiation plasma usage in radiation collector
 2020-01-06 19:46:42 -08:00
kevinz000
198b1d5bd4 Update emitter.dm 2020-01-05 15:01:58 -08:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
MrJWhit
44b96f01ea Make radiation collectors move faster 
Words
 2020-01-03 06:04:10 -05:00
kevinz000
38c4060bfc compile 2020-01-03 00:04:58 -08:00
kevinz000
aac1b42b8f nightshift improvements 2020-01-03 00:01:48 -08:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
r4d6
5c94e02eac Add simple RCD Circuits 
Port : https://github.com/tgstation/tgstation/pull/45357
 2020-01-03 02:32:43 -05:00
CameronWoof
0c70fc9234 The Great Citadel De-Pissening of 2020 2020-01-02 21:24:03 -08:00
Hatterhat
5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" 2020-01-01 20:44:48 -06:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01: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
Putnam3145
634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
bc2e6a7f9b Ports "Fixes powernet avail checks" 2019-12-12 17:35:35 +01:00
Ghommie
651370c5b4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2019-12-11 21:10:24 +01:00
Ghommie
8ed21b47b6 Grammar and something. 2019-12-10 16:20:57 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +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
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