Merge branch 'master' into 2020-04-28-tool-component

# Conflicts:
#	SpaceStation14.sln.DotSettings

Resources/Prototypes/Entities/Buildings/airlock_access.yml

@@ -0,0 +1,8 @@
+- type: entity
+  parent: airlock_engineering
+  id: airlock_engineering_locked
+  name: Engineering Airlock
+  suffix: Locked
+  components:
+  - type: AccessReader
+    required: ["engineering"]

Resources/Prototypes/Entities/Buildings/airlock_types.yml

@@ -40,16 +40,6 @@
   - type: Icon
     sprite: Buildings/Doors/airlock_engineering_glass.rsi
 
-
-- type: entity
-  parent: airlock_engineering
-  id: airlock_engineering_locked
-  name: Locked Engineering Airlock
-  components:
-  - type: AccessReader
-    required: ["engineering"]
-
-
 - type: entity
   parent: Airlock
   id: airlock_medical

Resources/Prototypes/Entities/Buildings/instruments.yml

@@ -47,7 +47,7 @@
    id: MinimoogInstrument
    components:
    - type: Instrument
-     program: 7
+     program: 81
    - type: Sprite
      sprite: Objects/Instruments/otherinstruments.rsi
      state: minimoog

Resources/Prototypes/Entities/Buildings/power.yml

@@ -62,6 +62,35 @@
   - type: SnapGrid
     offset: Center
 
+- type: entity
+  id: SolarPanel
+  name: Solar Panel
+  description: Generates power from sunlight. Usually used to power replacements for sunlight. Fragile.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      layer: 31
+  - type: Sprite
+    sprite: Buildings/solar_panel.rsi
+    state: normal
+  - type: Icon
+    sprite: Buildings/solar_panel.rsi
+    state: normal
+  - type: PowerGenerator
+  - type: SolarPanel
+    supply: 1500
+  - type: Rotatable
+  - type: SnapGrid
+    offset: Center
+  - type: Damageable
+  - type: Breakable
+    thresholdvalue: 100
+
 - type: entity
   id: WPPnobattery
   name: WPPnobattery

Resources/Prototypes/Entities/Items/Instruments.yml

@@ -17,7 +17,7 @@
   id: SynthesizerInstrument
   components:
   - type: Instrument
-    program: 2
+    program: 62
   - type: Sprite
     sprite: Objects/Instruments/h_synthesizer.rsi
     state: icon

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

@@ -0,0 +1,25 @@
+- type: entity
+  name: Stun baton
+  parent: BaseItem
+  id: Stunbaton
+  components:
+    - type: Sprite
+      sprite: Objects/Melee/stunbaton.rsi
+      state: stunbaton_off
+
+    - type: Icon
+      sprite: Objects/Melee/stunbaton.rsi
+      state: stunbaton_off
+
+    - type: Stunbaton
+      damage: 1
+      range: 0.75
+      arcwidth: 0
+      arc: default
+
+    - type: Item
+      Size: 10
+      sprite: Objects/Melee/stunbaton.rsi
+      HeldPrefix: off
+
+    - type: ItemCooldown

Resources/Prototypes/Entities/Mobs/human.yml

@@ -131,6 +131,8 @@
   - type: FootstepSound
   - type: HumanoidAppearance
   - type: HumanInventoryController
+  - type: Stunnable
+  - type: AnimationPlayer
 
 - type: entity
   save: false

Resources/Prototypes/Entities/water_tank.yml

@@ -2,13 +2,14 @@
   parent: ReagentItem
   id: WaterTank
   name: Water Tank
+  suffix: Empty
   description: "A water tank. It is used to store high amounts of water."
   components:
   - type: Sprite
-    texture: Buildings/WaterTank.png
+    texture: Buildings/watertank.png
 
   - type: Icon
-    texture: Buildings/WaterTank.png
+    texture: Buildings/watertank.png
 
   - type: Clickable
   - type: InteractionOutline
@@ -37,6 +38,7 @@
 - type: entity
   parent: WaterTank
   id: WaterTankFull
+  suffix: Full
   components:
   - type: Solution
     contents:

Resources/Prototypes/SoundCollections/body_fall.yml

@@ -0,0 +1,7 @@
+- type: sound_collection
+  id: bodyfall
+  files:
+  - /Audio/effects/bodyfall1.ogg
+  - /Audio/effects/bodyfall2.ogg
+  - /Audio/effects/bodyfall3.ogg
+  - /Audio/effects/bodyfall4.ogg

Resources/Prototypes/SoundCollections/sparks.yml

@@ -0,0 +1,7 @@
+- type: sound_collection
+  id: sparks
+  files:
+  - /Audio/effects/sparks1.ogg
+  - /Audio/effects/sparks2.ogg
+  - /Audio/effects/sparks3.ogg
+  - /Audio/effects/sparks4.ogg

Resources/Textures/Buildings/solar_panel.rsi/meta.json

@@ -0,0 +1 @@
+{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"normal","select":[],"flags":{},"directions":8},{"name":"broken","select":[],"flags":{},"directions":1}]}

Resources/Textures/Objects/Melee/stunbaton.rsi/meta.json

@@ -0,0 +1,143 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC BY-SA 3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656",
+    "states":
+    [
+        {
+            "name": "off-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "off-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+            {
+            "name": "on-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+            ]
+        },
+            {
+            "name": "on-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ],
+            ]
+        },
+        {
+            "name": "stunbaton_off",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+                {
+            "name": "stunbaton_nocell",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+                {
+            "name": "stunbaton_on",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                ]
+            ]
+        }
+
+    ]
+}
+