Багфиксы и всякое (#47)

* - tweak: Tweak CPR speed. * - fix: Cult action fix. * Revert "Put entity resetting behind command flag (#24436)" This reverts commit 5267d3c601. * - fix: Mindshield fixes. * - tweak: Give security security glasses. * - fix: Fix warning. * - fix: Fix ling TTS. * - fix: Fix gun cycle. * - fix: Mark cultist and lings as antags. * - fix: Fix borg name. * - fix: Fix carrying throw. * - fix: Fix gun bolt with no mag.
2024-02-13 01:22:36 +09:00
parent a68c1d13b7
commit 5b4164e118
27 changed files with 60 additions and 70 deletions
--- a/Resources/Changelog/Parts/parts_22510.yaml
+++ b/Resources/Changelog/Parts/parts_22510.yaml
@@ -1,4 +0,0 @@
-author: ficcialfaint and deltanedas
-changes:
- type: Add
-  message: Criminal records and the console that manages them have been added to the game. They also have a guidebook entry.
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -237,14 +237,13 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
      - id: WeaponDisabler
      - id: ClothingOuterCoatHoSTrench
      - id: ClothingOuterHardsuitSecurityRed
      - id: ClothingMaskGasSwat
      - id: ClothingBeltSecurityFilled
      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingShoesBootsJack
      - id: CigarGoldCase
        prob: 0.50
@@ -263,7 +262,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
      - id: WeaponEgun
      - id: ClothingHeadHatBeretHoS
      - id: ClothingHeadHatHoshat
@@ -271,7 +269,7 @@
      - id: ClothingOuterCoatHoSTrench
      - id: ClothingBeltSecurityFilled
      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingShoesBootsJack
      - id: CigarGoldCase
        prob: 0.50
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -10,7 +10,7 @@
        prob: 0.3
      - id: ClothingBeltSecurityFilled
      - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
@@ -20,7 +20,6 @@
      - id: DoorRemoteArmory
      - id: ClothingOuterHardsuitWarden
      - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity
      - id: BoxBodyCamera

 - type: entity
@@ -36,7 +35,7 @@
      - id: ClothingHeadHatBeretWarden
      - id: ClothingBeltSecurityFilled
      - id: Flash
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
@@ -45,7 +44,6 @@
      - id: RubberStampWarden
      - id: DoorRemoteArmory
      - id: HoloprojectorSecurity
-      - id: ClothingEyesHudSecurity
      - id: BoxBodyCamera

 - type: entity
@@ -64,13 +62,12 @@
      - id: ClothingBeltSecurityFilled
      - id: Flash
        prob: 0.5
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetSecurity
      - id: ClothingHandsGlovesColorBlack
      - id: ClothingShoesBootsJack
      - id: WeaponMeleeNeedle
        prob: 0.1
-      - id: ClothingEyesHudSecurity
      - id: WeaponDisabler
      - id: HoloprojectorSecurity
        prob: 0.6
@@ -82,7 +79,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
      - id: WeaponDisabler
      - id: TrackingImplanter
        amount: 2
@@ -118,8 +114,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: ClothingEyesHudSecurity
-        prob: 0.3
      - id: ClothingHeadHatFedoraBrown
      - id: ClothingNeckTieDet
      - id: ClothingOuterVestDetective
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -12,6 +12,7 @@
    ClothingEyesGlassesSunglasses: 2
    ClothingEyesHudSecurity: 2
    ClothingEyesEyepatchHudSecurity: 1
+    ClothingEyesGlassesSecurity: 4
    ClothingBeltSecurityWebbing: 5
    Zipties: 12
    RiotShield: 2
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -29,8 +29,6 @@
  - Command
  - Brig
  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
  - !type:AddComponentSpecial
    components:
      - type: CommandStaff
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -51,8 +51,6 @@
  - Atmospherics
  - Medical
  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
  - !type:AddComponentSpecial
    components:
      - type: CommandStaff
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -31,8 +31,6 @@
  - Atmospherics
  - Brig
  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
  - !type:AddComponentSpecial
    components:
      - type: CommandStaff
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -28,8 +28,6 @@
  - ChiefMedicalOfficer
  - Brig
  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
  - !type:AddComponentSpecial
    components:
      - type: CommandStaff
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -25,8 +25,6 @@
  - ResearchDirector
  - Brig
  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
  - !type:AddComponentSpecial
    components:
      - type: CommandStaff
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -31,7 +31,7 @@
    jumpsuit: ClothingUniformJumpsuitDetective
    back: ClothingBackpackSecurityFilledDetective
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
    head: ClothingHeadHatFedoraBrown
    outerClothing: ClothingOuterVestDetective
    id: DetectivePDA
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -44,7 +44,7 @@
    back: ClothingBackpackHOSFilled
    shoes: ClothingShoesBootsCombatFilled
    outerClothing: ClothingOuterCoatHoSTrench
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
    head: ClothingHeadHatBeretHoS
    id: HoSPDA
    gloves: ClothingHandsGlovesCombat
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -29,7 +29,7 @@
    jumpsuit: ClothingUniformJumpsuitSec
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
    head: ClothingHeadHelmetBasic
    outerClothing: ClothingOuterArmorBasic
    id: SecurityPDA
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -32,7 +32,7 @@
    jumpsuit: ClothingUniformJumpsuitWarden
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
    outerClothing: ClothingOuterCoatWarden
    id: WardenPDA
    ears: ClothingHeadsetSecurity
--- a/Resources/clientCommandPerms.yml
+++ b/Resources/clientCommandPerms.yml
@@ -25,6 +25,8 @@
    - gcf
    - gc
    - gc_mode
+    - resetent
+    - resetallents
    - cvar
    - midipanic
    - replay_recording_start
@@ -50,8 +52,6 @@
    - hidemechanisms
    - showmechanisms
    - menuvis
-    - resetent
-    - resetallents
    - togglehealthoverlay
    - toggledecals
    - nodevis