Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Supermatter from Impstation #2717

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f9a1001
Hi
VMSolidus Aug 3, 2024
72999ef
Moves stuff to EE folders
honeyed-lemons Dec 27, 2024
0082a24
Adjust radiation protection on various structures and entities
VMSolidus Aug 30, 2024
bbb4e32
Radiation can no longer prevent doafters
honeyed-lemons Dec 27, 2024
15dbfcc
Fix supermatter.ftl (#790)
FoxxoTrystan Aug 24, 2024
44f3bf4
Bunch of fixes
honeyed-lemons Dec 27, 2024
6c1daa8
Remove steal objectives
honeyed-lemons Dec 27, 2024
4f0ff25
oops
honeyed-lemons Dec 27, 2024
2978714
first pass of changes
Darkmajia Dec 30, 2024
f63329f
more stuff
Darkmajia Dec 31, 2024
72fdde3
its fucking done
Darkmajia Jan 1, 2025
1e84a0f
forgot one tiny little popup
Darkmajia Jan 1, 2025
192e6da
guidebook update
Darkmajia Jan 1, 2025
5f610d4
computer and board entities, barebones ui without functionality
Darkmajia Jan 4, 2025
a205fef
i dont know shit about staging commits
Darkmajia Jan 6, 2025
17eee9a
Rename _EinsteinEngines => _EE
FaintSpeaker Jan 13, 2025
fd5736d
Move CCVars to their own file, remove CCVars that snuck in during che…
FaintSpeaker Jan 13, 2025
1d34a48
Port ClothingGrantTag from impstation/imp-station-14#673
FaintSpeaker Jan 13, 2025
d161075
Fixed CCVar class name in a missed file
FaintSpeaker Jan 13, 2025
ea907f9
Fix missing keys state for the supermatter monitor computer
FaintSpeaker Jan 13, 2025
4264a1c
supermatter air alarm
Darkmajia Dec 28, 2024
8cded46
lightning system fixes
Darkmajia Jan 2, 2025
f25a44e
what the fuck
Darkmajia Jan 2, 2025
27e1215
Commenting changes
FaintSpeaker Jan 14, 2025
b1f3813
Remove empty file, remove unused tag.
FaintSpeaker Jan 14, 2025
9e764f8
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 14, 2025
aa5a019
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 14, 2025
5a7c098
Missing lathe recipe.
FaintSpeaker Jan 14, 2025
5b744f5
Requested changes
FaintSpeaker Jan 14, 2025
30275a2
Reorder yaml to type > parent > id > name
FaintSpeaker Jan 14, 2025
661378f
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 14, 2025
d9df112
Missed some change requests; Moved supermatter computer into it's own…
FaintSpeaker Jan 15, 2025
26a05e8
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 15, 2025
55c1e21
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 18, 2025
f7edf35
Requested code change
FaintSpeaker Jan 18, 2025
ec06412
Merge branch 'master' into port/impstation/supermatter
FaintSpeaker Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed CCVar class name in a missed file
FaintSpeaker committed Jan 13, 2025
commit d16107525be14779d25c7c066ad0280edfabe55b
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
using Content.Server.Radio.EntitySystems;
using Content.Server.Speech;
using Content.Server.Station.Systems;
using Content.Shared._EE.CCVars;
using Content.Shared._EE.Supermatter.Components;
using Content.Shared._EE.Supermatter.Monitor;
using Content.Shared.Atmos;
@@ -85,7 +86,7 @@ public override void Update(float frameTime)
private void OnMapInit(EntityUid uid, SupermatterComponent sm, MapInitEvent args)
{
// Set the yell timer
sm.YellTimer = TimeSpan.FromSeconds(_config.GetCVar(CCVars.SupermatterYellTimer));
sm.YellTimer = TimeSpan.FromSeconds(_config.GetCVar(ECCVars.SupermatterYellTimer));

// Set the Sound
_ambient.SetAmbience(uid, true);