Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
Putnam3145
857253a07b
who names a var T.
2022-03-10 21:42:27 -08:00
Putnam3145
a44d0af4dc
hackish supermatter dying on spaced nearby turfs
2022-03-09 07:49:02 -08:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
Lin
5b0fe8d392
Merge pull request #15381 from DeltaFire15/battery-supply
...
Synthetics can now hook up their power cord to cells instead of relying on moth-esque code
2021-11-20 07:04:15 +00:00
DeltaFire
855df65ba2
cord cell charge
2021-11-16 22:56:31 +01:00
DeltaFire
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
Putnam3145
be9f550261
removed gross extra space
2021-11-11 17:43:38 -08:00
Putnam3145
25687a81f0
Makes TEG generate heat based on heat again
2021-11-11 17:38:49 -08:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
Putnam3145
3c8bab34b2
Also makes destroying the APC show an alert properly.
2021-11-07 09:29:15 -08:00
LetterN
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
raspy
921717d9cd
tesla counterplay now accounts for grounding rod capacitor type ( #15291 )
...
* tesla energy loss accounts for capacitor rating
* reverse qdel and energy loss as suggested
Co-authored-by: = <=>
2021-10-23 03:58:39 +02:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
silicons
9ac585c7f4
Merge pull request #15166 from Putnam3145/wider-effective-temperature
...
Supermatter has capped effective temperature for power increase too
2021-09-19 11:07:45 -07:00
silicons
c04f0cb953
Merge pull request #15154 from qweq12yt/test
...
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07:00
Putnam3145
ce0107dfdf
effective temperature for power increase too
2021-09-16 21:49:43 -07:00
qweq12yt
781a414c38
fix space heaters
2021-09-15 18:16:04 -03:00
Putnam3145
99908e17c5
Revert "Reworks supermatter gas output to be less cascade-y, more risky"
2021-09-13 11:39:32 -07:00
silicons
4f0d5e8c9a
Merge pull request #15112 from Putnam3145/fix-supermatter-cascade
...
Reworks supermatter gas output to be less cascade-y, more risky
2021-09-12 20:58:48 -07:00
Putnam3145
137a30a047
more nerfs lol
2021-09-12 15:04:42 -07:00
Putnam3145
083704e29d
lowered max oxy mult, made temp not matter
2021-09-11 11:03:15 -07:00
Putnam3145
3965ad9dae
yeah that's just too much gas sorry
2021-09-11 10:25:39 -07:00
keronshb
5587cc91cd
Other fix
2021-09-09 21:56:58 -04:00
keronshb
8dfb97cdf7
SALTPR
2021-09-09 20:17:55 -04:00
Putnam3145
cc2471cf7f
Reworked supermatter gas output
...
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
2021-09-09 13:51:22 -07:00
silicons
6de44f794e
Merge pull request #15010 from Putnam3145/atmos-funnies
...
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
2021-08-26 21:39:33 -07:00
Putnam3145
0f7f11be71
Made supermatter respect heat capacity
2021-08-15 19:43:13 -07:00
Putnam3145
22fae70132
Supermatter surge rework
2021-08-14 19:39:31 -07:00
silicons
c37f2ca739
Merge pull request #14961 from Putnam3145/supermatter-auxgm
...
Makes supermatter properties auxgm-based
2021-08-11 02:01:05 -07:00
Putnam3145
ac577c7699
adds powermix to the list of accepted SM properties, whoops
2021-08-03 17:19:02 -07:00
Putnam3145
d4dc10b29b
error fixin'
2021-08-03 16:29:08 -07:00
Artur
feac8568b6
shit fucking works now
2021-07-31 01:23:49 +03:00
Artur
977d129de6
Shuttle lights are back on
2021-07-30 23:45:55 +03:00
Artur
8d977e3042
Fucking init
2021-07-30 01:40:00 +03:00
Artur
2a670dcd43
This should fix it, why does our init update icons and not TG's?
2021-07-30 01:28:10 +03:00
Artur
dc40dfca81
goddamn stupid runtimes
2021-07-30 01:24:43 +03:00
Artur
ec4fc35593
Missed these..
2021-07-29 20:33:16 +03:00
Artur
6023710c06
Actually we don't have looping sounds
2021-07-29 20:28:34 +03:00
