more SM stuff (space-wizards#359)

* fart * god * ok * Fix bagel. * This goober managed to delete bagel/fland/oasis from his maps folder some how --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <aiden@djkraz.com>
Ilya246 · Jun 26, 2024 · 4f267f6 · 4f267f6
1 parent 37f8543
commit 4f267f6
Show file tree

Hide file tree

Showing 14 changed files with 561,972 additions and 475 deletions.
diff --git a/Content.Server/Goobstation/Supermatter/Systems/SupermatterSystem.cs b/Content.Server/Goobstation/Supermatter/Systems/SupermatterSystem.cs
diff --git a/Resources/Maps/Goobstation/bagel.yml b/Resources/Maps/Goobstation/bagel.yml
diff --git a/Resources/Maps/Goobstation/fland.yml b/Resources/Maps/Goobstation/fland.yml
diff --git a/Resources/Maps/Goobstation/oasis.yml b/Resources/Maps/Goobstation/oasis.yml
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
diff --git a/Resources/Prototypes/Goobstation/Entities/Supermatter/supermatter.yml b/Resources/Prototypes/Goobstation/Entities/Supermatter/supermatter.yml
@@ -65,3 +65,6 @@
       totalIntensity: 10000
     - type: GuideHelp
       guides: [ Supermatter, Power ]
+    - type: WarpPoint
+      follow: true
+      location: supermatter
diff --git a/Resources/Prototypes/Goobstation/Maps/flandhighpop.yml b/Resources/Prototypes/Goobstation/Maps/flandhighpop.yml
@@ -1,7 +1,7 @@
 - type: gameMap
   id: FlandHighPop
   mapName: 'Fland Installation'
-  mapPath: /Maps/fland.yml
+  mapPath: /Maps/Goobstation/fland.yml
   minPlayers: 85
   stations:
     Fland:

diff --git a/Resources/Prototypes/Goobstation/Maps/oasishighpop.yml b/Resources/Prototypes/Goobstation/Maps/oasishighpop.yml
@@ -1,7 +1,7 @@
 - type: gameMap
   id: OasisHighPop
   mapName: 'Oasis'
-  mapPath: /Maps/oasis.yml
+  mapPath: /Maps/Goobstation/oasis.yml
   minPlayers: 85
   stations:
     Oasis:

diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml
@@ -1,7 +1,7 @@
 - type: gameMap
   id: Bagel
   mapName: 'Bagel Station'
-  mapPath: /Maps/bagel.yml
+  mapPath: /Maps/Goobstation/bagel.yml # Goobstation - SM
   minPlayers: 0
   maxPlayers: 85 # Goobstation - Limit mappool to highpop versions of maps only
   stations:

diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
@@ -1,7 +1,7 @@
 - type: gameMap
   id: Fland
   mapName: 'Fland Installation'
-  mapPath: /Maps/fland.yml
+  mapPath: /Maps/Goobstation/fland.yml # Goobstation - SM
   minPlayers: 0
   maxPlayers: 85 # Goobstation - Limit mappool to highpop versions of maps only
   stations:

diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml
@@ -1,7 +1,7 @@
 - type: gameMap
   id: Oasis
   mapName: 'Oasis'
-  mapPath: /Maps/oasis.yml
+  mapPath: /Maps/Goobstation/oasis.yml # Goobstation - SM
   minPlayers: 0
   maxPlayers: 85 # Goobstation - Limit mappool to highpop versions of maps only
   stations:

diff --git a/Resources/ServerInfo/Goobstation/Guidebook/Engineering/Supermatter.xml b/Resources/ServerInfo/Goobstation/Guidebook/Engineering/Supermatter.xml
@@ -1,15 +1,12 @@
 <Document>
 
-
   <GuideEntityEmbed Entity="Supermatter"/>
 
-  # The Supermatter Engine
-
-  So you've decided to take on the challenge and set up the Supermatter Engine? First, let's give you a short overview of the main Supermatter crystal beforehand.
+  So, you've decided to take on the challenge and set up the Supermatter Engine? First, let's give you a short overview of the main Supermatter crystal beforehand.
 
-  Its primary features are emitting electrical arcs that are harnessed to power the station through tesla coils.
+  Its primary feature is emitting radioactive background that is harnessed to power the station through radiation collectors.
 
-  Side effects include radiation emission, releasing hot oxygen and plasma, heating the air around, and exploding, transforming into a black hole or an energy ball and eating the entire station if you screw up hard enough.
+  Side effects include lightning strikes, releasing hot oxygen and plasma, heating the air around, exploding, transforming into a black hole or an energy ball and eating the entire station if you screw up hard enough.
 
   It begins inert but being hit by an object or a projectile will activate it and it'll start exhibiting nearly all of the aforementioned properties.