Merge remote-tracking branch 'upstream/master'

Resources/Audio/Nyanotrasen/Weapons/licenses.txt

@@ -1 +1,2 @@
-electricguitarhit.ogg is modified from a file made by guitarguy1985 at https://freesound.org/people/guitarguy1985/sounds/52391/ which is licensed under the Creative Commons 0 License. This modified file follows the same license.
+electricguitarhit.ogg is modified from a file made by guitarguy1985 at https://freesound.org/people/guitarguy1985/sounds/52391/ which is licensed under the Creative Commons 0 License. This modified file follows the same license.
+universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.

Resources/Maps/angle.yml

@@ -3996,6 +3996,7 @@ entities:
     - type: RadiationGridResistance
     - type: GasTileOverlay
     - type: SpreaderGrid
+    - type: PreventPilot
 - proto: AcousticGuitarInstrument
   entities:
   - uid: 4552
@@ -39611,11 +39612,6 @@ entities:
     - pos: 5.5,-22.5
       parent: 9
       type: Transform
-  - uid: 13486
-    components:
-    - pos: 1.5,-67.5
-      parent: 9
-      type: Transform
 - proto: ChemistryEmptyBottle01
   entities:
   - uid: 13494
@@ -103835,6 +103831,15 @@ entities:
     - pos: -1.5,-24.5
       parent: 9
       type: Transform
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 13486
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: 1.5,-67.5
+      parent: 9
+      type: Transform
 - proto: VendingMachineCigs
   entities:
   - uid: 873

Resources/Maps/hive.yml

@@ -406,8 +406,8 @@ entities:
             color: '#0000FBFF'
             id: ArrowsGreyscale
           decals:
-            5604: -52.228264,22.926834
-            5605: -51.759514,22.91641
+            5595: -52.228264,22.926834
+            5596: -51.759514,22.91641
         - node:
             angle: -7.853981633974483 rad
             color: '#52B4E996'
@@ -457,8 +457,8 @@ entities:
             color: '#FF2E26FF'
             id: ArrowsGreyscale
           decals:
-            5606: -38.229725,32.950005
-            5607: -37.760975,32.92916
+            5597: -38.229725,32.950005
+            5598: -37.760975,32.92916
         - node:
             color: '#FFFFFFFF'
             id: Basalt1
@@ -76111,20 +76111,20 @@ entities:
       type: Transform
     - enabled: True
       type: AmbientSound
-  - uid: 267
+  - uid: 264
     components:
     - rot: -1.5707963267948966 rad
-      pos: -43.5,24.5
+      pos: -41.5,26.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
-  - uid: 271
+  - uid: 267
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -45.5,26.5
+    - rot: -1.5707963267948966 rad
+      pos: -43.5,24.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'
@@ -104895,10 +104895,9 @@ entities:
       type: AtmosPipeColor
     - enabled: True
       type: AmbientSound
-  - uid: 266
+  - uid: 263
     components:
-    - rot: 3.141592653589793 rad
-      pos: -41.5,26.5
+    - pos: -45.5,26.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'
@@ -107763,7 +107762,7 @@ entities:
   - uid: 268
     components:
     - rot: -1.5707963267948966 rad
-      pos: -44.5,24.5
+      pos: -42.5,26.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'
@@ -107856,10 +107855,10 @@ entities:
       type: AtmosPipeColor
 - proto: GasThermoMachineHeater
   entities:
-  - uid: 263
+  - uid: 271
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -40.5,26.5
+    - rot: 1.5707963267948966 rad
+      pos: -46.5,26.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'
@@ -112823,10 +112822,10 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 264
+  - uid: 266
     components:
     - rot: -1.5707963267948966 rad
-      pos: -42.5,26.5
+      pos: -44.5,24.5
       parent: 1
       type: Transform
     - color: '#33FF33FF'

Resources/Maps/shoukou.yml

@@ -2952,6 +2952,7 @@ entities:
     - id: Shoukou
       type: BecomesStation
     - type: SpreaderGrid
+    - type: PreventPilot
   - uid: 35
     components:
     - type: MetaData
@@ -6361,6 +6362,13 @@ entities:
     - pos: -19.61977,7.4961514
       parent: 34
       type: Transform
+- proto: BoardGameSpawner
+  entities:
+  - uid: 4414
+    components:
+    - pos: 20.5,4.5
+      parent: 34
+      type: Transform
 - proto: Bookshelf
   entities:
   - uid: 2172
@@ -26436,11 +26444,6 @@ entities:
     - pos: -1.5,-27.5
       parent: 34
       type: Transform
-  - uid: 6120
-    components:
-    - pos: 10.5,10.5
-      parent: 34
-      type: Transform
 - proto: ChemistryEmptyBottle03
   entities:
   - uid: 6118
@@ -26460,13 +26463,6 @@ entities:
     - pos: -0.5,-26.5
       parent: 34
       type: Transform
-- proto: ChessBoard
-  entities:
-  - uid: 5043
-    components:
-    - pos: 20.496408,4.611505
-      parent: 34
-      type: Transform
 - proto: Cigar
   entities:
   - uid: 11126
@@ -62018,6 +62014,16 @@ entities:
     - pos: 8.5,-35.5
       parent: 34
       type: Transform
+  - uid: 4415
+    components:
+    - pos: 21.5,4.5
+      parent: 34
+      type: Transform
+  - uid: 5043
+    components:
+    - pos: 17.5,7.5
+      parent: 34
+      type: Transform
   - uid: 7151
     components:
     - pos: -36.5,-12.5
@@ -70074,6 +70080,15 @@ entities:
     - pos: -10.5,-48.5
       parent: 34
       type: Transform
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 4413
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: 10.5,10.5
+      parent: 34
+      type: Transform
 - proto: VendingMachineCigs
   entities:
   - uid: 800

Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -16,7 +16,7 @@
   - type: Gun
     fireRate: 3
     soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg
+      path: /Audio/Nyanotrasen/Weapons/Guns/Gunshots/universal.ogg
   - type: ItemSlots
     slots:
       gun_magazine:

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml

@@ -10,6 +10,7 @@
   - Cargo
   - Maintenance
   - Mail
+  - Service
 
 - type: startingGear
   id: MailCarrierGear

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -9,6 +9,7 @@
   access:
   - Cargo
   - Maintenance
+  - Service
   - External #should be removed once all maps update for no cargo shuttle
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -6,7 +6,7 @@
   startingGear: PassengerGear
   icon: "Passenger"
   supervisors: job-supervisors-everyone
-  extendedAccess:
+  access:
   - Maintenance
 
 - type: startingGear

Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json

@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
+    "license": "CC0-1.0",
     "copyright": "Original work by TJohnson.",
     "size": {
         "x": 32,