[Repo] Merge Upstream

Content.Server/Administration/Systems/AdminVerbSystem.cs

@@ -221,7 +221,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
             var player = actor.PlayerSession;
 
             // Delete verb
-            if (_groupController.CanCommand(player, "deleteentity"))
+            if (_toolshed.ActivePermissionController?.CheckInvokable(new CommandSpec(_toolshed.GetCommand("delete"), null), player, out _) ?? false)
             {
                 Verb verb = new()
                 {
@@ -236,7 +236,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
             }
 
             // Rejuvenate verb
-            if (_groupController.CanCommand(player, "rejuvenate"))
+            if (_toolshed.ActivePermissionController?.CheckInvokable(new CommandSpec(_toolshed.GetCommand("rejuvenate"), null), player, out _) ?? false)
             {
                 Verb verb = new()
                 {

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/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/special.yml

@@ -50,7 +50,7 @@
 - type: startingGear
   id: HecateStartingGear
   equipment:
-    hat: ClothingHeadHatHairFlower
+    hat: ClothingHeadHatHairflower
     jumpsuit: ClothingCostumeArcDress
     shoes: ClothingShoesColorBlack
   innerclothingskirt: ClothingCostumeArcDress

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

@@ -5,11 +5,12 @@
   startingGear: MailCarrierGear
   playTimeTracker: JobMailCarrier
   icon: "MailCarrier"
-  supervisors: job-supervisors-hop
+  supervisors: job-supervisors-css
   access:
   - 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/Fun/misc_startinggear.yml

@@ -1,20 +1,20 @@
 #Misc outfit startingGear definitions.
 
-#IHS Void Suit Outfit
-- type: startingGear
-  id: IHSGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorBlack
-    back: ClothingBackpackFilled
-    head: ClothingHeadHelmetIHSVoidHelm
-    gloves: ClothingHandsGlovesIhscombat
-    outerClothing: IHSVoidsuit
-    shoes: ClothingShoesBootsJack
-    id: PassengerPDA
-    ears: ClothingHeadsetService
-  innerclothingskirt: ClothingUniformJumpskirtColorBlack
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+##IHS Void Suit Outfit
+#- type: startingGear
+#  id: IHSGear
+#  equipment:
+#    jumpsuit: ClothingUniformJumpsuitColorBlack
+#    back: ClothingBackpackFilled
+#    head: ClothingHeadHelmetIHSVoidHelm
+#    gloves: ClothingHandsGlovesIhscombat
+#    outerClothing: IHSVoidsuit
+#    shoes: ClothingShoesBootsJack
+#    id: PassengerPDA
+#    ears: ClothingHeadsetService
+#  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+#  satchel: ClothingBackpackSatchelFilled
+#  duffelbag: ClothingBackpackDuffelFilled
 
 #Skeleton Biker
 - type: startingGear
@@ -145,7 +145,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskBreathMedicalSecurity
+    mask: ClothingMaskBreathMedical
     eyes: ClothingEyesHudMedical
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -17,7 +17,7 @@
     back: ClothingBackpackFilled
     head: ClothingHeadSafari
     shoes: ClothingShoesColorWhite
-    id: ZookeeperPDA
+    # id: ZookeeperPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpsuitSafari
   satchel: ClothingBackpackSatchelFilled

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,