Merge remote-tracking branch 'sunrise-station-public/master' into sun…

…rise-public-master # Conflicts: # Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml
space-sunrise · Oct 30, 2024 · e332f2b · e332f2b
2 parents 4be9071 + 7456d4c
commit e332f2b
Show file tree

Hide file tree

Showing 11 changed files with 241 additions and 65 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -939,20 +939,6 @@
       - SpeedLoaderMagnumUranium
       - TelescopicShield
       - TimerTrigger
-      - BaseMagazinePistolCaselessRifleExtended
-      - MagazinePPSH41Extended
-      - MagazineMP5Extended
-      - MagazineMP7Extended
-      - MagazineP90Extended
-      - MagazineM16A4Extended
-      - MagazineAR18Extended
-      - MagazineM28Extended
-      - MagazineG36Extended
-      - MagazineFamasExtended
-      - MagazineV31Extended
-      - MagazineBauer127Extended
-      - MagazineBR64Extended
-      - MagazineDragunovExtended
       - Truncheon
       - VoiceTrigger
       - WeaponAdvancedLaser
@@ -961,6 +947,7 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponXrayCannon
+    # Sunrise-Start
       - WeaponMechCombatImmolationGun # Sunrise - Mechs
       - WeaponMechCombatSolarisLaser # Sunrise - Mechs
       - WeaponMechCombatFiredartLaser # Sunrise - Mechs
@@ -975,6 +962,21 @@
       - WeaponEnergyGunPistol # Sunrise - PDW-9 Energy Pistol
       - WeaponGunLaserCarbineAutomatic # Sunrise - IK-60 Laser Carbine
       - ClothingShoesBootsMagCombat # Sunrise - Combat Magboots
+      - BaseMagazinePistolCaselessRifleExtended
+      - MagazinePPSH41Extended
+      - MagazineMP5Extended
+      - MagazineMP7Extended
+      - MagazineP90Extended
+      - MagazineM16A4Extended
+      - MagazineAR18Extended
+      - MagazineM28Extended
+      - MagazineG36Extended
+      - MagazineFamasExtended
+      - MagazineV31Extended
+      - MagazineBauer127Extended
+      - MagazineBR64Extended
+      - MagazineDragunovExtended
+    # Sunrise-End
   - type: MaterialStorage
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -205,7 +205,7 @@
   id: Gygax
   name: research-technology-gygax
   icon:
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/gygax.rsi
     state: gygax
   discipline: Arsenal
   tier: 2
@@ -287,7 +287,7 @@
   id: Durand
   name: research-technology-durand
   icon:
-    sprite: Objects/Specific/Mech/mecha.rsi
+    sprite: Objects/Specific/Mech/durand.rsi
     state: durand
   discipline: Arsenal
   tier: 3

diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@@ -377,7 +377,7 @@
     Telecrystal: 11
   categories:
   - UplinkWeaponry
-  
+
 - type: listing
   id: UplinkHypo
   name: uplink-hypo-name
@@ -391,7 +391,7 @@
     Telecrystal: 4
   categories:
   - UplinkChemicals
-  
+
 - type: listing
   id: UplinkPolytrinicAcidChemistryBottle
   name: uplink-polytrinic-acid-chemistry-bottle-name
@@ -404,7 +404,7 @@
     Telecrystal: 8
   categories:
   - UplinkChemicals
-  
+
 - type: listing
   id: UplinkExplosiveCollarsKit
   name: uplink-exp-collars-kit-name
@@ -420,7 +420,7 @@
   conditions:
   - !type:StoreWhitelistCondition
     blacklist:
-    
+
 - type: listing
   id: UplinkBouquet
   name: uplink-bouquet-name
@@ -433,14 +433,14 @@
     Telecrystal: 1
   categories:
   - UplinkPointless
-  
+
 # Mechs
 
 - type: listing
   id: UplinkDarkGygax
   name: uplink-mech-teleporter-assault-name
   description: uplink-mech-teleporter-assault-desc
-  icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax }
+  icon: { sprite: /Textures/Objects/Specific/Mech/gygax.rsi, state: darkgygax }
   productEntity: CrateCybersunDarkGygaxBundle
   cost:
     Telecrystal: 65
@@ -451,12 +451,12 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
-  id: UplinkRover
+  id: UplinkDarkDurand
   name: uplink-mech-teleporter-medium-name
   description: uplink-mech-teleporter-medium-desc
-  icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: rover }
+  icon: { sprite: /Textures/Objects/Specific/Mech/durand.rsi, state: darkdurand }
   productEntity: CrateCybersunRoverBundle
   cost:
     Telecrystal: 75
@@ -483,9 +483,9 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 # Mechs equipment
-      
+
 - type: listing
   id: UplinkMechImmolationGun
   name: uplink-mech-equipment-immolation-gun-name
@@ -501,7 +501,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechTeslaCannon
   name: uplink-mech-equipment-tesla-cannon-name
@@ -517,7 +517,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechShotgun
   name: uplink-mech-equipment-shotgun-name
@@ -533,7 +533,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechShotgunIncendiary
   name: uplink-mech-equipment-shotgun-incendiary-name
@@ -549,7 +549,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechUltraRifle
   name: uplink-mech-equipment-ultra-rifle-name
@@ -565,7 +565,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechIon
   name: uplink-mech-equipment-ion-name
@@ -581,7 +581,7 @@
     whitelist:
       tags:
       - NukeOpsUplink
-      
+
 - type: listing
   id: UplinkMechAMLG90
   name: uplink-mech-equipment-amlg90-name

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/mech_spray_paint.yml
@@ -47,7 +47,7 @@
 - type: entity
   parent: MechPaintBase
   suffix: DEBUG, Ripley, Aluminizer
-  id: MechPaintClarkeOrangey
+  id: MechPaintRipleyAluminizer
   components:
   - type: Sprite
     sprite: _Sunrise/Objects/Fun/mech_spraycans/ripley.rsi
@@ -72,7 +72,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "aluminizer"}
           False: {state: "aluminizer-cap"}
-          
+
 # Ripley-Combat Ripley
 - type: entity
   parent: MechPaintBase
@@ -102,7 +102,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "combat-ripley"}
           False: {state: "combat-ripley-cap"}
-          
+
 # Ripley-Firestarter
 - type: entity
   parent: MechPaintBase
@@ -132,7 +132,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "firestarter"}
           False: {state: "firestarter-cap"}
-          
+
 # Ripley-Hauler
 - type: entity
   parent: MechPaintBase
@@ -162,7 +162,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "hauler"}
           False: {state: "hauler-cap"}
-          
+
 # Ripley-Reaper
 - type: entity
   parent: MechPaintBase
@@ -192,7 +192,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "reaper"}
           False: {state: "reaper-cap"}
-          
+
 # Ripley-Zairjah
 - type: entity
   parent: MechPaintBase
@@ -282,7 +282,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "pobeda"}
           False: {state: "pobeda-cap"}
-          
+
 #Gygax-Old
 
 - type: entity
@@ -312,7 +312,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "spray_colors" , color: "#ed5f3b"}
           False: {state: "spray_cap_colors" , color: "#ed5f3b"}
-          
+
 #Durand-Unathi
 
 - type: entity
@@ -342,7 +342,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "kharn"}
           False: {state: "kharn-cap"}
-          
+
 #Durand-Shire
 
 - type: entity
@@ -372,7 +372,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "shire"}
           False: {state: "shire-cap"}
-          
+
 #Durand-Dollhouse
 
 - type: entity
@@ -402,7 +402,7 @@
         enum.OpenableVisuals.Layer:
           True: {state: "dollhouse"}
           False: {state: "dollhouse-cap"}
-          
+
 #Durand-Executor
 
 - type: entity
@@ -431,4 +431,4 @@
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
           True: {state: "executioner"}
-          False: {state: "executioner-cap"}
+          False: {state: "executioner-cap"}
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -18,11 +18,11 @@
   - type: Projectile
     damage:
       types:
-        Piercing: 10
+        Piercing: 1
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    maxIntensity: 3
+    maxIntensity: 1
     intensitySlope: 1
     totalIntensity: 1
     maxTileBreak: 0

diff --git a/Resources/Prototypes/_Sunrise/Maps/cog.yml b/Resources/Prototypes/_Sunrise/Maps/cog.yml
@@ -27,31 +27,30 @@
             Chaplain: [ 1, 1 ]
             Reporter: [ 2, 2 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 3, 3 ]
-            Zookeeper: [ 1, 1 ] 
+            ServiceWorker: [ -1, -1 ]
+            Zookeeper: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
-            TechnicalAssistant: [ 3, 3 ]
+            TechnicalAssistant: [ -1, -1 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Chemist: [ 3, 3 ]
             MedicalDoctor: [ 4, 4 ]
-            MedicalIntern: [ 3, 3 ]
+            MedicalIntern: [ -1, -1 ]
             Psychologist: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
-            ResearchAssistant: [ 3, 3 ]
+            ResearchAssistant: [ -1, -1 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
-            SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            SecurityCadet: [ -1, -1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -90,3 +89,28 @@
             SeniorOfficer: [ 1, 1 ]
             # Sunrise-Science
             Roboticist: [ 2, 2 ]
+            # Sunrise-Command
+            Adjutant: [ 1, 1 ]
+            NanoTrasenRepresentative: [ 1, 1 ]
+        - type: StationGoal
+          goals:
+          - Shuttle
+          - Singularity
+          - SolarPanels
+          - Artifacts
+          - Bank
+          - Zoo
+          - MiningOutpost
+          - Tesla
+          - XenobiologyRepair
+          - VirusologyAmbusol
+          - Containment
+          - WeaponsSecurity
+          - MaintsRepair
+          - DormsBuild
+          - BattleShuttle
+          - Transit
+          - NukeRoom
+          - Permabrig
+          - Farm
+