Merge branch 'master' into buckle-locker-fix-1262

Resources/Prototypes/Entities/Buildings/Storage/StorageTanks/fuel_tank.yml

@@ -18,3 +18,8 @@
       reagents:
       - ReagentId: chem.WeldingFuel
         Quantity: 1500
+  - type: DamageOnToolInteract
+    damage: 200
+    tools:
+    - Welding
+

Resources/Prototypes/Entities/Items/Weapons/security.yml

@@ -23,3 +23,30 @@
       HeldPrefix: off
 
     - type: ItemCooldown
+
+- type: entity
+  name: flash
+  parent: BaseItem
+  id: Flash
+  components:
+    - type: Sprite
+      sprite: Objects/Melee/flash.rsi
+      state: flash
+
+    - type: Icon
+      sprite: Objects/Melee/flash.rsi
+      state: flash
+
+    - type: Flash
+      damage: 0
+      cooldownTime: 1
+      arc: smash
+      hitSound: /Audio/weapons/flash.ogg
+      slowTo: 0.7
+
+    - type: Item
+      Size: 2
+      sprite: Objects/Melee/flash.rsi
+
+    - type: ItemCooldown
+

Resources/Prototypes/Entities/Markers/drag_shadow.yml

@@ -0,0 +1,7 @@
+- type: entity
+  name: drag shadow
+  id: dragshadow
+  components:
+    - type: Sprite
+      layers:
+        - shader: unshaded

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -2,7 +2,6 @@
   save: false
   name: Urist McHands
   parent: BaseHumanMob_Content
-  abstract: true
   id: HumanMob_Content
   description: A miserable pile of secrets
   drawdepth: Mobs
@@ -17,4 +16,4 @@
     zoom: 0.5, 0.5
   - type: CameraRecoil
   - type: Examiner
-  - type: HumanInventoryController
+  - type: HumanInventoryController