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

Update Supermatter (Again) #34

Merged
merged 32 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4043f1b
Initial Port
VMSolidus Apr 25, 2024
158b8d9
Should fix test fail
VMSolidus Apr 25, 2024
7527bdd
Edge with Experimental Supermatter Engine
VMSolidus Apr 26, 2024
4089288
Update edge.yml
VMSolidus Apr 26, 2024
a9d8b6b
New edge by Colintel
VMSolidus Apr 26, 2024
bf337fe
Update edge.yml
VMSolidus Apr 26, 2024
07d94cb
Update edge.yml
VMSolidus Apr 26, 2024
0b428dc
better sound looping
VMSolidus Apr 30, 2024
185a63b
Update edge.yml
VMSolidus May 4, 2024
79e9664
Update supermatter
VMSolidus May 10, 2024
259f714
Merge branch 'master' into Port-Of-Supermatter
VMSolidus May 30, 2024
c241559
Updating server Supermatter System
VMSolidus Jun 4, 2024
11e6530
Update supermatter.yml
VMSolidus Jun 21, 2024
d6d5707
Update supermatter.ftl
VMSolidus Jun 21, 2024
d94c07d
Delete edge.yml
VMSolidus Jun 21, 2024
d3ab5a2
Create edge.yml
VMSolidus Jun 21, 2024
4199493
what
Jun 22, 2024
2d1b16f
port from https://github.com/Goob-Station/Goob-Station/pull/344
Jun 22, 2024
ba27eee
fix doafter
Jun 22, 2024
b60949f
ok
Jun 22, 2024
13e6532
grab som more
Jun 22, 2024
96dbb7b
please god
Jun 22, 2024
24be76e
Merge branch 'Port-Of-Supermatter' of https://github.com/VMSolidus/Ei…
Jun 22, 2024
7699ed5
no more 0% integrity announcements
Jun 22, 2024
f287722
more tweaks
Jun 26, 2024
4570415
moar oopdates
Jun 26, 2024
e5de134
Merge branch 'master' into Port-Of-Supermatter
VMSolidus Jun 29, 2024
24660ac
Merge remote-tracking branch 'EE-Personal/Port-Of-Supermatter' into U…
VMSolidus Jun 29, 2024
33778c7
Update supermatter.png
VMSolidus Jun 29, 2024
d3ff509
Update stealTargetGroups.yml
VMSolidus Jun 29, 2024
5e20c5d
Last thing
VMSolidus Jun 29, 2024
201856f
Guh
VMSolidus Jun 29, 2024
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
940 changes: 502 additions & 438 deletions Content.Server/Supermatter/Systems/SupermatterSystem.cs

Large diffs are not rendered by default.

386 changes: 209 additions & 177 deletions Content.Shared/Supermatter/Components/SupermatterComponent.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using Robust.Shared.GameStates;

namespace Content.Shared.Supermatter.Components;

[RegisterComponent, NetworkedComponent]
public sealed partial class SupermatterImmuneComponent : Component
{

}
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/objectives/conditions/steal.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ objective-condition-steal-Ian = head of personnel's corgi
objective-condition-thief-description = The {$itemName} would be a great addition to my collection!
objective-condition-thief-animal-description = The {$itemName} would be a great addition to my collection! Most importantly, alive.
objective-condition-thief-multiply-description = I need to get {$count} {MAKEPLURAL($itemName)} and take them with me.

objective-condition-steal-smsliver-title = Cut off a sliver from the supermatter crystal.
objective-condition-steal-smsliver-description = Use any cutting tool that comes in handy. A scalpel is more recommended. Also, don't die of radiation poisoning.
33 changes: 26 additions & 7 deletions Resources/Locale/en-US/supermatter/supermatter.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
supermatter-self = Supermatter
supermatter-danger-message = Danger! Crystal hyperstructure integrity faltering! Integrity: { $integrity }%
supermatter-warning-message = WARNING! Crystal hyperstructure integrity reaching critical levels! Integrity: { $integrity }%
supermatter-safe-alert = Crystalline hyperstructure returning to safe operating parameters. Failsafe has been Disengaged. Integrity: { $integrity }%
supermatter-delamination-overmass = The Supermatter has Reached Critical Mass Falure. Singularity formation Imminent
supermatter-delamination-default = The Supermatter has Reached Critical Integrity Falure. Emergency Causality Destabilization Field has been Activated.
supermatter-seconds-before-delam = { $Seconds } Seconds Remain Before Delamination.
supermatter-announcer = Automatic Supermatter Engine
supermatter-examine-integrity =
It's integrity is [color=yellow]{$integrity}%[/color].
supermatter-warning =
Warning! Crystal hyperstructure integrity faltering! Integrity: {$integrity}%.
supermatter-emergency =
DANGER! Crystal hyperstructure integrity reaching critical levels! Integrity: {$integrity}%.
supermatter-delam-explosion =
CRYSTAL DELAMINATION IMMINENT! The crystal has reached critical integrity failure! Emergency causality destabilization field has been engaged.
supermatter-delam-overmass =
CRYSTAL DELAMINATION IMMINENT! Crystal hyperstructure integrity has reached critical mass failure! Singularity formation imminent!
supermatter-delam-tesla =
CRYSTAL DELAMINATION IMMINENT! Crystal hyperstructure integrity has reached critical power surge failure! Energy ball formation imminent!
supermatter-delam-cascade =
CRYSTAL DELAMINATION IMMINENT! Harmonic frequency limits exceeded, casualty destabilization field could not be engaged!
supermatter-delam-cancel =
Crystalline hyperstructure returning to safe operating parameters. Failsafe has been Disengaged. Integrity: {$integrity}%.
supermatter-seconds-before-delam =
Estimated time before delamination: {$seconds} seconds.
supermatter-tamper-begin =
You begin carefully cutting a piece off the supermatter crystal...
supermatter-tamper-end =
You feel the power of a thousand suns laying on your palms. Or is it all the radiation?
supermatter-announcement-cc-tamper =
Our automatic casualty system has detected that the supermatter crystal structural integrity was compromised by an external force.
Engineering department, report to the supermatter engine immediately.
Loading
Loading