 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
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -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 |
|
|
Seris02
|
714f76c8aa
|
more changes
|
2019-12-30 18:48:29 +08:00 |
|
|
Seris02
|
8ef8d34dcc
|
supermatter power+integrity changes
|
2019-12-30 13:31:35 +08: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 |
|
|
Putnam3145
|
4e022af46f
|
Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
|
2019-12-05 21:16:47 -08:00 |
|
|
kevinz000
|
6a305dfe4f
|
Merge pull request #9955 from Ghommie/Ghommie-cit394
Updating supply pods code.
|
2019-12-05 21:54:42 -07:00 |
|
|
Putnam3145
|
6b2d3b116d
|
Merge branch 'master' into Ghommie-cit430
|
2019-12-05 20:53:14 -08:00 |
|
|
Ghommie
|
9ca7bb759c
|
Ports "Slightly improves visible and audible messages."
|
2019-12-06 02:02:12 +01: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
|
0ad89bd9de
|
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-11-28 05:34:56 +01:00 |
|
|
Ghommie
|
4e05c27cdb
|
Updating supply pods code.
|
2019-11-27 01:54:10 +01:00 |
|
|
Ghommie
|
dd101ef221
|
Part 2
|
2019-11-19 18:00:56 +01:00 |
|
|
Ghommie
|
6484eea339
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-15 00:36:50 +01:00 |
|
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
|
kevinz000
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
|
kevinz000
|
617b0db310
|
Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-14 15:48:34 -07:00 |
|
|
Ghommie
|
4ef1d64356
|
PR #47500, #47501, #47557, #47588.
|
2019-11-12 19:00:45 +01:00 |
|
|
Ghommie
|
09860d463f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-10 23:23:36 +01:00 |
|