удаление щита противопульного

Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml

@@ -32,7 +32,7 @@
   - type: Construction
     node: security
   - type: AccessReader
-    access: [["Secutity"], ["Command"], ["Research"]]
+    access: [["Security"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgTall
   - type: InteractionPopup

Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: ADTInfCablecuffs
   parent: Zipties
-  sufix: lingering, 1
+  suffix: lingering, 1
   components:
   - type: Handcuff
     breakoutTime: 3
@@ -31,4 +31,3 @@
   icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff }
   spawn: Zipties
   maxCount: 5
-  itemSize: 2

Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -17,7 +17,6 @@
     - state: security
     - state: icons-detentions
   - type: ItemBorgModule
-    handCounher: 2
     items:
     - ADTInfCablecuffs
     - ADTtelescopicBaton
@@ -33,7 +32,6 @@
     - state: security
     - state: icons-harm
   - type: ItemBorgModule
-    handCounher: 2
     items:
     - Truncheon
     - ADTWeaponLaserCarbineBorg
@@ -48,7 +46,6 @@
     - state: security
     - state: icons-disabler
   - type: ItemBorgModule
-    handCounher: 2
     items:
     - ADTInfCablecuffs
     - ADTWeaponDisablerBorg

Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml

@@ -6,8 +6,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_l_arm
-    - type: Icon
-      state: security_l_arm
     - type: Tag
       tags:
         - Trash
@@ -22,8 +20,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_r_arm
-    - type: Icon
-      state: security_r_arm
     - type: Tag
       tags:
         - Trash
@@ -38,8 +34,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_l_leg
-    - type: Icon
-      state: securityy_l_leg
     - type: Tag
       tags:
         - Trash
@@ -54,8 +48,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_r_leg
-    - type: Icon
-      state: security_r_leg
     - type: Tag
       tags:
         - Trash
@@ -70,8 +62,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_head
-    - type: Icon
-      state: security_head
     - type: Tag
       tags:
         - Trash
@@ -86,8 +76,6 @@
     - type: Sprite
       sprite: Objects/Specific/Robotics/cyborg_parts.rsi
       state: security_chest
-    - type: Icon
-      state: security_chest
     - type: Tag
       tags:
         - Trash

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml

@@ -18,7 +18,7 @@
     Zipties: 12
     RiotShield: 2
     RiotLaserShield: 2
-    RiotBulletShield: 2
+    # RiotBulletShield: 2 ADT no nullet shield
     RadioHandheldSecurity: 5
     Bola: 5 #ADT tweak
   # security officers need to follow a diet regimen!

Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml

@@ -1,4 +1,4 @@
-# Security 
+# Security
 - type: entity
   name: security loot spawner
   suffix: Gear, Simple
@@ -52,7 +52,7 @@
         - SecurityWhistle
         - Tourniquet
       chance: 0.85
- 
+
 # Armory loot spawner
 # Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill.
 - type: entity
@@ -76,7 +76,7 @@
       rareChance: 0.05
       prototypes:
         - RiotShield
-        - RiotBulletShield
+        # - RiotBulletShield ADT no nullet shield
         - RiotLaserShield
         - ClothingHeadHelmetBasic
         - ClothingHeadHelmetRiot
@@ -137,12 +137,12 @@
       rareChance: 0.05
       prototypes:
         - RiotShield
-        - RiotBulletShield
+        # - RiotBulletShield ADT no nullet shield
         - RiotLaserShield
         - ClothingHeadHelmetBasic
         - ClothingHeadHelmetRiot
         - ClothingOuterArmorBasic
         - ClothingOuterArmorRiot
         - ClothingOuterArmorBulletproof
       chance: 0.95
-      offset: 0.0
+      offset: 0.0

Resources/Prototypes/Entities/Objects/Shields/shields.yml

@@ -126,13 +126,13 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 3.6
-          Slash: 3.6
+          Blunt: 1.3
+          Slash: 1.3
           Piercing: 0.7
       activeBlockModifier:
         coefficients:
-          Blunt: 3.6
-          Slash: 3.6
+          Blunt: 1.3
+          Slash: 1.3
           Piercing: 0.5
         flatReductions:
           Piercing: 1

Resources/Prototypes/Entities/Objects/Tools/emag.yml

@@ -39,5 +39,5 @@
   id: Emag
   suffix: Limited
   components:
-  - type: LimitedCharges
-  - type: AutoRecharge
+    - type: LimitedCharges
+    - type: AutoRecharge

Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3",
+  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, riot taken from https://github.com/tgstation/tgstation/commit/6323ee68d9c893bd096b17a86470695038826143",
   "size": {
     "x": 32,
     "y": 32

Resources/migration.yml

@@ -469,4 +469,8 @@ LGBTQFlag: DrinkBottleVodka
 ClothingOuterArmorHeavy: null
 ClothingOuterArmorHeavyRed: null
 ClothingOuterArmorHeavyGreen: null
+
+#2024-09-06
+
+RiotBulletShield:
 #ADT end