хонки рулят (#764)

* Инспектор и травматический дробовик

Дайте деняг

* Йоу

* Фикс: уменьшен стан дамаг для травматического дробовика

* из Honk в White

* ди нах

* ыые

* Почистил говно

---------

Co-authored-by: Bombinos <Egorsergeev8@yandex.ru>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>

Resources/Maps/White/DryDock.yml

@@ -10860,8 +10860,8 @@ entities:
           -37,0:
             0: 48009
           -36,1:
-            2: 4096
+            2: 4128
-            0: 3300
+            0: 3268
           -37,1:
             0: 28851
           -36,2:
@@ -18416,6 +18416,18 @@ entities:
     - type: Transform
       pos: 12.8871565,-5.2782454
       parent: 17144
+- proto: BoxRubberShot
+  entities:
+  - uid: 17282
+    components:
+    - type: Transform
+      pos: -155.6516,7.5998025
+      parent: 2
+  - uid: 17283
+    components:
+    - type: Transform
+      pos: -155.35992,7.5685525
+      parent: 2
 - proto: BoxShotgunPractice
   entities:
   - uid: 921
@@ -47706,10 +47718,10 @@ entities:
       parent: 2
 - proto: ClosetLegalFilled
   entities:
-  - uid: 6584
+  - uid: 17276
     components:
     - type: Transform
-      pos: -142.5,5.5
+      pos: -142.5,3.5
       parent: 2
 - proto: ClosetMaintenance
   entities:
@@ -81064,8 +81076,7 @@ entities:
   - uid: 11429
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      pos: -134.33968,6.5407124
-      pos: -134.15556,6.36669
       parent: 2
 - proto: Jukebox
   entities:
@@ -82144,6 +82155,16 @@ entities:
     - type: PointLight
       color: '#D56C6CFF'
       enabled: True
+- proto: LockerInspectorFilled
+  entities:
+  - uid: 13551
+    components:
+    - type: Transform
+      pos: -142.5,5.5
+      parent: 2
+    - type: PointLight
+      color: '#D56C6CFF'
+      enabled: True
 - proto: LockerMedical
   entities:
   - uid: 6685
@@ -94809,6 +94830,13 @@ entities:
     - type: Transform
       pos: -155.5,16.5
       parent: 2
+- proto: SpawnPointInspector
+  entities:
+  - uid: 17277
+    components:
+    - type: Transform
+      pos: -140.5,5.5
+      parent: 2
 - proto: SpawnPointJanitor
   entities:
   - uid: 13548
@@ -94823,16 +94851,16 @@ entities:
       parent: 2
 - proto: SpawnPointLawyer
   entities:
+  - uid: 6584
+    components:
+    - type: Transform
+      pos: -144.5,2.5
+      parent: 2
   - uid: 13550
     components:
     - type: Transform
       pos: -142.5,0.5
       parent: 2
-  - uid: 13551
-    components:
-    - type: Transform
-      pos: -140.5,5.5
-      parent: 2
 - proto: SpawnPointLibrarian
   entities:
   - uid: 13552
@@ -97633,6 +97661,16 @@ entities:
     - type: Transform
       pos: 15.5,-1.5
       parent: 17144
+  - uid: 17278
+    components:
+    - type: Transform
+      pos: -154.5,7.5
+      parent: 2
+  - uid: 17279
+    components:
+    - type: Transform
+      pos: -155.5,7.5
+      parent: 2
 - proto: TableBrass
   entities:
   - uid: 13944
@@ -114085,6 +114123,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -149.58974,10.572603
       parent: 2
+- proto: WeaponRubberShotgun
+  entities:
+  - uid: 17280
+    components:
+    - type: Transform
+      pos: -154.60992,7.8289695
+      parent: 2
+  - uid: 17281
+    components:
+    - type: Transform
+      pos: -154.48492,7.495636
+      parent: 2
 - proto: WeaponRevolverMateba
   entities:
   - uid: 11349

Resources/Maps/White/Whitebox.yml

@@ -77,7 +77,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: hAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAChAAAAAAAJQAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAADJQAAAAAAhAAAAAAAJQAAAAAAJQAAAAAAhAAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAABhAAAAAAAJQAAAAAAXgAAAAACJQAAAAACXgAAAAACJQAAAAABXgAAAAADJQAAAAAChAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAABhAAAAAAAXgAAAAADhAAAAAAAhAAAAAAAJQAAAAADXgAAAAADJQAAAAACXgAAAAAAJQAAAAADXgAAAAAAJQAAAAAAhAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAAChAAAAAAAXgAAAAACXgAAAAABhAAAAAAAJQAAAAABXgAAAAABJQAAAAABXgAAAAAAJQAAAAAAXgAAAAACJQAAAAAChAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAADhAAAAAAAXgAAAAAAXgAAAAAChAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAADhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAJQAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAADJQAAAAADhAAAAAAAJQAAAAABXgAAAAACXgAAAAADXgAAAAADhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAJQAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAAAJQAAAAAChAAAAAAAJQAAAAADXgAAAAADXgAAAAAAXgAAAAADhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAADXgAAAAADXgAAAAAAXgAAAAADhAAAAAAAXgAAAAACXgAAAAAAhAAAAAAAJQAAAAACJQAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAAAJQAAAAABhAAAAAAAXgAAAAAAXgAAAAACXgAAAAABJQAAAAADhAAAAAAAXgAAAAACXgAAAAABhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABXgAAAAADhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAXgAAAAABhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAXgAAAAADhAAAAAAAAQAAAAAAhAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAhAAAAAAAdAAAAAACdAAAAAAChAAAAAAAXgAAAAADAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABXgAAAAAAhAAAAAAAAQAAAAAAhAAAAAAAhAAAAAAAXgAAAAABhAAAAAAAhAAAAAAAdAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAADXgAAAAAChAAAAAAAgQAAAAAChAAAAAAAXgAAAAACXgAAAAAAAQAAAAAAhAAAAAAAAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABXgAAAAAB
+          tiles: hAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAChAAAAAAAJQAAAAACXgAAAAACXgAAAAABXgAAAAABXgAAAAABXgAAAAADJQAAAAAAhAAAAAAAJQAAAAAAJQAAAAAAhAAAAAAAXgAAAAABXgAAAAAAXgAAAAADXgAAAAABhAAAAAAAJQAAAAAAXgAAAAACJQAAAAACXgAAAAACJQAAAAABXgAAAAADJQAAAAAChAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAABhAAAAAAAXgAAAAADhAAAAAAAhAAAAAAAJQAAAAADXgAAAAADJQAAAAACXgAAAAAAJQAAAAADXgAAAAAAJQAAAAAAhAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAAChAAAAAAAXgAAAAACXgAAAAABhAAAAAAAJQAAAAABXgAAAAABJQAAAAABXgAAAAAAJQAAAAAAXgAAAAACJQAAAAAChAAAAAAAXgAAAAAAXgAAAAAAhAAAAAAAXgAAAAADhAAAAAAAXgAAAAAAXgAAAAAChAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAADhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAXgAAAAAAhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAJQAAAAACXgAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAADJQAAAAADhAAAAAAAJQAAAAABXgAAAAACXgAAAAADXgAAAAADhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAJQAAAAAAXgAAAAABXgAAAAABXgAAAAABXgAAAAACXgAAAAAAJQAAAAAChAAAAAAAJQAAAAADXgAAAAADXgAAAAAAXgAAAAADhAAAAAAAXgAAAAADXgAAAAADhAAAAAAAXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAACXgAAAAABXgAAAAADXgAAAAADXgAAAAAAXgAAAAADhAAAAAAAXgAAAAACXgAAAAAAhAAAAAAAJQAAAAACJQAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAAAJQAAAAABhAAAAAAAXgAAAAAAXgAAAAACXgAAAAABJQAAAAADhAAAAAAAXgAAAAACXgAAAAABhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABXgAAAAADhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAXgAAAAABhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAhAAAAAAAXgAAAAAAXgAAAAADhAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAhAAAAAAAdAAAAAACdAAAAAAChAAAAAAAXgAAAAADAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABXgAAAAAAhAAAAAAAAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABhAAAAAAAhAAAAAAAdAAAAAAAhAAAAAAAhAAAAAAAXgAAAAABAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAADXgAAAAAChAAAAAAAgQAAAAAChAAAAAAAXgAAAAACXgAAAAAAAQAAAAAAhAAAAAAAAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABAQAAAAAAAQAAAAAAhAAAAAAAXgAAAAABXgAAAAAB
           version: 6
         1,-1:
           ind: 1,-1
@@ -22174,6 +22174,18 @@ entities:
     - type: Transform
       pos: 46.48018,-25.706886
       parent: 2
+- proto: BoxRubberShot
+  entities:
+  - uid: 12481
+    components:
+    - type: Transform
+      pos: 11.30615,35.06965
+      parent: 2
+  - uid: 12482
+    components:
+    - type: Transform
+      pos: 11.321775,34.772774
+      parent: 2
 - proto: BoxSterileMask
   entities:
   - uid: 20707
@@ -22245,13 +22257,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25694
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BrigTimer
   entities:
   - uid: 1224
@@ -73491,13 +73496,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25622
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingEyesHudMedical
   entities:
   - uid: 110
@@ -73619,13 +73617,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25749
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorBlue
   entities:
   - uid: 411
@@ -73635,13 +73626,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25623
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorGray
   entities:
   - uid: 498
@@ -73651,13 +73635,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25624
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorLightBrown
   entities:
   - uid: 391
@@ -73667,13 +73644,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25573
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorOrange
   entities:
   - uid: 10772
@@ -73697,13 +73667,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25574
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorRed
   entities:
   - uid: 433
@@ -73713,13 +73676,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25572
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesColorWhite
   entities:
   - uid: 27197
@@ -75167,13 +75123,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25754
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingNeckMantleCE
   entities:
   - uid: 10866
@@ -76080,13 +76029,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25819
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingShoesColorGreen
   entities:
   - uid: 20569
@@ -76391,13 +76333,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25746
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpskirtLawyerBlue
   entities:
   - uid: 384
@@ -76407,13 +76342,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25755
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpskirtLawyerGood
   entities:
   - uid: 137
@@ -76423,13 +76351,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25805
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpskirtLawyerRed
   entities:
   - uid: 179
@@ -76439,13 +76360,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25753
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpskirtSec
   entities:
   - uid: 24511
@@ -76627,13 +76541,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25575
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitLawyerBlue
   entities:
   - uid: 121
@@ -76643,13 +76550,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25598
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitLawyerGood
   entities:
   - uid: 250
@@ -76659,13 +76559,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25747
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitLawyerRed
   entities:
   - uid: 334
@@ -76675,13 +76568,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 25728
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitSec
   entities:
   - uid: 24508
@@ -130420,75 +130306,24 @@ entities:
           ent: null
     missingComponents:
     - AccessReader
-  - uid: 25571
+  - uid: 12475
     components:
-    - type: MetaData
-      desc: Стандартное хранилище Nanotrasen.
-      name: шкаф юриста
     - type: Transform
       pos: -12.5,13.5
       parent: 2
     - type: PointLight
       color: '#D56C6CFF'
       enabled: True
-    - type: EntityStorage
+- proto: LockerInspectorFilled
-      air:
+  entities:
-        volume: 200
+  - uid: 12476
-        immutable: False
+    components:
-        temperature: 293.14673
+    - type: Transform
-        moles:
+      pos: -13.5,14.5
-        - 1.7459903
+      parent: 2
-        - 6.568249
+    - type: PointLight
-        - 0
+      color: '#D56C6CFF'
-        - 0
+      enabled: True
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 25749
-          - 25572
-          - 25573
-          - 25574
-          - 25575
-          - 25598
-          - 25616
-          - 25622
-          - 25623
-          - 25624
-          - 25694
-          - 25728
-          - 25746
-          - 25747
-          - 25753
-          - 25754
-          - 25755
-          - 25805
-          - 25819
-          - 25936
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    missingComponents:
-    - AccessReader
 - proto: LockerMedical
   entities:
   - uid: 22948
@@ -134124,13 +133959,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.422112,-15.180332
       parent: 2
-  - uid: 25616
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 26843
     components:
     - type: Transform
@@ -143196,13 +143024,13 @@ entities:
       pos: 4.166244,-61.42392
       parent: 2
     - type: RCDAmmo
-      charges: 100
+      charges: 225
   - uid: 19120
     components:
     - type: Transform
       parent: 18558
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143211,7 +143039,7 @@ entities:
     - type: Transform
       parent: 18558
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143220,7 +143048,7 @@ entities:
     - type: Transform
       parent: 18559
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143229,7 +143057,7 @@ entities:
     - type: Transform
       parent: 18559
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143238,7 +143066,7 @@ entities:
     - type: Transform
       parent: 18560
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143247,7 +143075,7 @@ entities:
     - type: Transform
       parent: 18560
     - type: RCDAmmo
-      charges: 100
+      charges: 225
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
@@ -143257,14 +143085,14 @@ entities:
       pos: 4.173121,-61.326607
       parent: 2
     - type: RCDAmmo
-      charges: 100
+      charges: 225
   - uid: 24413
     components:
     - type: Transform
       pos: 4.166244,-61.51767
       parent: 2
     - type: RCDAmmo
-      charges: 100
+      charges: 225
 - proto: ReagentContainerFlourSmall
   entities:
   - uid: 20165
@@ -152782,6 +152610,13 @@ entities:
     - type: Transform
       pos: 14.5,39.5
       parent: 2
+- proto: SpawnPointInspector
+  entities:
+  - uid: 12474
+    components:
+    - type: Transform
+      pos: -14.5,14.5
+      parent: 2
 - proto: SpawnPointJanitor
   entities:
   - uid: 13656
@@ -157424,6 +157259,16 @@ entities:
     - type: Transform
       pos: 33.5,-4.5
       parent: 2
+  - uid: 12478
+    components:
+    - type: Transform
+      pos: 11.5,34.5
+      parent: 2
+  - uid: 12479
+    components:
+    - type: Transform
+      pos: 11.5,35.5
+      parent: 2
   - uid: 13387
     components:
     - type: Transform
@@ -160399,13 +160244,6 @@ entities:
     - type: Transform
       pos: -17.448671,31.349062
       parent: 2
-  - uid: 25936
-    components:
-    - type: Transform
-      parent: 25571
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: WallmountTelescreen
   entities:
   - uid: 15319
@@ -161254,8 +161092,7 @@ entities:
   - uid: 11285
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      pos: -13.5,13.5
-      pos: -13.5,14.5
       parent: 2
   - uid: 11286
     components:
@@ -161794,12 +161631,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 60.5,-53.5
       parent: 2
-  - uid: 19407
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,13.5
-      parent: 2
   - uid: 19467
     components:
     - type: Transform
@@ -181851,12 +181682,12 @@ entities:
   - uid: 943
     components:
     - type: Transform
-      pos: -0.5155313,39.42321
+      pos: -0.56726366,39.443146
       parent: 2
   - uid: 26870
     components:
     - type: Transform
-      pos: -0.5155313,39.67321
+      pos: -0.47059953,39.662384
       parent: 2
 - proto: WeaponLaserCarbinePractice
   entities:
@@ -181870,6 +181701,18 @@ entities:
     - type: Transform
       pos: 25.484055,36.464966
       parent: 2
+- proto: WeaponRubberShotgun
+  entities:
+  - uid: 12477
+    components:
+    - type: Transform
+      pos: 11.43115,35.804024
+      parent: 2
+  - uid: 12480
+    components:
+    - type: Transform
+      pos: 11.478025,35.554024
+      parent: 2
 - proto: WeaponRevolverDeckard
   entities:
   - uid: 19032

Resources/Prototypes/Maps/DryDock.yml

@@ -32,6 +32,7 @@
             SecurityOfficer: [ 4, 4 ]
             SecurityCadet: [ 4, 4 ]
             Detective: [ 1, 1 ]
+            Inspector: [ 1, 1 ]
             Lawyer: [ 2, 2 ]
             Brigmedic: [ 1, 1 ]
             #Medical

Resources/Prototypes/Maps/WhiteMoose.yml

@@ -33,6 +33,7 @@
           SecurityOfficer: [ 3, 3 ]
           SecurityCadet: [ 3, 3 ]
           Detective: [ 1, 1 ]
+          Inspector: [ 1, 1 ]
           Lawyer: [ 1, 1 ]
           Brigmedic: [ 1, 1 ]
           #Medical

Resources/Prototypes/Maps/Whitebox.yml

@@ -40,6 +40,7 @@
             Chaplain: [ 2, 2 ]
             Warden: [ 1, 1 ]
             Librarian: [ 2, 2 ]
+            Inspector: [ 1, 1 ]
             Lawyer: [ 2, 2 ]
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

Resources/Prototypes/Roles/Jobs/Justice/inspector.yml

@@ -19,6 +19,7 @@
   supervisors: job-supervisors-captain
   access:
     - Service
+    - Lawyer
     - Brig
     - Maintenance
     - Command

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml

@@ -0,0 +1,13 @@
+# Shotgun Shells
+- type: entity
+  name: коробка резиновой дроби
+  parent: AmmoProviderShotgunShell
+  id: BoxRubberShot
+  description: A dispenser box full of beanbag shots, designed for riot shotguns.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShellShotgunRubberShot
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellrubber

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: ShellShotgunRubberShot
+  name: ружейный патрон (.49 резиновая дробь)
+  parent: BaseShellShotgun
+  components:
+  - type: Tag
+    tags:
+    - ShellRubberShotgun
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: CartridgeAmmo
+    proto: PelletShotgunRubberShot
+  - type: SpentAmmoVisuals
+    state: rubber

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -0,0 +1,16 @@
+- type: entity
+  id: PelletShotgunRubberShot
+  name: резиновая дробь (.49)
+  noSpawn: true
+  parent: [BaseBullet, BaseBulletTrail]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    state: buckshot
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 1
+  - type: StaminaDamageOnCollide
+    ignoreResistances: false
+    damage: 25

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -0,0 +1,24 @@
+- type: entity
+  name: травматический дробовик
+  parent: BaseWeaponShotgun
+  id: WeaponRubberShotgun
+  description: Вот что выходит, когда старый дизайн Ремингтона соединяется с современными материалами. Модифицирован под миротворческие нужны Службы Безопасности. Использует патроны калибра .49 ружейный.
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,4,0
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump_inhands_64x.rsi
+  - type: Sprite
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Shotguns/rubber_pump_onbody.rsi
+  - type: BallisticAmmoProvider
+    proto: ShellShotgunRubberShot
+    capacity: 6
+    whitelist:
+      tags:
+      - ShellRubberShotgun
+  - type: Tag
+    tags:
+    - WeaponRubberShotgun

Resources/Prototypes/_White/tags.yml

@@ -103,6 +103,15 @@
 - type: Tag
   id: ClusterBang
 
+- type: Tag
+  id: WeaponRubberShotgun
+
+- type: Tag
+  id: MagazineRubberShotgun
+
+- type: Tag
+  id: ShellRubberShotgun
+
 - type: Tag
   id: Lighting
 

Resources/Textures/Objects/Storage/boxes.rsi/meta.json

@@ -194,6 +194,9 @@
         {
             "name": "shellpractice"
         },
+        {
+            "name": "shellrubber"
+        },
         {
             "name": "shellslug"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json

@@ -37,6 +37,12 @@
         {
             "name": "improvised-spent"
         },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "rubber-spent"
+        },
         {
             "name": "incendiary"
         },

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump_inhands_64x.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Shotguns/rubber_pump_onbody.rsi/meta.json

@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, bolt-open modified from icon.png by Flareguy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}