Merge remote-tracking branch 'upstream/master' into weapon_anims

# Conflicts:
#	Resources/Prototypes/MeleeWeaponAnimations/default.yml

Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml

@@ -38,10 +38,9 @@
         - RifleBlackAk
         - RifleCarbine
         - RifleDallas
-        - RifleIhHeavy
-        - RifleSolEot
-        - RifleSolPara
-        - RifleSts
+        - RifleSTS
+        - RifleVintorez
+        - RifleWintermute
       chance: 0.75
       gameRules:
         - RuleSuspicion
@@ -62,14 +61,16 @@
     - type: ConditionalSpawner
       prototypes:
         - PistolClarissa
-        - PistolDeagle
-        - PistolDeckard
+        - PistolColt
         - PistolGiskard
-        - PistolGyro
+        - PistolHMPistol
         - PistolLamia
-        - PistolMakarov
+        - PistolMandella
         - PistolMk58
-        - PistolOlivawCivil
+        - PistolMk58Wood
+        - PistolMolly
+        - PistolOlivaw
+        - PistolPaco
       chance: 0.75
       gameRules:
         - RuleSuspicion
@@ -94,6 +95,171 @@
         - Spear
         - ToolboxEmergency
         - CrowbarRed
+        - Stunbaton
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Revolver Spawner
+  id: SuspicionRevolverSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_revolver
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_revolver
+    - type: ConditionalSpawner
+      prototypes:
+        - RevolverDeckard
+        - RevolverInspector
+        - RevolverMateba
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Shotgun Spawner
+  id: SuspicionShotgunSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_shotgun
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_shotgun
+    - type: ConditionalSpawner
+      prototypes:
+        - ShotgunBojevic
+        - ShotgunDB
+        - ShotgunBull
+        - ShotgunGladstone
+        - ShotgunRegulator
+        - ShotgunPump
+        - ShotgunSawn
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion SMG Spawner
+  id: SuspicionSMGSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_smg
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_smg
+    - type: ConditionalSpawner
+      prototypes:
+        - SmgAtreides
+        - SmgC20r
+        - SmgDrozd
+        - SmgStraylight
+        - SmgWt550
+        - SmgZoric
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Sniper Spawner
+  id: SuspicionSniperSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_sniper
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_sniper
+    - type: ConditionalSpawner
+      prototypes:
+        - SniperBoltGun
+        - SniperBoltGunWood
+        - SniperHeavy
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Hitscan Spawner
+  id: SuspicionHitscanSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_hitscan
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_hitscan
+    - type: ConditionalSpawner
+      prototypes:
+        - RedLaser
+        - RedHeavyLaser
+        - XrayLaser
+        - LaserGun
+        - LaserCannon
+        - XrayCannon
+        - TaserGun
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Launchers Spawner
+  id: SuspicionLaunchersSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_launcher
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_launcher
+    - type: ConditionalSpawner
+      prototypes:
+        - LauncherChinaLake
+        - LauncherRocket
+      chance: 0.75
+      gameRules:
+        - RuleSuspicion
+
+- type: entity
+  name: Suspicion Grenades Spawner
+  id: SuspicionGrenadesSpawner
+  parent: BaseConditionalSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_grenade
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_grenade
+    - type: ConditionalSpawner
+      prototypes:
+        - ExGrenade
+        - GrenadeFlashBang
+        - SyndieMiniBomb
       chance: 0.75
       gameRules:
         - RuleSuspicion

Resources/Prototypes/Entities/Markers/timed_spawners.yml

@@ -0,0 +1,42 @@
+- type: entity
+  name: base timed spawner
+  id: BaseTimedSpawner
+  abstract: true
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: cross_blue
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: cross_blue
+    - type: Marker
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Collidable
+    - type: TimedSpawner
+  placement:
+    mode: AlignTileAny
+
+- type: entity
+  name: AI Timed Spawner
+  id: AITimedSpawner
+  parent: BaseTimedSpawner
+  components:
+    - type: Sprite
+      netsync: false
+      visible: false
+      sprite: Objects/markers.rsi
+      state: spawner_rifle
+    - type: Icon
+      sprite: Objects/markers.rsi
+      state: spawner_rifle
+    - type: TimedSpawner
+      prototypes:
+        - HumanMob_Spirate
+        - HumanMob_Civilian
+      chance: 0.75
+      intervalSeconds: 60
+      minimumEntitiesSpawned: 1
+      maximumEntitiesSpawned: 5

Resources/Prototypes/Entities/Mobs/human.yml

@@ -134,12 +134,15 @@
   - type: HumanoidAppearance
   - type: Stunnable
   - type: AnimationPlayer
+  - type: UnarmedCombat
+    range: 0.8
+    arcwidth: 30
+    arc: fist
 
 - type: entity
   save: false
   name: Urist McHands
   parent: BaseHumanMob_Content
-  abstract: true
   id: HumanMob_Content
   description: A miserable pile of secrets
   drawdepth: Mobs
@@ -161,6 +164,7 @@
   save: false
   name: Urist McHands
   id: HumanMob_Dummy
+  abstract: true
   description: A dummy human meant to be used in character setup
   components:
     - type: Hands

Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml

@@ -73,7 +73,7 @@
     fireRate: 0.5
     capacity: 1
     soundEmpty: /Audio/Guns/Empty/empty.ogg
-    soundGunshot: /Audio/Guns/Gunshots/bang.ogg
+    soundGunshot: /Audio/Guns/Gunshots/rpgfire.ogg
     soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg
   - type: Appearance
     visuals:

Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml

@@ -18,7 +18,7 @@
     hard: false
     shapes:
     - !type:PhysShapeAabb
-      bounds: "-0.2,-0.2,0.2,0.2"
+      bounds: "-0.1,-0.1,0.1,0.1"
       layer: [Clickable]
       mask:
       - Impassable
@@ -130,10 +130,14 @@
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
-    devastationRange: 3
-    heavyImpactRange: 5
-    lightImpactRange: 7
+    devastationRange: 1
+    heavyImpactRange: 2
+    lightImpactRange: 4
     flashRange: 10
+  - type: PointLight
+    radius: 3.5
+    color: orange
+    energy: 0.5
 
 - type: entity
   id: BulletGrenadeBaton