Merge branch 'FixEmotes' of https://github.com/Rinary1/space-sunrise …

…into FixEmotes
space-sunrise · Jul 18, 2024 · 7ab84c5 · 7ab84c5
2 parents 9f89831 + cfacd6b
commit 7ab84c5
Show file tree

Hide file tree

Showing 817 changed files with 2,703 additions and 2,254 deletions.
diff --git a/Resources/Prototypes/_Sunrise/secret_weights.yml b/Resources/Prototypes/_Sunrise/secret_weights.yml
@@ -1,17 +1,17 @@
 - type: weightedRandom
   id: SunriseSecret
   weights:
-    Nukeops: 0.08
-    Traitor: 0.55
-    Zombie: 0.05
-    Survival: 0.03
-    Revolutionary: 0.04
-    Greenshift: 0.25
+    Nukeops: 0.06
+    Traitor: 0.53
+    Revolutionary: 0.06
+    Extended: 0.30
+    Greenshift: 0.05
 
 - type: weightedRandom
   id: LustSecret
   weights:
-    Traitor: 0.49
-    Greenshift: 0.49
-    Nukeops: 0.01
-    Revolutionary: 0.01
+    Traitor: 0.40
+    Greenshift: 0.35
+    Nukeops: 0.02
+    Revolutionary: 0.02
+    Extended: 0.20
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
diff --git a/...Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png b/...Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png
diff --git a/...rces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png b/...rces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png
diff --git a/...tures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png b/...tures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png
diff --git a/...s/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png b/...s/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
@@ -27,7 +27,8 @@
             "directions": 4
         },
         {
-            "name": "open_unlit"
+            "name": "open_unlit",
+            "directions": 4
         },
         {
             "name": "closing",
@@ -107,7 +108,25 @@
         },
         {
             "name": "deny_unlit",
-            "directions": 4
+            "directions": 4,
+            "delays": [
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ]
+            ]
         },
         {
             "name": "open",
@@ -283,31 +302,31 @@
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ]
             ]
         },
@@ -359,71 +378,37 @@
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ]
             ]
         },
         {
             "name": "sparks_open",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "welded",
@@ -452,7 +437,8 @@
             ]
         },
         {
-            "name": "emergency_open_unlit"
+            "name": "emergency_open_unlit",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png
diff --git a/...es/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png b/...es/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png
diff --git a/...urces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png b/...urces/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json
@@ -27,7 +27,8 @@
             "directions": 4
         },
         {
-            "name": "open_unlit"
+            "name": "open_unlit",
+            "directions": 4
         },
         {
             "name": "closing",
@@ -107,7 +108,25 @@
         },
         {
             "name": "deny_unlit",
-            "directions": 4
+            "directions": 4,
+            "delays": [
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ],
+                [
+                    1.2,
+                    1.2
+                ]
+            ]
         },
         {
             "name": "open",
@@ -283,31 +302,31 @@
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ]
             ]
         },
@@ -359,71 +378,37 @@
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ],
                 [
                     0.1,
                     0.1,
                     0.1,
                     0.1,
                     0.1,
-                    0.1
+                    1.7
                 ]
             ]
         },
         {
             "name": "sparks_open",
-            "directions": 4,
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ],
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
+            "directions": 4
         },
         {
             "name": "welded",
@@ -452,7 +437,8 @@
             ]
         },
         {
-            "name": "emergency_open_unlit"
+            "name": "emergency_open_unlit",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png
diff --git a/...ces/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png b/...ces/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png