diff --git a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml index 9b5f6757b8..3339833383 100644 --- a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml index e9da57750b..16676d1f5f 100644 --- a/Resources/Prototypes/Entities/Mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -155,6 +155,7 @@ - type: CameraRecoil - type: Examiner - type: HumanInventoryController + - type: Item - type: entity save: false diff --git a/Resources/Textures/Objects/markers.rsi/AI.png b/Resources/Textures/Objects/markers.rsi/AI.png index 1e6533c229..aa331c468b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/AI.png and b/Resources/Textures/Objects/markers.rsi/AI.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Assistant.png b/Resources/Textures/Objects/markers.rsi/Assistant.png index 7588e08c7b..139cba34f5 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Assistant.png and b/Resources/Textures/Objects/markers.rsi/Assistant.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png b/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png index 25e454b11d..b25133c96d 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png and b/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Bartender.png b/Resources/Textures/Objects/markers.rsi/Bartender.png index acf2e044e0..d0f4baaf2b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Bartender.png and b/Resources/Textures/Objects/markers.rsi/Bartender.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Botanist.png b/Resources/Textures/Objects/markers.rsi/Botanist.png index 51eb2b02b3..8e81377214 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Botanist.png and b/Resources/Textures/Objects/markers.rsi/Botanist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Captain.png b/Resources/Textures/Objects/markers.rsi/Captain.png index 6d832c820e..f32f53e462 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Captain.png and b/Resources/Textures/Objects/markers.rsi/Captain.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cargo Technician.png b/Resources/Textures/Objects/markers.rsi/Cargo Technician.png index 89cdc3bded..e162a24154 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cargo Technician.png and b/Resources/Textures/Objects/markers.rsi/Cargo Technician.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chaplain.png b/Resources/Textures/Objects/markers.rsi/Chaplain.png index 84223f7402..c293074cd4 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chaplain.png and b/Resources/Textures/Objects/markers.rsi/Chaplain.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chemist.png b/Resources/Textures/Objects/markers.rsi/Chemist.png index 2e10a6cac9..d983b91c58 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chemist.png and b/Resources/Textures/Objects/markers.rsi/Chemist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chief Engineer.png b/Resources/Textures/Objects/markers.rsi/Chief Engineer.png index aad16c9ba3..ec40156f1f 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chief Engineer.png and b/Resources/Textures/Objects/markers.rsi/Chief Engineer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png b/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png index 8dc1bcf25e..4411c7fa3c 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png and b/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Clown.png b/Resources/Textures/Objects/markers.rsi/Clown.png index 6282d74de2..994a291f68 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Clown.png and b/Resources/Textures/Objects/markers.rsi/Clown.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cook.png b/Resources/Textures/Objects/markers.rsi/Cook.png index cc778e79ab..f8eae67a88 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cook.png and b/Resources/Textures/Objects/markers.rsi/Cook.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Curator.png b/Resources/Textures/Objects/markers.rsi/Curator.png index cd7201ce4d..d9310a0bf3 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Curator.png and b/Resources/Textures/Objects/markers.rsi/Curator.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cyborg.png b/Resources/Textures/Objects/markers.rsi/Cyborg.png index f406e6b663..8811385665 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cyborg.png and b/Resources/Textures/Objects/markers.rsi/Cyborg.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Detective.png b/Resources/Textures/Objects/markers.rsi/Detective.png index b91db06e1a..73d944a0a7 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Detective.png and b/Resources/Textures/Objects/markers.rsi/Detective.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Geneticist.png b/Resources/Textures/Objects/markers.rsi/Geneticist.png index aaa3f2c5c6..9f6e4e9ffe 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Geneticist.png and b/Resources/Textures/Objects/markers.rsi/Geneticist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Head of Personnel.png b/Resources/Textures/Objects/markers.rsi/Head of Personnel.png index 148e5ebbe5..5c9b2f05c1 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Head of Personnel.png and b/Resources/Textures/Objects/markers.rsi/Head of Personnel.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Head of Security.png b/Resources/Textures/Objects/markers.rsi/Head of Security.png index 48fe1dec81..e13caa290a 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Head of Security.png and b/Resources/Textures/Objects/markers.rsi/Head of Security.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Janitor.png b/Resources/Textures/Objects/markers.rsi/Janitor.png index 6872e9340d..7be84691d1 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Janitor.png and b/Resources/Textures/Objects/markers.rsi/Janitor.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Lawyer.png b/Resources/Textures/Objects/markers.rsi/Lawyer.png index b3c3dec78c..403b6dd982 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Lawyer.png and b/Resources/Textures/Objects/markers.rsi/Lawyer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Medical Doctor.png b/Resources/Textures/Objects/markers.rsi/Medical Doctor.png index f8fea38838..3b2fad9f3f 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Medical Doctor.png and b/Resources/Textures/Objects/markers.rsi/Medical Doctor.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Mime.png b/Resources/Textures/Objects/markers.rsi/Mime.png index 24419d8855..a051ff5117 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Mime.png and b/Resources/Textures/Objects/markers.rsi/Mime.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Paramedic.png b/Resources/Textures/Objects/markers.rsi/Paramedic.png index 786f1b5b93..6e228574e6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Paramedic.png and b/Resources/Textures/Objects/markers.rsi/Paramedic.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Prisoner.png b/Resources/Textures/Objects/markers.rsi/Prisoner.png index 352fae0668..35383af8cb 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Prisoner.png and b/Resources/Textures/Objects/markers.rsi/Prisoner.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Psychologist.png b/Resources/Textures/Objects/markers.rsi/Psychologist.png index 89d4496621..3c6339791b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Psychologist.png and b/Resources/Textures/Objects/markers.rsi/Psychologist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Quartermaster.png b/Resources/Textures/Objects/markers.rsi/Quartermaster.png index 538d063eac..ac2aafa5cd 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Quartermaster.png and b/Resources/Textures/Objects/markers.rsi/Quartermaster.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Research Director.png b/Resources/Textures/Objects/markers.rsi/Research Director.png index ab8775e3cc..bfcd188b59 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Research Director.png and b/Resources/Textures/Objects/markers.rsi/Research Director.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Roboticist.png b/Resources/Textures/Objects/markers.rsi/Roboticist.png index bb9f014e9d..05384b4b76 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Roboticist.png and b/Resources/Textures/Objects/markers.rsi/Roboticist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Scientist.png b/Resources/Textures/Objects/markers.rsi/Scientist.png index 8cd403488b..ac4849ba69 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Scientist.png and b/Resources/Textures/Objects/markers.rsi/Scientist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Security Officer.png b/Resources/Textures/Objects/markers.rsi/Security Officer.png index ad1e418991..8d5dcdc9e3 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Security Officer.png and b/Resources/Textures/Objects/markers.rsi/Security Officer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Shaft Miner.png b/Resources/Textures/Objects/markers.rsi/Shaft Miner.png index 7c647980af..3d9c41b498 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Shaft Miner.png and b/Resources/Textures/Objects/markers.rsi/Shaft Miner.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Station Engineer.png b/Resources/Textures/Objects/markers.rsi/Station Engineer.png index ee306c811d..d561f3de46 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Station Engineer.png and b/Resources/Textures/Objects/markers.rsi/Station Engineer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Virologist.png b/Resources/Textures/Objects/markers.rsi/Virologist.png index e0e611cbf1..002550aaec 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Virologist.png and b/Resources/Textures/Objects/markers.rsi/Virologist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Warden.png b/Resources/Textures/Objects/markers.rsi/Warden.png index 6eeace59ab..6d577a752e 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Warden.png and b/Resources/Textures/Objects/markers.rsi/Warden.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_green.png b/Resources/Textures/Objects/markers.rsi/cross_green.png index b5366b2bdf..0becfdb0c5 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_green.png and b/Resources/Textures/Objects/markers.rsi/cross_green.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_pink.png b/Resources/Textures/Objects/markers.rsi/cross_pink.png index e9fa9fc5d3..d5476f99e6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_pink.png and b/Resources/Textures/Objects/markers.rsi/cross_pink.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_red.png b/Resources/Textures/Objects/markers.rsi/cross_red.png index 4ac7f06b20..063f341d36 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_red.png and b/Resources/Textures/Objects/markers.rsi/cross_red.png differ diff --git a/Resources/Textures/Objects/markers.rsi/meta.json b/Resources/Textures/Objects/markers.rsi/meta.json index 02df455363..7eb1bca74a 100644 --- a/Resources/Textures/Objects/markers.rsi/meta.json +++ b/Resources/Textures/Objects/markers.rsi/meta.json @@ -1 +1,461 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", "states": [{"name": "cross_blue", "directions": 1, "delays": [[1.0]]}, {"name": "cross_green", "directions": 1, "delays": [[1.0]]}, {"name": "cross_red", "directions": 1, "delays": [[1.0]]}, {"name": "AI", "directions": 1, "delays": [[1.0]]}, {"name": "Assistant", "directions": 1, "delays": [[1.0]]}, {"name": "Atmospheric Technician", "directions": 1, "delays": [[1.0]]}, {"name": "Bartender", "directions": 1, "delays": [[1.0]]}, {"name": "Botanist", "directions": 1, "delays": [[1.0]]}, {"name": "Captain", "directions": 1, "delays": [[1.0]]}, {"name": "Cargo Technician", "directions": 1, "delays": [[1.0]]}, {"name": "Chaplain", "directions": 1, "delays": [[1.0]]}, {"name": "Chemist", "directions": 1, "delays": [[1.0]]}, {"name": "Chief Engineer", "directions": 1, "delays": [[1.0]]}, {"name": "Chief Medical Officer", "directions": 1, "delays": [[1.0]]}, {"name": "Clown", "directions": 1, "delays": [[1.0]]}, {"name": "Cook", "directions": 1, "delays": [[1.0]]}, {"name": "Curator", "directions": 1, "delays": [[1.0]]}, {"name": "Cyborg", "directions": 1, "delays": [[1.0]]}, {"name": "Detective", "directions": 1, "delays": [[1.0]]}, {"name": "Geneticist", "directions": 1, "delays": [[1.0]]}, {"name": "Head of Personnel", "directions": 1, "delays": [[1.0]]}, {"name": "Head of Security", "directions": 1, "delays": [[1.0]]}, {"name": "Janitor", "directions": 1, "delays": [[1.0]]}, {"name": "Lawyer", "directions": 1, "delays": [[1.0]]}, {"name": "Medical Doctor", "directions": 1, "delays": [[1.0]]}, {"name": "Mime", "directions": 1, "delays": [[1.0]]}, {"name": "Paramedic", "directions": 1, "delays": [[1.0]]}, {"name": "Prisoner", "directions": 1, "delays": [[1.0]]}, {"name": "Psychologist", "directions": 1, "delays": [[1.0]]}, {"name": "Quartermaster", "directions": 1, "delays": [[1.0]]}, {"name": "Research Director", "directions": 1, "delays": [[1.0]]}, {"name": "Roboticist", "directions": 1, "delays": [[1.0]]}, {"name": "Scientist", "directions": 1, "delays": [[1.0]]}, {"name": "Security Officer", "directions": 1, "delays": [[1.0]]}, {"name": "Shaft Miner", "directions": 1, "delays": [[1.0]]}, {"name": "Station Engineer", "directions": 1, "delays": [[1.0]]}, {"name": "Virologist", "directions": 1, "delays": [[1.0]]}, {"name": "Warden", "directions": 1, "delays": [[1.0]]}, {"name": "cross_pink", "directions": 1, "delays": [[1.0]]}, {"name": "observer_start", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_melee", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_rifle", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_pistol", "directions": 1, "delays": [[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "states": [ + { + "name": "AI", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Assistant", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Atmospheric Technician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Bartender", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Botanist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Captain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cargo Technician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chaplain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chemist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chief Engineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chief Medical Officer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Clown", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cook", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Curator", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cyborg", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Detective", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Geneticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Head of Personnel", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Head of Security", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Janitor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Lawyer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Medical Doctor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Mime", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Paramedic", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Prisoner", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Psychologist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Quartermaster", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Research Director", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Roboticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Scientist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Security Officer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Shaft Miner", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Station Engineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Virologist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Warden", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_blue", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_green", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_pink", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_red", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "observer_start", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_grenade", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_hitscan", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_launcher", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_melee", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_pistol", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_revolver", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_rifle", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_shotgun", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_smg", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_sniper", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/markers.rsi/observer_start.png b/Resources/Textures/Objects/markers.rsi/observer_start.png index 8f965c9751..309baacb03 100644 Binary files a/Resources/Textures/Objects/markers.rsi/observer_start.png and b/Resources/Textures/Objects/markers.rsi/observer_start.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_grenade.png b/Resources/Textures/Objects/markers.rsi/spawner_grenade.png new file mode 100644 index 0000000000..bac248ef76 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_grenade.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png b/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png new file mode 100644 index 0000000000..5d6dbe39ec Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_launcher.png b/Resources/Textures/Objects/markers.rsi/spawner_launcher.png new file mode 100644 index 0000000000..63f0e1b0cc Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_launcher.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_melee.png b/Resources/Textures/Objects/markers.rsi/spawner_melee.png index bc3fd59227..7a1ea775d6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_melee.png and b/Resources/Textures/Objects/markers.rsi/spawner_melee.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_pistol.png b/Resources/Textures/Objects/markers.rsi/spawner_pistol.png index 6f9b871e53..745347acba 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_pistol.png and b/Resources/Textures/Objects/markers.rsi/spawner_pistol.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_revolver.png b/Resources/Textures/Objects/markers.rsi/spawner_revolver.png new file mode 100644 index 0000000000..0e8add9464 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_revolver.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_rifle.png b/Resources/Textures/Objects/markers.rsi/spawner_rifle.png index 0b1c339595..2dbb558c05 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_rifle.png and b/Resources/Textures/Objects/markers.rsi/spawner_rifle.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png b/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png new file mode 100644 index 0000000000..86092fefa5 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_smg.png b/Resources/Textures/Objects/markers.rsi/spawner_smg.png new file mode 100644 index 0000000000..b0fb68c028 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_smg.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_sniper.png b/Resources/Textures/Objects/markers.rsi/spawner_sniper.png new file mode 100644 index 0000000000..b1eef469be Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_sniper.png differ