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

Supermatter Update #15291

Merged
merged 7 commits into from Jan 23, 2021
Merged

Conversation

Fox-McCloud
Copy link
Member

@Fox-McCloud Fox-McCloud commented Jan 14, 2021

Refactors and updates the Supermatter, from TG

So begins the ending of the age of the Singulo and Tesla

TG's supermatter fully replaces the singulo and Tesla. You will still be able to construct the singulo and Tesla, but it being a round-start engine available for players is gone (order it from cargo).

The supermatter is an engine that interacts with gas, pressure, and temperature, while giving off radiation. For those of you interested in the finer details of the engine, I recommend TG's guide: https://tgstation13.org/wiki/Guide_to_the_Supermatter

If the supermatter reaches critical point, it'll delaminate, causing a hug explosions while bathing the station in radiation and causing everyone to hallucinate.

If you managed to have a lot of gas in the chamber of the supermatter when it delaminates, it can compress down into a super singularity, which will begin consuming the station.

Alternatively, if the supermatter is particularly engergetic when it delamintes, it'll explode into an energy ball that'll begin shocking the station into oblivion.

pic:
img

🆑 Fox McCloud
add: Updates the supermatter
/:cl:

@Fox-McCloud Fox-McCloud added Feature This PR is a new addition to the game Map Edit This PR will modify a map Refactor This PR will clean up the code but have the same ingame outcome Work In Progress This PR is work in progress, and unfinished labels Jan 14, 2021
@Nazsgull
Copy link
Contributor

Nice! Hoping to see this ingame Soon™

@S34NW
Copy link
Member

S34NW commented Jan 14, 2021

:O here it is

@FreeStylaLT
Copy link
Contributor

image

@Qwertytoforty
Copy link
Contributor

image

@Muhdi345
Copy link

Oh god yes, gimme the real thing so I can experiment with it!

code/datums/looping_sounds/looping_sound.dm Outdated Show resolved Hide resolved
code/modules/countdown/countdown.dm Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
@AffectedArc07
Copy link
Member

Also did you forget the boxstation map edits?

@Varghh
Copy link
Contributor

Varghh commented Jan 14, 2021

There it is dooooooood

@SteelSlayer
Copy link
Member

@AffectedArc07 from description:

"Marke as WIP as I still need to test this---this does NOT map it in with a mapping update; this is to get things in a functional state, code and machinery wise, before I actually map this nonsense in, again---also there's a number of things I still need to update on the supermatter, itself, so please hold comments until the WIP label is removed, unless there's something, very obviously, wrong."

@Kiyahitayika
Copy link
Contributor

This is seriously exciting.

@Fox-McCloud Fox-McCloud added BoxStation This PR will edit the map BoxStation (Cyberiad) DeltaStation This PR will edit the map DeltaStation (Kerberos) Port This PR is from another server, or heavily inspired/adapted. and removed Work In Progress This PR is work in progress, and unfinished labels Jan 17, 2021
@Wojz
Copy link

Wojz commented Jan 17, 2021

happening

///Our soundloop
var/datum/looping_sound/supermatter/soundloop
///Can it be moved?
var/moveable = FALSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redundant by anchored?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, this is for if you want the SM to be anchorable or not---the engine, for example, can't be unanchored; the one you purchase from cargo, however, can.

code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
code/modules/power/supermatter/supermatter.dm Outdated Show resolved Hide resolved
@denghis1
Copy link
Contributor

Just played around a bit with this, and i really like it!
The only thing i wonder about, is the remap of secure storage, there are a few notable items now that are missing (unless i have overlooked something), mainly the extra hardsuits, the emergency floodlights, and the building materials that used to be on the engineering sat (but was moved to secure storage when that was removed)
Old:
image
New:
image

Amazing work so far though!

@AffectedArc07 AffectedArc07 merged commit bcc496e into ParadiseSS13:master Jan 23, 2021
@Fox-McCloud
Copy link
Member Author

Finally.

Good freaking riddance. This held me up too long.

@Mitchs98
Copy link
Contributor

datlo pushed a commit to datlo/Paradise that referenced this pull request Feb 2, 2021
* Supermatter Update

* tweaks and updates

* mapping it in

* tweaks and fixes

* one last thing

* final touches

* what? NO
@Fox-McCloud Fox-McCloud deleted the supermatter-machinery branch September 25, 2021 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BoxStation This PR will edit the map BoxStation (Cyberiad) DeltaStation This PR will edit the map DeltaStation (Kerberos) Feature This PR is a new addition to the game Map Edit This PR will modify a map Port This PR is from another server, or heavily inspired/adapted. Refactor This PR will clean up the code but have the same ingame outcome
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet