Merge branch 'upstreammerge' of https://github.com/Aidenkrz/Doob-Stat…

…ion-MRP into upstreammerge

.github/workflows/changelog.yml

@@ -1,4 +1,3 @@
-# From https://github.com/DeltaV-Station/Delta-v/
 name: PR Changelogs
 concurrency: commit_action
 on:
@@ -17,41 +16,41 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Master
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: "${{ vars.CHANGELOG_BRANCH }}"
+    - name: Checkout Master
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.BOT_TOKEN }}
+        ref: ${{ vars.CHANGELOG_BRANCH }}
 
-      - name: Setup Git
-        run: |
-          git config --global user.name "${{ vars.CHANGELOG_USER }}"
-          git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
-        shell: bash
+    - name: Setup Git
+      run: |
+        git config --global user.name "${{ vars.CHANGELOG_USER }}"
+        git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
+      shell: bash
 
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
 
-      - name: Install Dependencies
-        run: |
-          cd "Tools/changelog"
-          npm install
-        shell: bash
-        continue-on-error: true
+    - name: Install Dependencies
+      run: |
+        cd "Tools/changelogs"
+        npm install
+      shell: bash
 
-      - name: Generate Changelog
-        run: |
-          cd "Tools/changelog"
-          node changelog.js
-        shell: bash
-        continue-on-error: true
+    - name: Generate Changelog
+      run: |
+        cd "Tools/changelogs"
+        node changelog.js
+      shell: bash
 
-      - name: Commit Changelog
-        run: |
-          git add *.yml
-          git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
-          git push
-        shell: bash
-        continue-on-error: true
+    - name: Commit Changelog
+      run: |
+        git pull origin ${{ vars.CHANGELOG_BRANCH }}
+        git add *.yml
+        git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
+        git push
+      shell: bash
+      continue-on-error: true
+

.github/workflows/discord-changelog.yml

@@ -13,12 +13,12 @@ jobs:
     - name: checkout
       uses: actions/checkout@v3
       with:
-        ref: master
+        ref: ${{ vars.CHANGELOG_BRANCH }}
 
     - name: Publish changelog
       run: Tools/actions_changelogs_since_last_run.py
       env:
         CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
-        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
+        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
         GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
     continue-on-error: true

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |

README.md

@@ -1,9 +1,9 @@
-<p align="center"> <img alt="Goob Station 14" width="880" height="300" src="https://github.com/Goob-Station/Goob-Station/blob/master/Resources/Textures/Logo/logo.png" /></p>
+<p align="center"> <img alt="Goob Station 14" width="880" height="300" src="https://github.com/Goob-Station/Goob-Station-MRP/blob/main/Resources/Textures/Logo/logo.png" /></p>
 
 This is a fork from the primary repo for Einstein Engines.
 
 Space Station 14 is inspired heavily by Space Station 13 and runs on [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), a homegrown engine written in C#.
-To prevent people forking RobustToolbox, a "content" pack is loaded by the client and server. This content pack contains everything needed to play the game on one specific server this is the content pack for Goob Station.
+To prevent people forking RobustToolbox, a "content" pack is loaded by the client and server. This content pack contains everything needed to play the game on one specific server, in this case Goob Station.
 
 ## Links
 

Resources/Audio/Lobby/attributions.yml

@@ -1,4 +1,9 @@
-- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "All songs used are produced by Danya Vodovoz, royalty free."
-  source: "https://soundcloud.com/danyavodovoz"
+- files: ["bach-toccata.ogg", "vivaldi-spring.ogg", "vivaldi-winter.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Gregor Quendel"
+  source: "https://freemusicarchive.org"
+
+- files: ["vivaldi-credo-et-carnatust.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "Advent Chamber Orchestra"
+  source: "https://freemusicarchive.org"

Resources/Audio/StationEvents/attributions.yml

@@ -1,14 +1,4 @@
-- files: ["running_out.ogg"]
+- files: ["hallofthemountainking.ogg.ogg"]
   license: "CC-BY-3.0"
-  copyright: "Created by Bolgarich"
-  source: "https://www.youtube.com/watch?v=SzEp2nv6oZ4"
-
-- files: ["clearly_nuclear.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Created by mryikes"
-  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
-
-- files: ["chip_nightmare.ogg"]
-  license: "CC-BY-SA-4.0"
-  copyright: "Created by BasedUser on top of chip-meltdown.mod by Reanimator (Thom)."
-  source: "http://ygg.baseduser.eu.org/chip-nightmare_ss14.ogg"
+  copyright: "Created by Kevin MacLeod"
+  source: "https://www.youtube.com/watch?v=2RDX5sVEfs4"

Resources/Changelog/GoobChangelog.yml

@@ -0,0 +1,37 @@
+Entries:
+- author: God
+  changes:
+    - type: Remove
+      message: ERP
+  id: 3
+  time: '2024-06-15T12:54:44.0000000+00:00'
+- author: Yakub
+  changes:
+    - type: Add
+      message: Added automated changelogs yay
+  id: 4
+  time: '2024-10-18T15:35:05.0000000+00:00'
+  url: https://github.com/Goob-Station/Goob-Station-MRP/pull/9
+- author: Piras314
+  changes:
+    - type: Add
+      message: Absolutely nothing
+  id: 5
+  time: '2024-10-18T15:55:01.0000000+00:00'
+  url: https://github.com/Goob-Station/Goob-Station-MRP/pull/10
+- author: starch
+  changes:
+    - type: Tweak
+      message: changed role-timers to be more fitting for the shittery
+  id: 6
+  time: '2024-10-30T23:31:29.0000000+00:00'
+  url: https://github.com/Goob-Station/Goob-Station-MRP/pull/12
+- author: Ducks
+  changes:
+    - type: Tweak
+      message: Rebalanced Rifle damages.
+    - type: Tweak
+      message: Uranium rounds now pierce armor, but do less damage.
+  id: 7
+  time: '2024-10-30T23:31:48.0000000+00:00'
+  url: https://github.com/Goob-Station/Goob-Station-MRP/pull/11

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -11,11 +11,19 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -50
   - type: Gun
-    fireRate: 2
+    minAngle: 21
+    maxAngle: 54
+    angleIncrease: 6
+    angleDecay: 24
+    fireRate: 6
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    - Burst
   - type: ChamberMagazineAmmoProvider
   - type: ItemSlots
     slots:

Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml

@@ -6,16 +6,15 @@
   requirements:
     - !type:CharacterPlaytimeRequirement
       tracker: JobClerk
-      min: 36000 # 10 hours
+      min: 18000 # 5 hours
     - !type:CharacterPlaytimeRequirement
       tracker: JobLawyer
-      min: 36000 # 10 hours
+      min: 18000 # 5 hours
     - !type:CharacterPlaytimeRequirement
       tracker: JobProsecutor
-      min: 36000 # 10 hours
+      min: 18000 # 5 hours
     - !type:CharacterOverallTimeRequirement
-      min: 90000 # 25 hours
-    - !type:CharacterWhitelistRequirement # whitelist requirement because I don't want any dingus judges
+      min: 54000 # 15 hours
   weight: 20
   startingGear: CJGear
   icon: "JobIconChiefJustice"

Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml

@@ -7,13 +7,13 @@
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Security
-      min: 36000 # 10 hrs
+      min: 18000 # 5 hours
     - !type:CharacterPlaytimeRequirement
       tracker: JobLawyer
-      min: 36000 # 10 hours
+      min: 10800 # 3 hours
     - !type:CharacterPlaytimeRequirement
       tracker: JobProsecutor
-      min: 36000 # 10 hours
+      min: 18000 # 5 hours
 
 
   startingGear: ClerkGear

Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml

@@ -5,7 +5,7 @@
   playTimeTracker: JobProsecutor
   requirements:
     - !type:CharacterOverallTimeRequirement
-      min: 36000 # 10 hrs
+      min: 18000 # 5 hrs
   startingGear: ProsecutorGear
   icon: "JobIconProsecutor"
   supervisors: job-supervisors-cj

Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml

@@ -6,7 +6,7 @@
   playTimeTracker: JobMedicalBorg
   requirements:
     - !type:CharacterOverallTimeRequirement
-      min: 216000 #60 hrs
+      min: 180000 #30 hrs - same as normal borg
     - !type:DepartmentTimeRequirement
       department: Medical
       min: 21600 #6 hrs

Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      min: 21600 # 6 hrs
+      min: 18000 # 4 hrs
     - !type:DepartmentTimeRequirement
       department: Security
       min: 18000 # 4 hrs

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml

@@ -1,3 +1,4 @@
+# pretty sure this is unused lmao
 - type: entity
   id: BulletHeavyRifle
   name: bullet (.20 rifle)
@@ -8,7 +9,7 @@
     damage:
       types:
         Piercing: 19
-
+# least minigun still exists
 - type: entity
   id: BulletMinigun
   name: minigun bullet (.10 rifle)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml

@@ -1,17 +1,18 @@
+# Used by the Vulcan, L6SAW, Mark 1, Ceremonial Mark 1, and the AKMS. Basically just all .30 rifles.
 - type: entity
   id: BulletLightRifle
-  name: bullet (.20 rifle)
+  name: bullet (.30 rifle)
   parent: BaseBullet
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Piercing: 19
+        Piercing: 24
 
 - type: entity
   id: BulletLightRiflePractice
-  name: bullet (.20 rifle practice)
+  name: bullet (.30 rifle practice)
   parent: BaseBulletPractice
   noSpawn: true
   components:
@@ -22,7 +23,7 @@
 
 - type: entity
   id: BulletLightRifleRubber
-  name: bullet (.20 rifle rubber)
+  name: bullet (.30 rifle rubber)
   parent: BaseBulletRubber
   noSpawn: true
   components:
@@ -34,23 +35,24 @@
 - type: entity
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
-  name: bullet (.20 rifle incendiary)
+  name: bullet (.30 rifle incendiary)
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Heat: 16
+        Blunt: 5
+        Heat: 19
 
 - type: entity
   id: BulletLightRifleUranium
   parent: BaseBulletUranium
-  name: bullet (.20 rifle uranium)
+  name: bullet (.30 rifle uranium)
   noSpawn: true
   components:
   - type: Projectile
     damage:
       types:
-        Radiation: 9
-        Piercing: 10
+        Radiation: 10
+        Piercing: 5
+    ignoreResistances: true