From bf99a9150725092163c983f79d99ef0cd8d8049e Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 12 Mar 2021 20:28:40 +0000 Subject: [PATCH] Revert "Revert "Slight changes to spawners"" (#3627) * Revert "Revert "Slight changes to spawners (#3605)" (#3624)" This reverts commit 8c01d9d9dcfde111b75cf46ff7b2d1432bd88355. * Bring back clicktest.yml * Update IgnoredComponents.cs Co-authored-by: DrSmugleaf --- Content.Client/IgnoredComponents.cs | 4 + ...Component.cs => RandomSpawnerComponent.cs} | 7 +- Resources/Maps/saltern.yml | 214 ++++++++---------- .../Entities/Constructible/Power/arcade.yml | 15 -- .../Entities/Effects/Markers/spawn_points.yml | 27 --- .../Effects/Markers/timed_spawners.yml | 74 ------ .../Spawners/Conditional/suspicion.yml} | 177 +++++---------- .../Markers/Spawners/Conditional/timed.yml | 36 +++ .../Spawners/Conditional/traitordm.yml | 15 ++ .../Markers/Spawners/Random/arcade.yml | 10 + .../Spawners/Random/bedsheet.yml} | 16 +- .../Spawners/Random/toy.yml} | 18 +- .../Spawners/Random/trash.yml} | 17 +- .../Spawners/jobs.yml} | 208 ++++++++++------- .../Entities/Markers/Spawners/mobs.yml | 17 ++ .../{Effects => }/Markers/clientsideclone.yml | 0 .../Markers/construction_ghost.yml | 0 .../{Effects => }/Markers/drag_shadow.yml | 0 .../{Effects => }/Markers/hover_entity.yml | 0 .../{Effects => }/Markers/marker_base.yml | 11 +- .../{Effects => }/Markers/pointing.yml | 0 .../{Effects => }/Markers/warp_point.yml | 6 +- .../Prototypes/Entities/Mobs/Player/human.yml | 4 +- Resources/Prototypes/Entities/chemistry.yml | 8 - Resources/Prototypes/Entities/stress_test.yml | 7 - .../Interface/Misc/markers.rsi/meta.json | 196 ---------------- .../Misc/markers.rsi/observer_start.png | Bin 603 -> 0 bytes .../Interface/Misc/markers.rsi/spawner_ai.png | Bin 1115 -> 0 bytes .../Misc/markers.rsi/spawner_figure.png | Bin 672 -> 0 bytes .../Misc/markers.rsi/spawner_grenade.png | Bin 510 -> 0 bytes .../Misc/markers.rsi/spawner_hitscan.png | Bin 801 -> 0 bytes .../Misc/markers.rsi/spawner_launcher.png | Bin 709 -> 0 bytes .../markers.rsi/spawner_launcher_ammo.png | Bin 445 -> 0 bytes .../Misc/markers.rsi/spawner_magnum_ammo.png | Bin 614 -> 0 bytes .../Misc/markers.rsi/spawner_melee.png | Bin 481 -> 0 bytes .../Misc/markers.rsi/spawner_pistol.png | Bin 723 -> 0 bytes .../Misc/markers.rsi/spawner_pistol_ammo.png | Bin 636 -> 0 bytes .../Misc/markers.rsi/spawner_revolver.png | Bin 703 -> 0 bytes .../Misc/markers.rsi/spawner_rifle.png | Bin 813 -> 0 bytes .../Misc/markers.rsi/spawner_rifle_ammo.png | Bin 482 -> 0 bytes .../Misc/markers.rsi/spawner_shotgun.png | Bin 604 -> 0 bytes .../Misc/markers.rsi/spawner_shotgun_ammo.png | Bin 469 -> 0 bytes .../Misc/markers.rsi/spawner_smg.png | Bin 724 -> 0 bytes .../Misc/markers.rsi/spawner_sniper.png | Bin 645 -> 0 bytes .../Misc/markers.rsi/spawner_toy.png | Bin 840 -> 0 bytes .../Misc/markers.rsi/spawner_trash.png | Bin 551 -> 0 bytes .../Misc/markers.rsi/spawner_xenoai.png | Bin 1111 -> 0 bytes Resources/Textures/Markers/cross.rsi/ai.png | Bin 0 -> 174 bytes .../cross.rsi/blue.png} | Bin .../cross.rsi/green.png} | Bin .../Textures/Markers/cross.rsi/meta.json | 26 +++ .../cross.rsi/pink.png} | Bin .../cross.rsi/red.png} | Bin .../AI.png => Markers/jobs.rsi/ai.png} | Bin .../jobs.rsi/assistant.png} | Bin .../jobs.rsi/atmospherics.png} | Bin .../jobs.rsi/bartender.png} | Bin .../jobs.rsi/botanist.png} | Bin .../jobs.rsi/captain.png} | Bin .../jobs.rsi/cargo_tech.png} | Bin .../jobs.rsi/ce.png} | Bin .../jobs.rsi/centcom.png} | Bin .../jobs.rsi/chaplain.png} | Bin .../Cook.png => Markers/jobs.rsi/chef.png} | Bin .../jobs.rsi/chemist.png} | Bin .../Clown.png => Markers/jobs.rsi/clown.png} | Bin .../jobs.rsi/cmo.png} | Bin .../jobs.rsi/curator.png} | Bin .../jobs.rsi/cyborg.png} | Bin .../jobs.rsi/detective.png} | Bin .../jobs.rsi/doctor.png} | Bin .../jobs.rsi/engineer.png} | Bin .../jobs.rsi/geneticist.png} | Bin Resources/Textures/Markers/jobs.rsi/green.png | Bin 0 -> 309 bytes .../jobs.rsi/hop.png} | Bin .../jobs.rsi/hos.png} | Bin .../jobs.rsi/janitor.png} | Bin .../jobs.rsi/lawyer.png} | Bin Resources/Textures/Markers/jobs.rsi/meta.json | 122 ++++++++++ .../Mime.png => Markers/jobs.rsi/mime.png} | Bin .../jobs.rsi/miner.png} | Bin .../jobs.rsi/paramedic.png} | Bin .../jobs.rsi/prisoner.png} | Bin .../jobs.rsi/psychologist.png} | Bin .../jobs.rsi/qm.png} | Bin .../jobs.rsi/rd.png} | Bin .../jobs.rsi/roboticist.png} | Bin .../jobs.rsi/scientist.png} | Bin .../jobs.rsi/security_officer.png} | Bin .../jobs.rsi/virologist.png} | Bin .../jobs.rsi/warden.png} | Bin 91 files changed, 538 insertions(+), 697 deletions(-) rename Content.Server/GameObjects/Components/Markers/{TrashSpawnerComponent.cs => RandomSpawnerComponent.cs} (88%) delete mode 100644 Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml delete mode 100644 Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml rename Resources/Prototypes/Entities/{Effects/Markers/gamemode_conditional_spawners.yml => Markers/Spawners/Conditional/suspicion.yml} (64%) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml rename Resources/Prototypes/Entities/{Effects/Markers/bedsheet_spawner.yml => Markers/Spawners/Random/bedsheet.yml} (67%) rename Resources/Prototypes/Entities/{Effects/Markers/toy_spawner.yml => Markers/Spawners/Random/toy.yml} (80%) rename Resources/Prototypes/Entities/{Effects/Markers/trash_spawner.yml => Markers/Spawners/Random/trash.yml} (69%) rename Resources/Prototypes/Entities/{Effects/Markers/spawn_points_jobs.yml => Markers/Spawners/jobs.yml} (58%) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/mobs.yml rename Resources/Prototypes/Entities/{Effects => }/Markers/clientsideclone.yml (100%) rename Resources/Prototypes/Entities/{Effects => }/Markers/construction_ghost.yml (100%) rename Resources/Prototypes/Entities/{Effects => }/Markers/drag_shadow.yml (100%) rename Resources/Prototypes/Entities/{Effects => }/Markers/hover_entity.yml (100%) rename Resources/Prototypes/Entities/{Effects => }/Markers/marker_base.yml (62%) rename Resources/Prototypes/Entities/{Effects => }/Markers/pointing.yml (100%) rename Resources/Prototypes/Entities/{Effects => }/Markers/warp_point.yml (82%) delete mode 100644 Resources/Prototypes/Entities/chemistry.yml delete mode 100644 Resources/Prototypes/Entities/stress_test.yml delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/meta.json delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/observer_start.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png delete mode 100644 Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png create mode 100644 Resources/Textures/Markers/cross.rsi/ai.png rename Resources/Textures/{Interface/Misc/markers.rsi/cross_blue.png => Markers/cross.rsi/blue.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/cross_green.png => Markers/cross.rsi/green.png} (100%) create mode 100644 Resources/Textures/Markers/cross.rsi/meta.json rename Resources/Textures/{Interface/Misc/markers.rsi/cross_pink.png => Markers/cross.rsi/pink.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/cross_red.png => Markers/cross.rsi/red.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/AI.png => Markers/jobs.rsi/ai.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Assistant.png => Markers/jobs.rsi/assistant.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Atmospheric Technician.png => Markers/jobs.rsi/atmospherics.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Bartender.png => Markers/jobs.rsi/bartender.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Botanist.png => Markers/jobs.rsi/botanist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Captain.png => Markers/jobs.rsi/captain.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Cargo Technician.png => Markers/jobs.rsi/cargo_tech.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Chief Engineer.png => Markers/jobs.rsi/ce.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Centcom.png => Markers/jobs.rsi/centcom.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Chaplain.png => Markers/jobs.rsi/chaplain.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Cook.png => Markers/jobs.rsi/chef.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Chemist.png => Markers/jobs.rsi/chemist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Clown.png => Markers/jobs.rsi/clown.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Chief Medical Officer.png => Markers/jobs.rsi/cmo.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Curator.png => Markers/jobs.rsi/curator.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Cyborg.png => Markers/jobs.rsi/cyborg.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Detective.png => Markers/jobs.rsi/detective.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Medical Doctor.png => Markers/jobs.rsi/doctor.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Station Engineer.png => Markers/jobs.rsi/engineer.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Geneticist.png => Markers/jobs.rsi/geneticist.png} (100%) create mode 100644 Resources/Textures/Markers/jobs.rsi/green.png rename Resources/Textures/{Interface/Misc/markers.rsi/Head of Personnel.png => Markers/jobs.rsi/hop.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Head of Security.png => Markers/jobs.rsi/hos.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Janitor.png => Markers/jobs.rsi/janitor.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Lawyer.png => Markers/jobs.rsi/lawyer.png} (100%) create mode 100644 Resources/Textures/Markers/jobs.rsi/meta.json rename Resources/Textures/{Interface/Misc/markers.rsi/Mime.png => Markers/jobs.rsi/mime.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Shaft Miner.png => Markers/jobs.rsi/miner.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Paramedic.png => Markers/jobs.rsi/paramedic.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Prisoner.png => Markers/jobs.rsi/prisoner.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Psychologist.png => Markers/jobs.rsi/psychologist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Quartermaster.png => Markers/jobs.rsi/qm.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Research Director.png => Markers/jobs.rsi/rd.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Roboticist.png => Markers/jobs.rsi/roboticist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Scientist.png => Markers/jobs.rsi/scientist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Security Officer.png => Markers/jobs.rsi/security_officer.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Virologist.png => Markers/jobs.rsi/virologist.png} (100%) rename Resources/Textures/{Interface/Misc/markers.rsi/Warden.png => Markers/jobs.rsi/warden.png} (100%) diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index 83f2187bf6..213c907773 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -246,6 +246,10 @@ namespace Content.Client "MouseAccent", "GhostTakeoverAvailable", "GhostRoleMobSpawner", + "BedsheetSpawner", + "ToySpawner", + "FigureSpawner", + "RandomSpawner", }; } } diff --git a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs similarity index 88% rename from Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs rename to Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs index e09cd10610..177a6f7291 100644 --- a/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs @@ -5,18 +5,17 @@ using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Markers { [RegisterComponent] - public class TrashSpawnerComponent : ConditionalSpawnerComponent + public class RandomSpawnerComponent : ConditionalSpawnerComponent { [Dependency] private readonly IRobustRandom _robustRandom = default!; - public override string Name => "TrashSpawner"; + public override string Name => "RandomSpawner"; [ViewVariables(VVAccess.ReadWrite)] [DataField("rarePrototypes")] @@ -45,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Markers if (Prototypes.Count == 0) { - Logger.Warning($"Prototype list in TrashSpawnComponent is empty! Entity: {Owner}"); + Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {Owner}"); return; } diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index b2d47a1170..7195e08869 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -4102,245 +4102,245 @@ entities: parent: 853 type: Transform - uid: 417 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 9.5,13.5 parent: 853 type: Transform - uid: 418 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,15.5 parent: 853 type: Transform - uid: 419 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 13.5,19.5 parent: 853 type: Transform - uid: 420 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 1.5,16.5 parent: 853 type: Transform - uid: 421 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 4.5,9.5 parent: 853 type: Transform - uid: 422 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -22.5,-6.5 parent: 853 type: Transform - uid: 423 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -25.5,0.5 parent: 853 type: Transform - uid: 424 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -17.5,3.5 parent: 853 type: Transform - uid: 425 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-1.5 parent: 853 type: Transform - uid: 426 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -1.5,-0.5 parent: 853 type: Transform - uid: 427 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -7.5,5.5 parent: 853 type: Transform - uid: 428 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 19.5,3.5 parent: 853 type: Transform - uid: 429 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 25.5,6.5 parent: 853 type: Transform - uid: 430 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 6.5,1.5 parent: 853 type: Transform - uid: 431 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,7.5 parent: 853 type: Transform - uid: 432 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,12.5 parent: 853 type: Transform - uid: 433 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 24.5,11.5 parent: 853 type: Transform - uid: 434 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,13.5 parent: 853 type: Transform - uid: 435 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 26.5,10.5 parent: 853 type: Transform - uid: 436 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 28.5,8.5 parent: 853 type: Transform - uid: 437 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,0.5 parent: 853 type: Transform - uid: 438 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 35.5,2.5 parent: 853 type: Transform - uid: 439 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 44.5,6.5 parent: 853 type: Transform - uid: 440 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 42.5,-2.5 parent: 853 type: Transform - uid: 441 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 37.5,-3.5 parent: 853 type: Transform - uid: 442 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 37.5,-7.5 parent: 853 type: Transform - uid: 443 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 32.5,-6.5 parent: 853 type: Transform - uid: 444 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 20.5,0.5 parent: 853 type: Transform - uid: 445 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-2.5 parent: 853 type: Transform - uid: 446 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 25.5,-1.5 parent: 853 type: Transform - uid: 447 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-3.5 parent: 853 type: Transform - uid: 448 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-7.5 parent: 853 type: Transform - uid: 449 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 24.5,-9.5 parent: 853 type: Transform - uid: 450 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-13.5 parent: 853 type: Transform - uid: 451 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 26.5,-17.5 @@ -4354,84 +4354,84 @@ entities: parent: 853 type: Transform - uid: 453 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-17.5 parent: 853 type: Transform - uid: 454 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-20.5 parent: 853 type: Transform - uid: 455 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 22.5,-23.5 parent: 853 type: Transform - uid: 456 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 18.5,-25.5 parent: 853 type: Transform - uid: 457 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 14.5,-24.5 parent: 853 type: Transform - uid: 458 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 14.5,-21.5 parent: 853 type: Transform - uid: 459 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,-19.5 parent: 853 type: Transform - uid: 460 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 7.5,-18.5 parent: 853 type: Transform - uid: 461 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -10.5,-17.5 parent: 853 type: Transform - uid: 462 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-22.5 parent: 853 type: Transform - uid: 463 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,-26.5 parent: 853 type: Transform - uid: 464 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -5.5,-27.5 @@ -4445,7 +4445,7 @@ entities: parent: 853 type: Transform - uid: 466 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -9.5,-25.5 @@ -4459,98 +4459,98 @@ entities: parent: 853 type: Transform - uid: 468 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-27.5 parent: 853 type: Transform - uid: 469 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-23.5 parent: 853 type: Transform - uid: 470 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 0.5,-6.5 parent: 853 type: Transform - uid: 471 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-8.5 parent: 853 type: Transform - uid: 472 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-9.5 parent: 853 type: Transform - uid: 473 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,-10.5 parent: 853 type: Transform - uid: 474 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -6.5,-9.5 parent: 853 type: Transform - uid: 475 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -16.5,-5.5 parent: 853 type: Transform - uid: 476 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-6.5 parent: 853 type: Transform - uid: 477 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-11.5 parent: 853 type: Transform - uid: 478 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -9.5,-12.5 parent: 853 type: Transform - uid: 479 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-15.5 parent: 853 type: Transform - uid: 480 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -12.5,-15.5 parent: 853 type: Transform - uid: 481 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,-13.5 @@ -4564,63 +4564,63 @@ entities: parent: 853 type: Transform - uid: 483 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,-10.5 parent: 853 type: Transform - uid: 484 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -28.5,-11.5 parent: 853 type: Transform - uid: 485 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,-5.5 parent: 853 type: Transform - uid: 486 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -33.5,-11.5 parent: 853 type: Transform - uid: 487 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -33.5,-7.5 parent: 853 type: Transform - uid: 488 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,-0.5 parent: 853 type: Transform - uid: 489 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -19.5,-5.5 parent: 853 type: Transform - uid: 490 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,-8.5 parent: 853 type: Transform - uid: 491 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,1.5 @@ -4634,63 +4634,63 @@ entities: parent: 853 type: Transform - uid: 493 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,5.5 parent: 853 type: Transform - uid: 494 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -35.5,-2.5 parent: 853 type: Transform - uid: 495 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -36.5,10.5 parent: 853 type: Transform - uid: 496 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 0.5,8.5 parent: 853 type: Transform - uid: 497 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -3.5,7.5 parent: 853 type: Transform - uid: 498 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,20.5 parent: 853 type: Transform - uid: 499 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -4.5,22.5 parent: 853 type: Transform - uid: 500 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -7.5,23.5 parent: 853 type: Transform - uid: 501 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,25.5 @@ -4709,77 +4709,77 @@ entities: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 503 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,25.5 parent: 853 type: Transform - uid: 504 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,19.5 parent: 853 type: Transform - uid: 505 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -15.5,9.5 parent: 853 type: Transform - uid: 506 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -17.5,13.5 parent: 853 type: Transform - uid: 507 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,12.5 parent: 853 type: Transform - uid: 508 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -23.5,14.5 parent: 853 type: Transform - uid: 509 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -25.5,13.5 parent: 853 type: Transform - uid: 510 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,14.5 parent: 853 type: Transform - uid: 511 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,11.5 parent: 853 type: Transform - uid: 512 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -31.5,7.5 parent: 853 type: Transform - uid: 513 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,10.5 @@ -12374,7 +12374,7 @@ entities: parent: 853 type: Transform - uid: 933 - type: TrashSpawner + type: RandomSpawner components: - rot: 4.371139006309477E-08 rad pos: 7.5,13.5 @@ -40729,34 +40729,4 @@ entities: - pos: -36.5,4.5 parent: 853 type: Transform -- uid: 4724 - type: MouseAITimedSpawner - components: - - pos: -15.5,25.5 - parent: 853 - type: Transform -- uid: 4725 - type: MouseAITimedSpawner - components: - - pos: 13.5,18.5 - parent: 853 - type: Transform -- uid: 4726 - type: MouseAITimedSpawner - components: - - pos: 27.5,-1.5 - parent: 853 - type: Transform -- uid: 4727 - type: MouseAITimedSpawner - components: - - pos: -9.5,-25.5 - parent: 853 - type: Transform -- uid: 4728 - type: MouseAITimedSpawner - components: - - pos: -33.5,-11.5 - parent: 853 - type: Transform ... diff --git a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml index f670343f7e..5f3b4009e5 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml @@ -58,18 +58,3 @@ type: WiresBoundUserInterface - type: Computer board: BlockGameArcadeComputerCircuitboard - -- type: entity - id: RandomArcade - name: Random Arcade Spawner - parent: MarkerBase - components: - - type: RandomArcade - - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: cross_blue - - type: Marker - - type: Clickable - - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml deleted file mode 100644 index 683e9bc725..0000000000 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: entity - name: spawn point - id: SpawnPoint - parent: MarkerBase - abstract: true - components: - - type: SpawnPoint - -- type: entity - name: latejoin spawn point - id: SpawnPointLatejoin - parent: SpawnPoint - components: - - type: Sprite - state: cross_red - - type: SpawnPoint - spawn_type: LateJoin - -- type: entity - name: observer spawn point - id: SpawnPointObserver - parent: SpawnPoint - components: - - type: Sprite - state: observer_start - - type: SpawnPoint - spawn_type: Observer diff --git a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml deleted file mode 100644 index 0ce439b354..0000000000 --- a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml +++ /dev/null @@ -1,74 +0,0 @@ -- type: entity - name: base timed spawner - id: BaseTimedSpawner - abstract: true - components: - - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: cross_blue - - type: Marker - - type: Clickable - - type: InteractionOutline - - type: Physics - - type: TimedSpawner - placement: - mode: AlignTileAny - -- type: entity - name: AI Timed Spawner - id: AITimedSpawner - parent: BaseTimedSpawner - components: - - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_ai - - type: TimedSpawner - prototypes: - - HumanMob_Spirate - - HumanMob_Civilian - chance: 0.75 - intervalSeconds: 60 - minimumEntitiesSpawned: 1 - maximumEntitiesSpawned: 5 - -- type: entity - name: Xeno AI Timed Spawner - id: XenoAITimedSpawner - parent: BaseTimedSpawner - components: - - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_xenoai - - type: TimedSpawner - prototypes: - - XenoMob_Content - chance: 0.85 - intervalSeconds: 30 - minimumEntitiesSpawned: 2 - maximumEntitiesSpawned: 4 - -- type: entity - name: Mouse AI Timed Spawner - id: MouseAITimedSpawner - parent: BaseTimedSpawner - components: - - type: Sprite - netsync: false - visible: false - sprite: Mobs/Animals/mouse.rsi - state: icon-2 - - type: TimedSpawner - prototypes: - - MouseMob_Content - - MouseMob1_Content - - MouseMob2_Content - chance: 0.75 - intervalSeconds: 100 - minimumEntitiesSpawned: 1 - maximumEntitiesSpawned: 1 diff --git a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml similarity index 64% rename from Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml rename to Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml index 71939a4229..8b61c6a21b 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml @@ -1,22 +1,12 @@ -- type: entity - name: base conditional spawner - id: BaseConditionalSpawner - parent: MarkerBase - abstract: true - components: - - type: ConditionalSpawner - - type: entity name: Suspicion Rifle Spawner id: SuspicionRifleSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_rifle - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Rifles/ak.rsi/icon.png - type: ConditionalSpawner prototypes: - RifleAk @@ -34,14 +24,12 @@ - type: entity name: Suspicion Pistol Spawner id: SuspicionPistolSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_pistol - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Pistols/colt.rsi/icon.png - type: ConditionalSpawner prototypes: - PistolClarissa @@ -62,14 +50,12 @@ - type: entity name: Suspicion Melee Spawner id: SuspicionMeleeSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_melee - + layers: + - state: blue + - texture: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png - type: ConditionalSpawner prototypes: - ButchCleaver @@ -85,14 +71,12 @@ - type: entity name: Suspicion Revolver Spawner id: SuspicionRevolverSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_revolver - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png - type: ConditionalSpawner prototypes: - RevolverDeckard @@ -105,14 +89,12 @@ - type: entity name: Suspicion Shotgun Spawner id: SuspicionShotgunSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_shotgun - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png - type: ConditionalSpawner prototypes: - ShotgunBojevic @@ -129,14 +111,12 @@ - type: entity name: Suspicion SMG Spawner id: SuspicionSMGSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_smg - + layers: + - state: blue + - texture: Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png - type: ConditionalSpawner prototypes: - SmgAtreides @@ -151,14 +131,12 @@ - type: entity name: Suspicion Sniper Spawner id: SuspicionSniperSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_sniper - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png - type: ConditionalSpawner prototypes: - SniperBoltGun @@ -171,14 +149,12 @@ - type: entity name: Suspicion Hitscan Spawner id: SuspicionHitscanSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_hitscan - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Battery/xray.rsi/icon.png - type: ConditionalSpawner prototypes: - RedLaser @@ -195,14 +171,12 @@ - type: entity name: Suspicion Launchers Spawner id: SuspicionLaunchersSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_launcher - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Launchers/rocket.rsi/icon.png - type: ConditionalSpawner prototypes: - LauncherChinaLake @@ -214,14 +188,12 @@ - type: entity name: Suspicion Grenades Spawner id: SuspicionGrenadesSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_grenade - + layers: + - state: blue + - texture: Objects/Weapons/Grenades/grenade.rsi/icon.png - type: ConditionalSpawner prototypes: - ExGrenade @@ -239,14 +211,12 @@ - type: entity name: Suspicion Rifle Ammo Spawner id: SuspicionRifleMagazineSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_rifle_ammo - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazineSRifle @@ -262,14 +232,12 @@ - type: entity name: Suspicion Shotgun Ammo Spawner id: SuspicionShotgunMagazineSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_shotgun_ammo - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png - type: ConditionalSpawner prototypes: - MagazineShotgun @@ -280,14 +248,12 @@ - type: entity name: Suspicion Pistol Ammo Spawner id: SuspicionPistolMagazineSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_pistol_ammo - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazinePistol @@ -299,14 +265,12 @@ - type: entity name: Suspicion Magnum Ammo Spawner id: SuspicionMagnumMagazineSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_magnum_ammo - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazineMagnum @@ -318,14 +282,12 @@ - type: entity name: Suspicion Launcher Ammo Spawner id: SuspicionLauncherAmmoSpawner - parent: BaseConditionalSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_launcher_ammo - + layers: + - state: blue + - texture: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/frag.png - type: ConditionalSpawner prototypes: - RocketAmmo @@ -333,22 +295,3 @@ chance: 0.95 gameRules: - RuleSuspicion - -- type: entity - name: Traitor DeathMatch PDA Redemption Machine Spawner - id: TraitorDMRedemptionMachineSpawner - parent: BaseConditionalSpawner - components: - - type: Sprite - netsync: false - visible: false - sprite: Objects/Misc/traitordm.rsi - state: redemption - - - type: ConditionalSpawner - prototypes: - - TraitorDMRedemptionMachine - chance: 1.0 - gameRules: - - RuleTraitorDeathMatch - diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml new file mode 100644 index 0000000000..a68ffe83d1 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml @@ -0,0 +1,36 @@ +- type: entity + name: AI Timed Spawner + id: AITimedSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: blue + - texture: Mobs/Species/Human/parts.rsi/full.png + - state: ai + - type: TimedSpawner + prototypes: + - HumanMob_Spirate + - HumanMob_Civilian + chance: 0.75 + intervalSeconds: 60 + minimumEntitiesSpawned: 1 + maximumEntitiesSpawned: 5 + +- type: entity + name: Xeno AI Timed Spawner + id: XenoAITimedSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: blue + - texture: Mobs/Aliens/Xenos/xeno.rsi/crit.png + - state: ai + - type: TimedSpawner + prototypes: + - XenoMob_Content + chance: 0.85 + intervalSeconds: 30 + minimumEntitiesSpawned: 2 + maximumEntitiesSpawned: 4 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml new file mode 100644 index 0000000000..3a4b4236ad --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml @@ -0,0 +1,15 @@ +- type: entity + name: PDA Redemption Machine Spawner + id: TraitorDMRedemptionMachineSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: blue + - texture: Objects/Misc/traitordm.rsi/redemption.png + - type: ConditionalSpawner + prototypes: + - TraitorDMRedemptionMachine + chance: 1.0 + gameRules: + - RuleTraitorDeathMatch diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml new file mode 100644 index 0000000000..83786369a0 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml @@ -0,0 +1,10 @@ +- type: entity + id: RandomArcade + name: random arcade spawner + parent: MarkerBase + components: + - type: RandomArcade + - type: Sprite + layers: + - state: red + - texture: Constructible/Power/computers.rsi/arcade.png diff --git a/Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml similarity index 67% rename from Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml rename to Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml index 262fd2e7ba..e002208204 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml @@ -1,17 +1,13 @@ - type: entity name: Random Sheet Spawner id: BedsheetSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Objects/Misc/bedsheets.rsi - state: random_bedsheet - - type: Marker - - type: Clickable - - type: InteractionOutline - - type: Physics - - type: TrashSpawner + layers: + - state: red + - texture: Objects/Misc/bedsheets.rsi/random_bedsheet.png + - type: RandomSpawner rarePrototypes: - BedsheetIan - BedsheetCosmos @@ -32,5 +28,3 @@ - BedsheetRainbow chance: 0.97 offset: 0 - placement: - mode: AlignTileAny diff --git a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml similarity index 80% rename from Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml rename to Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index cbd285d48e..b7bcfa81a6 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -4,11 +4,10 @@ parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_toy - - type: TrashSpawner + layers: + - state: red + - texture: Objects/Fun/toys.rsi/plushie_h.png + - type: RandomSpawner rarePrototypes: - CarvingHelpMe - CarvingHello @@ -35,11 +34,10 @@ parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_figure - - type: TrashSpawner + layers: + - state: red + - texture: Objects/Fun/toys.rsi/ripleytoy.png + - type: RandomSpawner prototypes: - ToyAi - ToyNuke diff --git a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml similarity index 69% rename from Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml rename to Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index e521e6af69..6029aeb5f8 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -1,18 +1,13 @@ - type: entity name: Trash Spawner - id: TrashSpawner + id: RandomSpawner + parent: MarkerBase components: - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: spawner_trash - - - type: Marker - - type: Clickable - - type: InteractionOutline - - type: Physics - - type: TrashSpawner + layers: + - state: red + - texture: Objects/Consumable/Trash/candy.rsi/icon.png + - type: RandomSpawner rarePrototypes: - PuddleVomit - TrashPlate diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml similarity index 58% rename from Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml rename to Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index aa69146831..61b7aac2df 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -1,251 +1,297 @@ # Base + - type: entity id: SpawnPointJobBase - parent: SpawnPoint + parent: MarkerBase abstract: true + suffix: Job Spawn components: - type: SpawnPoint spawn_type: Job - -# Assistant -- type: entity - id: SpawnPointAssistant - parent: SpawnPointJobBase - name: spawn point (assistant) - components: - - type: SpawnPoint - job_id: Assistant - type: Sprite - state: Assistant + sprite: Markers/jobs.rsi + +- type: entity + name: observer spawn point + id: SpawnPointObserver + parent: SpawnPointJobBase + components: + - type: Sprite + layers: + - state: green + - texture: Mobs/Ghosts/ghost_human.rsi/icon.png + state: observer + - type: SpawnPoint + spawn_type: Observer + +- type: entity + name: latejoin spawn point + id: SpawnPointLatejoin + parent: SpawnPointJobBase + components: + - type: Sprite + state: green + - type: SpawnPoint + spawn_type: LateJoin + +# Cargo -# Quartermaster #- type: entity # id: SpawnPointQuartermaster # parent: SpawnPointJobBase -# name: spawn point (quartermaster) +# name: quartermaster # components: # - type: SpawnPoint # job_id: Quartermaster # - type: Sprite # state: Quartermaster -# Cargo tech - type: entity id: SpawnPointCargoTechnician parent: SpawnPointJobBase - name: spawn point (cargotechnician) + name: cargotechnician components: - type: SpawnPoint job_id: CargoTechnician - type: Sprite - state: Cargo Technician + layers: + - state: green + - state: cargo_tech +# Civilian + +- type: entity + id: SpawnPointAssistant + parent: SpawnPointJobBase + name: assistant + components: + - type: SpawnPoint + job_id: Assistant + - type: Sprite + layers: + - state: green + - state: assistant -# Bartender - type: entity id: SpawnPointBartender parent: SpawnPointJobBase - name: spawn point (bartender) + name: bartender components: - type: SpawnPoint job_id: Bartender - type: Sprite - state: Bartender + layers: + - state: green + - state: bartender - -# Chef - type: entity id: SpawnPointChef parent: SpawnPointJobBase - name: spawn point (chef) + name: chef components: - type: SpawnPoint job_id: Chef - type: Sprite - state: Cook + layers: + - state: green + - state: chef -# Botanist - type: entity id: SpawnPointBotanist parent: SpawnPointJobBase - name: spawn point (botanist) + name: botanist components: - - type: SpawnPoint - job_id: Botanist - - type: Sprite - state: Botanist + - type: SpawnPoint + job_id: Botanist + - type: Sprite + layers: + - state: green + - state: botanist -# Clown - type: entity id: SpawnPointClown parent: SpawnPointJobBase - name: spawn point (clown) + name: clown components: - type: SpawnPoint job_id: Clown - type: Sprite - state: Clown + layers: + - state: green + - state: clown - -# Mime - type: entity id: SpawnPointMime parent: SpawnPointJobBase - name: spawn point (mime) + name: mime components: - type: SpawnPoint job_id: Mime - type: Sprite - state: Mime + layers: + - state: green + - state: mime -# Chaplain #- type: entity # id: SpawnPointChaplain # parent: SpawnPointJobBase -# name: spawn point (chaplain) +# name: chaplain # components: # - type: SpawnPoint # job_id: Chaplain # - type: Sprite # state: Chaplain -# Janitor - type: entity id: SpawnPointJanitor parent: SpawnPointJobBase - name: spawn point (janitor) + name: janitor components: - type: SpawnPoint job_id: Janitor - type: Sprite - state: Janitor + layers: + - state: green + - state: janitor +# Command -# Captain - type: entity id: SpawnPointCaptain parent: SpawnPointJobBase - name: spawn point (captain) + name: captain components: - type: SpawnPoint job_id: Captain - type: Sprite - state: Captain + layers: + - state: green + - state: captain - -# Head of Personnel - type: entity id: SpawnPointHeadOfPersonnel parent: SpawnPointJobBase - name: spawn point (headofpersonnel) + name: headofpersonnel components: - type: SpawnPoint job_id: HeadOfPersonnel - type: Sprite - state: Head of Personnel + layers: + - state: green + - state: hop +# Engineering -# ChiefEngineer - type: entity id: SpawnPointChiefEngineer parent: SpawnPointJobBase - name: spawn point (chiefengineer) + name: chiefengineer components: - type: SpawnPoint job_id: ChiefEngineer - type: Sprite - state: Chief Engineer + layers: + - state: green + - state: ce - -# StationEngineer - type: entity id: SpawnPointStationEngineer parent: SpawnPointJobBase - name: spawn point (stationengineer) + name: stationengineer components: - type: SpawnPoint job_id: StationEngineer - type: Sprite - state: Station Engineer + layers: + - state: green + - state: engineer +# Medical -# ChiefMedicalOfficer - type: entity id: SpawnPointChiefMedicalOfficer parent: SpawnPointJobBase - name: spawn point (chiefmedicalofficer) + name: chiefmedicalofficer components: - type: SpawnPoint job_id: ChiefMedicalOfficer - type: Sprite - state: Chief Medical Officer + layers: + - state: green + - state: cmo - -# MedicalDoctor - type: entity id: SpawnPointMedicalDoctor parent: SpawnPointJobBase - name: spawn point (medicaldoctor) + name: medicaldoctor components: - type: SpawnPoint job_id: MedicalDoctor - type: Sprite - state: Medical Doctor + layers: + - state: green + - state: doctor +# Science -# ResearchDirector - type: entity id: SpawnPointResearchDirector parent: SpawnPointJobBase - name: spawn point (researchdirector) + name: researchdirector components: - type: SpawnPoint job_id: ResearchDirector - type: Sprite - state: Research Director + layers: + - state: green + - state: rd - -# Scientist - type: entity id: SpawnPointScientist parent: SpawnPointJobBase - name: spawn point (scientist) + name: scientist components: - type: SpawnPoint job_id: Scientist - type: Sprite - state: Scientist + layers: + - state: green + - state: scientist +# Security -# HeadOfSecurity - type: entity id: SpawnPointHeadOfSecurity parent: SpawnPointJobBase - name: spawn point (headofsecurity) + name: headofsecurity components: - type: SpawnPoint job_id: HeadOfSecurity - type: Sprite - state: Head of Security + layers: + - state: green + - state: hos -# Warden - type: entity id: SpawnPointWarden parent: SpawnPointJobBase - name: spawn point (warden) + name: warden components: - - type: SpawnPoint - job_id: Warden - - type: Sprite - state: Warden + - type: SpawnPoint + job_id: Warden + - type: Sprite + layers: + - state: green + - state: warden -# SecurityOfficer - type: entity id: SpawnPointSecurityOfficer parent: SpawnPointJobBase - name: spawn point (securityofficer) + name: securityofficer components: - type: SpawnPoint job_id: SecurityOfficer - type: Sprite - state: Security Officer + layers: + - state: green + - state: security_officer diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml new file mode 100644 index 0000000000..80a02ea0c3 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -0,0 +1,17 @@ +# Base + +- type: entity + name: Mouse Spawner + id: SpawnMobMouse + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - texture: Mobs/Animals/mouse.rsi/icon-2.png + - state: ai + - type: ConditionalSpawner + prototypes: + - MouseMob_Content + - MouseMob1_Content + - MouseMob2_Content diff --git a/Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml b/Resources/Prototypes/Entities/Markers/clientsideclone.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml rename to Resources/Prototypes/Entities/Markers/clientsideclone.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml rename to Resources/Prototypes/Entities/Markers/construction_ghost.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Markers/drag_shadow.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml rename to Resources/Prototypes/Entities/Markers/drag_shadow.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml b/Resources/Prototypes/Entities/Markers/hover_entity.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml rename to Resources/Prototypes/Entities/Markers/hover_entity.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml b/Resources/Prototypes/Entities/Markers/marker_base.yml similarity index 62% rename from Resources/Prototypes/Entities/Effects/Markers/marker_base.yml rename to Resources/Prototypes/Entities/Markers/marker_base.yml index 9ef628f01e..3ddae99078 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Markers/marker_base.yml @@ -6,12 +6,9 @@ - type: Clickable - type: InteractionOutline - type: Sprite - netsync: false - visible: false - sprite: Interface/Misc/markers.rsi - state: cross_blue + sprite: Markers/cross.rsi +# If serialization was cool this would work. +# layers: +# - state: blue placement: mode: AlignTileAny - - - diff --git a/Resources/Prototypes/Entities/Effects/Markers/pointing.yml b/Resources/Prototypes/Entities/Markers/pointing.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/Markers/pointing.yml rename to Resources/Prototypes/Entities/Markers/pointing.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml b/Resources/Prototypes/Entities/Markers/warp_point.yml similarity index 82% rename from Resources/Prototypes/Entities/Effects/Markers/warp_point.yml rename to Resources/Prototypes/Entities/Markers/warp_point.yml index 1806459627..b4bd38464f 100644 --- a/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml +++ b/Resources/Prototypes/Entities/Markers/warp_point.yml @@ -5,8 +5,4 @@ components: - type: WarpPoint - type: Sprite - state: cross_pink - - - - + state: pink diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index f245a7e8d6..1911dae349 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -31,8 +31,8 @@ id: HumanMob_CentcomOfficial components: - type: Icon - sprite: Interface/Misc/markers.rsi - state: Centcom + sprite: Markers/jobs.rsi + state: centcom - type: GhostRoleMobSpawner prototype: HumanMob_CentcomOfficial deleteOnSpawn: true diff --git a/Resources/Prototypes/Entities/chemistry.yml b/Resources/Prototypes/Entities/chemistry.yml deleted file mode 100644 index c9589e17f8..0000000000 --- a/Resources/Prototypes/Entities/chemistry.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - parent: BaseItem - id: ReagentItem - name: "reagent item" - abstract: true - components: - - type: SolutionContainer - maxVol: 5 diff --git a/Resources/Prototypes/Entities/stress_test.yml b/Resources/Prototypes/Entities/stress_test.yml deleted file mode 100644 index 979e2c7cd0..0000000000 --- a/Resources/Prototypes/Entities/stress_test.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - id: StressTest - name: stress test - components: - - type: Sprite - texture: Effects/explosion.rsi/explosion.png - - type: StressTestMovement diff --git a/Resources/Textures/Interface/Misc/markers.rsi/meta.json b/Resources/Textures/Interface/Misc/markers.rsi/meta.json deleted file mode 100644 index cb45857293..0000000000 --- a/Resources/Textures/Interface/Misc/markers.rsi/meta.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "AI" - }, - { - "name": "Assistant" - }, - { - "name": "Atmospheric Technician" - }, - { - "name": "Bartender" - }, - { - "name": "Botanist" - }, - { - "name": "Captain" - }, - { - "name": "Cargo Technician" - }, - { - "name": "Centcom" - }, - { - "name": "Chaplain" - }, - { - "name": "Chemist" - }, - { - "name": "Chief Engineer" - }, - { - "name": "Chief Medical Officer" - }, - { - "name": "Clown" - }, - { - "name": "Cook" - }, - { - "name": "Curator" - - }, - { - "name": "Cyborg" - - }, - { - "name": "Detective" - }, - { - "name": "Geneticist" - }, - { - "name": "Head of Personnel" - }, - { - "name": "Head of Security" - }, - { - "name": "Janitor" - }, - { - "name": "Lawyer" - }, - { - "name": "Medical Doctor" - }, - { - "name": "Mime" - }, - { - "name": "Paramedic" - }, - { - "name": "Prisoner" - }, - { - "name": "Psychologist" - }, - { - "name": "Quartermaster" - }, - { - "name": "Research Director" - }, - { - "name": "Roboticist" - }, - { - "name": "Scientist" - }, - { - "name": "Security Officer" - }, - { - "name": "Shaft Miner" - }, - { - "name": "Station Engineer" - }, - { - "name": "Virologist" - }, - { - "name": "Warden" - }, - { - "name": "cross_blue" - }, - { - "name": "cross_green" - }, - { - "name": "cross_pink" - }, - { - "name": "cross_red" - }, - { - "name": "observer_start" - }, - { - "name": "spawner_ai" - }, - { - "name": "spawner_grenade" - }, - { - "name": "spawner_hitscan" - }, - { - "name": "spawner_launcher" - }, - { - "name": "spawner_launcher_ammo" - }, - { - "name": "spawner_magnum_ammo" - }, - { - "name": "spawner_melee" - }, - { - "name": "spawner_pistol" - }, - { - "name": "spawner_pistol_ammo" - }, - { - "name": "spawner_revolver" - }, - { - "name": "spawner_rifle" - }, - { - "name": "spawner_rifle_ammo" - }, - { - "name": "spawner_shotgun" - }, - { - "name": "spawner_shotgun_ammo" - }, - { - "name": "spawner_smg" - }, - { - "name": "spawner_sniper" - }, - { - "name": "spawner_trash" - }, - { - "name": "spawner_xenoai" - }, - { - "name": "spawner_toy" - }, - { - "name": "spawner_figure" - } - ] -} diff --git a/Resources/Textures/Interface/Misc/markers.rsi/observer_start.png b/Resources/Textures/Interface/Misc/markers.rsi/observer_start.png deleted file mode 100644 index 309baacb03fe45a58360396534308b815b919e6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmV-h0;K(kP)M%d|{AW6n&$H?=H8aL(3IO$DTYG)B5WPQ!7d z#sX46N-0%4{1Cx8dybhm;4Hq~ZqLIF5u7tL;6}N`-4L_ILm;k|DPC2THFps4Eb-Si zz+nX_$e`ZnN2iH8vOJH+qcwLH>!8gkwmuDN;LvKE?bWafhn04$yWkD5&JkiqQ54SF z6-9v%_rOE2xCg)ku?8ZX5S@6W{Q|`SoDVz8^m6bWqL0X@M*zyQ9C)@+;%*0Ta`=%> ziU$CI-u=Ik@{?281tP=_xCMTWiiZHCKrW?BLd0!|JK)!Q;Pbx#$hqP+g!l@GF+a~H z1bRoSZ}+=|$MVbp7?ger!u-7~OQe(ukY5U5CDv;?Z9?1!S1TAmTO8;YO}ktM5SVzL zei(pWPkjjO_xn*_`SjR3FXH4v06TE%RcyhAelcUMm> zW;P^xP892EiEgMe#ar|ChFw?mA*d@_*<}y!WH2r&*Wc00@nufV;1;?MAw6T*oX%Q? p#lDVa=X};rGc#am`yV+Mu)mKr7}~i)R$~AF002ovPDHLkV1grW7VrQ7 diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png deleted file mode 100644 index 6e7304d7620a88cd5bf564669cd6db3674b554e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1115 zcmV-h1f=_kP)#Wrv>a1rE*WASB-sIZB*nuDC_vf7R z{r-OU+~4oO|5JkUU&VBp8wLRcA`UaBNHtR9gr#k$+_8A)A*QzFVmi$YThVnf>!_Ea zxeb8}p5l4CF$)Z*1Vm^RT{9(x4i`K~q#F6zi$uN1+-OMVMnjUDFD6kwrn87;EBW>q z>kWYhCoBoH{TMP}-nbm1(xI=L?z}|I9Rd*tM1UB?bYG4pzy2{}L z2T&A+&xZd*Q51YWAI;6phL88i5j5@Vvf#D|JU>5Awxfe9*RCflh_N5EG}m`Kbq$6yLb6zWrh0LS;ICE z2+-2fq7SMb;_G~qZ#!RMGLd3@eEi7>0I#|3EV6RwSq^%u0R2CI|Kv&TkBw0?HU@2N z1OfpN;g(}3;hhdDo~h*a{9m?Cz)}Q0->!U0{`lb|nHvqs(3$t7y}eyjRh27^jUpha z>(@n9RT*w-DsdIRTQU*LmQh1zz69Xd?-4ZDi6X0TIBfJaO(Q&UmZ2{F2)NyDnVguAdzp-gh@2Z3upm(^wi2tix7XCU hudmNhYRyjUe*j=HkZ+_mc)b7s002ovPDHLkV1mh;4)*{6 diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png deleted file mode 100644 index ac87bd0a27d45f82772022dc59adbb8b0bd02715..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmV;R0$=@!P)^DL!EOvjL6V{j zy&ZAz_=f;kJoEhriGhk@a8y)?GOROx4Jkn(QTHELn!u4zP%Q^x{#E=Ks$eM{Tb}&N8q+ z%*u$q$p#qCIq$P`vNN;rH!8LH+k9vEaadwH&lGM-#LI4nE@~wjR2U>=hhh0bH#I)loh$UxX{4V zdzAWDorP)71?p|GFNT9K=BA8Zuh->_bTtR43~beWHzNH?v@v&xj4|h{XmhBvAXI%j zWYaIF-rv2GGnY*tqgPSp2LKu%fWcr;1KLlw!GDmJ!3@(0$QZL^?11h5U!Xp8`uGWn$@sP zHOuxPh?W*KEX9GIuV1PF-Wzr{u%>o2^r(GT6B$=B+y>QsGiosZ?!n~fLrscP(FsmN zKLGI;52dF)me(Yl{>5ZJ;a6VG!i3cNiJA%Y1!@5N7P)E5DF6Tf07*qoM6N<$f=*%M A!TkK4<=#h&06w2w1F$ShIfP-TO#`=q zI@IB7^BcbJQ>|735JK>&+ocZl8GH6K^G;^`)oNjyri!c8YPhbe>6T^1&1N$zDlQZX z$+QRbux*G11TkjVN8G%-$hJHsV+SXL)O;T(6sTRUtL{A2%%KY2F|WipIKp^=RGQ- zR;!H#Se6Aq9FP0(_V!j~l?oY+Mo1~SzP=_10&Lr!D=M7_L4fPJN>tV-E4bV3YI+!k ztgNhXd3lNBI9yy@AfreHq|YDV=H`ao-Cg$g_aDv9bzM$RPZ2_3n&#Z`@bFLr&@9V} z3xxuAcXw(FRw|Wvd3l*AiqJHTbXQzmU18fctyb$%0iNfvy}ixx@iCj5n{&s#y}gM5 zV2a#v9E1==QN+^H5&*s43Ds(ia=EOUGbKySwry4Jjg5^5E0B^y@*+wtOAZi45re^Z z*4KBZDv;d`>F9YL;^PqYR_c@dbb!tjPuBE@ZbYgN>h%7eKpj30w+Mn@s<8~inDj|s zg(T}bifPTp3FN*rtKti7OF&I?YL5@sOyyvByV~odyj|G*FBcc33&Yvli7eb`83N0 fh6(c>PxSnvX6DTd98DlL@BCw8IAt0ppSP56`^V$A#Y_- zwdT;^T>*D)-xtpoAN3h{6#<}-Ek}X4g`wVV4Gj*)6g++MLTtQwNq-8Rkjt;pIvXS& zk9PZ#a|v_&{W8h9gr(i6E^^^YoYakDWZwP;;NIPbQa1y|Vu@|7X-lCKRISO+?|%l4 z7mFoZyZu=MVE6nkTc1t=AYYG&?7OnmT?2Z$+);10;Fo}!*|%A%+Uz=go3$$ACqZ4; zs7{utcuK*!jt2!Nf|7XZ$jKF7u2N=*JTK%(Oz8fKaOW{G22fE~C4liCUtNORYeQ&ilH}|(p{Yqy zw^A6p!!rid0dK)60kUb8d7fb=0fprUz@!+q{W=)y{mGVBBsmi6OP^a+G*P&^L}72q zFjDYxcDQ7~y(Fu~_Eohee8Z(;jwHa_d5|pw#6-Q_f`;Kbq6i!GY4Cokg#$t1<9$LA zI-xs}9El0*n(^^25Do+#3BrM(um^VL@FGI8I$GyE{Q8oOzS5|9n9Gsx6G!n6ICY?$cc;z9=y2NPlk21XNO{2*OSkPqSJqKtkKNfQSK2NQ8&P;lUai6fZ6 zq%r4Ez#c_&(5uIrG|e^dJ-=V>-rgTr&G4i}rYGS+nl+)#oFqzvCbXHML{}Ozq0O90 z^h}som}%0)(kv4uVl(0ZjE&+lAmeqk2r!8v)&?ggu4^KmcuL=d2e{w{FPh^AlyBAY z2>_Mj5w&_ILb|NoD4Oef2Ch>;V4~^%h)yDGs0>b_L?*X}BfcV}Y6TfKp%|#27iIon zW7^K-jsO_F_?%wcvAh4O(#B!{6ro$br`_rWeX=9E&(RTZ3MIvaV!&^F0K;iJj}JiS zaflFu2y8amt==@Rvz?~h>i?Mo+BE>b)&VF}u;=WM&2DjanC9yCGeQw!z*F~a{uC@M z-VCKoYN8*A_>E13c#n|6;+m1{Zx~ZN(S^wBQfzfIvbr5xJ&;&ElC9#Q^nZ`#b2|M0 n#bmaFm8)5}gXu_uX&}A&i=&+GgXOlNifKnj~QASzHv=tK=2|GDpAn1|y2gL@@LUL5nP-}$%# z_zte_KMFql-xh{>eGacbF#&|vw=2?cH)y!PamWk>rC6WFWLC6RR9~j(|wSY&rq51>C%~gJJFnfRpy~((oJsp@`z;)~GgdCfi^F zv^cr(UK$Rmb0BG2tuBIDpRn`6m`1h9-q8UU&L;+6E^#K?e82V>2s4rohj|?+XKC=g zqXS;Q_(`MM+D=cSwP1X3{J(_ySw|7Eq}488}By!4WtBE^t8_cce*^G7ZI2$d2qdk>rhr zurnErWAFZ_zmja=e}45yA=)Nm-V$ngj7dGC??TdF2?yk+{tP z;l-Kx01>E}6JjdP%<}&HG_wsV2(@?)2$##uQdN~k{1OP4Lqt+ll`y-WE5tPrr^QoT zyE_lCx&a`71?s~6)eY|2!rcb|3!)b=Gn%HsZns0zd;+KetomBoh&eHy`Et3;e2_&T zE)@^7U>K*{K|hZN+qc^-*6S~1vi)3mCx$aO#;9$-)nE|$nYV3=&Ei{A1^_U_CM*4F zH^yMU-+S=_&iNXc+k!*~yf`y^@y)jvF1jE3Et+i+j>X%y9o(zCA#_fJornNT#r^Ex z;H(DXht+wA06>cPp>V>9Icr;v&-St`2iqRe;*00000NkvXXu0mjf%_Z1f diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png deleted file mode 100644 index 745347acbacff268e09420f79965ff60815cfe33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 723 zcmV;^0xbQBP)LzCB}O=}wCwl9R2m-l|(@Av)QFOLK+Ck*=nISm`$ z+wqzR&FN0GV>A(((=#z^$7CWj=fp%K4igJ=#%Url*Emp-)3zd~Bbb;i?s6(}TJR)- z2o$*qKu%L>)*Im${uksl6+m!yd!58GfUeyYj;ukGoTj4dst9!NU+ll+)tlGidBZ%W zQm%^r*7jy7BTt^@dHnDZ0LuWU-@a3PRuE*mu2R@5QhRqqrCb#TQj$c&Job^T%B$ku zG#Ag7*aCN7cJn)esNd`RM08!HQm$eR2B8H~lH@b#qFHZ@w*W@_;Vlk#)w-@?nhnv0 zO|uu3a@7}C*emkm=V=092}U*G)`2VLrrz7S^n3k<(i;Wc zUdQ+5P1Qh7Q#t8;1YliX^99!q4oOLp=x=Rr(&>Dnc5q0y*9KZZ2`B};-ofzIfOBiF zTv;KRO!4{4R{(}Xi?iQnq$CNm{v60c7OefuDE4YQtlkusf*vN5DTYH!T>eaq#K|%i z7yT??u*k9PGjQYDZTtGIn+%6m;AFFYgs$Bi>9m}OE$518A}|A!_|Q6GH@|}-XRrnX zl(!j_UzxFke=y-I!l2c!>ub~w4gu)iX^+K3!QqH`wq|P1?4n$rH86=_aY1Z@0WGI6 zoMzNFobg~2p$*JmRVfkGgwMdN;u8kurZk!fpMlAP$Hn~z8$gC`FE>Lxx{0Zia2_U) z(b+KU1q<^sew3c?XL&%t`Tv+q23*LmnKvMA{146;@CUpU|4D+@Jp2Fv002ovPDHLk FV1f(SR?+|f diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png deleted file mode 100644 index 1e5330cfe2bb28780b9f420260f28fe484868d1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 636 zcmV-?0)zdDP)6H)kS!hZ0otV$Ls~nImeQg&P|~q;MwZpsEB6dhiC9L#Y3|QC!<_C<>lkQtZl5Yx7(-PxQyC_ z>mXcbYI9?Na>)^|=Ieaeb~!()Dna5vrshTf$nZg4B|gB WQc3H!`QrZo0000r4j=pJC(X*2nr;r zN#;nWEZHLe2kv0saY@c4q;B9zmaV(@zVCbY&d+CfpVo-q5VH|OH_lhY(wNFI&QZkD zn1*8z=Okij%sIzK9wJ_inWu=AvGNe{I*biFKm!OMNN$zidwMo}6hPAwXOE?qUi7GJ ze=%@=Ze$2p1QJo1lj9>UF0V54c3cmDXgbl)^Cm=*dacU!&8-$tusZtpz&(!Z5kB65 z52c+=9M|LUU>|^1yNi@#P5ABmR{(|&Pn32xtpfDi&8;4@3NVRa4XZWu-|!EfD#c+OYzC^ktQ|o z^;(sBtqQ=!<<(4fYTRa0j&=R50)$_R9oHk8PN-}pOW$gDsn@CqQM7JE$MvY!s+4v% zIXgZ7>t>y|1p$uhAw&^rjH!&wtd+IeUBZ4xuRt`NAVe~yJH&N!%zrpgiaI|*UhWJFX(ej3a)9B7i=tY$59 z19pGII3e z*>MFC3oDRCP5?3(AbypT37@py&4jEMtR$jfX0ON(5B9lE+od8`HJ76SmO96)im>hh zMIKEj*00*)CTni2Dxv_-UC;Uzdy)L#MQ9U#DK@Wl97ysA%meE^9!l4HEVl%#|HouL l;7xwb%z(V@e_-Zde*pRcQju4u-=6>g002ovPDHLkV1h??MMwYu diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png deleted file mode 100644 index 2dbb558c05ae31871167f9e8e63a65d6a736d923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 813 zcmV+|1JeA7P)ECErO+WAI%ROGqq{C0noWp}#L{-` z)(+N?;FVN}_5{m8h90e*v|57jcDUTHBu&$JRlg99yzlpYp6C0#_x?Dzn2`|Yh?x+u zDf|`DGNzR%d=$|#rYkWjd=k+zW=&$k4-x;2>8FUcvHTEmYK+qW_~v3eK<$ysjRmA6 zKtKZ2sM%C~phlUV?I9Ll76AENk!<=WkT8>?)m*juLj_V6CIHj3Ndb^eFG?N(R)-TS zzzSvEVDP9PLO=-0x%W|Vbk{#F+aEDbzpin zDPr*mk%`edKb}8Z#oaeQw?sZywEL$fJAqEuh-13qks6ewFoj1be*A2=%C+R~PIu&U zMGxtv!Uw{E3gf`GcH+q`X);?KMasHiw+#;U+c?($+`7vFH@Tb0ikPROB7EB;tT@Ca z&HFly@4O@SC|QG2v~eO6qh!;Irhu|;)KwmXQKCw`K%5 zHkEaQqaR-Z=gwWIV#$hYaH$y_EhZc>Zpa+F2GYwN9*Ug5{wHa829sHauF}3XL~Jg rFyQPzOlk+5%cq%pfZy>yFnx&MzfzG8B|EIc00000NkvXXu0mjfzSDt) diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png deleted file mode 100644 index 1c9372e9ea6464a57033ef044340c6198e444059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmV<80UiE{P)(;vkqY6u15b`J?(5bhLEr;2=r{i$Mxe=v3p-ty{)( zNKcbX?nf_Y+Xv;~df)dxxeIp};4l@EJ$i-&cqL{bls)M{Vh}>vvoO#lh9HzZnSr4R zh^;+MLTG!LfN1Q|#9;eci*FR7*T0cJu!82}CjdhL!%E&!eaX!Y5<_uZ;?UZ@`qHsWLnr)!t`sc1j-&;|hVWnd)=l-075>;u)kyDp3Z#mTY)Cp&xu zGmxJLbW1LVvk<)gjSm12-fqYNpy6(*S9R*ka)l5z0EKY(FWBkYih&HQ3t+~FV2GG- z7wEiOXrH!}gNs_PGNcy-m?8gR2Eoa=*DKi}UP^a+Ew3rq{f7x#u$ND>Vu5M>ho=Gk Y0D4{LE&xuH8UO$Q07*qoM6N<$f>nFi2><{9 diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png deleted file mode 100644 index 86092fefa5ca223666ba20b5a663850ccdf863c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmV-i0;BzjP)SyoIK6Q;8x~B?5Isf&qzv(Q9@l{sb6UDzS9PMkGcU3Uug_ zST^UeiwmNlQ)3qq^_;QPNP`f&DGvVU;c zi`g?&09p+pKVu@q3R|1&0300l*xFpDwy_Gp>z8lhu`H-5#5u|K z#oG~oiq+Vx-}h7n9^WsegrlUW59;|1g8}}c3;s^Z#4s4J1pGWc0Y<4diiyMl7Lo!< zB$J}+Slj|!HR}ka;xgXf_xKKA-sI~MKw+Y-6;IgjdK2p|!!A(bue!g$0x?>HPvG@k zzzHM9TNGg5`5un#67C{({}k?&0X6e+zfvy58d%^vZm1gx0NCJI<2VSfZ2*}xai)QH zN1@BU9|o%zP&0S}6kt2loDh$R<=iHkW>q%L>eNoi^<$Ll=Q!5`Nv=n->v$-=+GF`C q30MDPGM$jiuURrdH!g!y1O5RPv(LRiBIEM_0000Z-VslDB%hO~cHm46L zbeKrYsnbMiE*&No=2(P4TZ(CjwBJWb2-AyisVvm0rk01%-J>0IS=w7N;lB zxPfw>M7>irmHgW&E=X%dCIB!l!*?aiSMP(dnXHehSP7g}vgC?2N@nt2i-BcU?Q$@wI`n=zHUAeMo`af~bj%I(@T+sbi2=yOrb1K_@oC>&;D z3Ch^}mp3I=VL*6rOW8V_u6t4s&9*a-t{c+o4?8g+JZJ`{5V8w|2SVvwP9r)QLD>5s zAc2{1sdA0|r+AW8xoJ%deR{pu3jAsiA%VF!t*cmIC?600000 LNkvXXu0mjfO3==t diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png deleted file mode 100644 index b0fb68c0283b066c48cb9307278a2232ada48827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 724 zcmV;_0xSKAP)7<2NNK1kAq%y*Xmu80pkm2N5V48`QVQJu?HB(^BFBHB$n< z3x6TT)-)W2j}T*P+8kBk6U5k>1CA*_ApTp^Plyw1`2lfijnfGDHjCp6X$wiAEhNQB zlV5cQNCyA`DafnxR{tQcQ^@gjARL(@rp*Jpz=kF93-tVFAP=Ms&2a(7gGj7g7cx0m zAkuPr0X;i9IeOD_@!jIp~KeWc*zeBh|m;kj(1N(V66162OnCCgY zVEWn5?O=mrh9y?kL`<7!ef6~oGPDM2l?G1}FZr^y3rLZAwM9&GPh?N%HYRoCUsCTE zV>gpzZgx>9lM{5>UGAz6Tr2uhuh40CQ6?t<=(M{IALIT^bedYFF?6)nm1VBGpk8fJ z&TkS_Li9RKhcH0qcn4I7vosWIKzSVp?aE+qv9uS^vs;0n5+WR#BB+FhgH`1A23|ai z(P?+N6^@cQ-XW-j$n1ZhSi0j{vF8jFOM4Dyxnh&zRq_cry+Aqt)0~BPc?oXF7or8b4yZD@N827%tV?p|gC()D=6JBo%`Tchub4A`68anK zTNM}jHgsaG%lJ}yzOUsj0q6f=G8k|npJw&|zwInEeXxI`OSpuP3WLf30000Vo7≈#A7mscL8Ubx)`-)7|&`efJK%dvG(YEJDOA3uua9 zMfk?F14V!$d}F!-(;^@dzA=Xa%Rz{^G-i+@#>NUl#Fa6w0uWdg#{mkwk1hi^i6-_9 zJTY>ABC6XvqEIXeHM=^JyihEOLb2rWNq!_$w|9h+OY!>U8#cDq9lzG-uva_e+0!+S zPns+*W}I)s?{1%xOYvxFK?0caBjEU?34pGjp*1=l|BTtgs8xsohW>t#B(JbnJM`fE zGJm4$XW;Tn0GnC)!alwFqDuhzWI_PkNj>Cu=K}yrwC}{lV-enc^X4kiKAIV!-t9>M za#9rl)6sj#@~jiLyqK{n5RXNezkl2L@b&v2Hj#y9Mo^-C40(l(t#!0U2BTIX9*cMg zpUe%*kD$3k>D{)ZW>7p3q7IWq^?)rX0favRi~bDW6OTtC9ABH0{4f7JKMB`=F&Rz>wVG%!80K z5HY+6f^<5K(a}*`MD~%-xJrO4Lf3T~a^gJ$>#Ia1lS!dZqTxm&oAudK32;SZ#$w16 z#2?0AS7{wY1fLGmG=m9ve!kn%qpebMCWeSmMT2-dKR+*sP(`6dW~8M>9hjayc71y& zj9e~92!*x4aR1f-x>okm5^L|nrx{ZkF{yxBO|tidB6e{^oS9D1_TvjN-&9p&RcWa4ZwkU((+P$=Ibt~5Z@t8${ z<(rR;cbvSE-oE7z86aCkbSeJ#}NO=!%&%HgDj7bC-m&pYX8xm=NM zLP`M)Kgv)V5mKYT!?_)pcrbvuH)Z7<U}&Q_sa$P;)L83(}i$pbH6qnV2=+`XrCP(>RX}xEzc=ZYeJ$UeDJr zkVeCoQ)~S)!?+NXYs6%!`2Ybu0@13 z6ip({UJVEL?HLCtbsMX7CBknahY=?P(7&_+AX59}BrqyI@HOwS(w&x9AwzV;m4ciS zP^1Yo5%F}t(nGRPXsE9JNd{z;G?d% zdUuHPh1 z`+J5QKx8FiNe|TY!UCA5XQWl4j*uwoy3Nl#x@}Kml#58kqFu!p(%nTHF4otFy$pA2 z4|Cy36(spy=$)7zX9WWyN_IGCFT*U^hKL?P&kDF8S18N6kpp-el|G&`DQ#4Uf{2kA z6ZV12jb%@~Ogb2g%^P;YK?tCS6>e-qXEv~x$iI3Z`SH`xr3bFp`;VRnXNh?4vHZq_ p_y3q2Cw%1B>~g|v`w7em_76_8UL#nn_gp^XElpNyGRT0617ykgI7a^b* zQ_-s+RV;!5A(v1uZ4!G5NGT-jn(cNC)2`WW(%pSM%)YblZsteYiul0n?9B7N&+~ns zAMf`a_GGZo%o^X6N>^eX5$XZZR&yPc6tSroH5>{1?kcGK56fJf!Frb9*|J~+UwwPlhii?lVcXV%Jc&eiYNd4OaD z+z=oHmT>!hq<>5px+$ioFNs2-AS#uLC=?1}diqj}-q1}!#+eJEVe66Ws0qT*O)+jw ziIM&>*O>}Hf*R=`6XVvD13&>Dv{{9OBO|`-y21xLfAQeyUd|pr$)DMrn+||)s}(Nn z+McuDx$r4l(GCC>7v=zH->^dSab4>cFGeGD?w0th?>LvWPT#S&@7!cnJIK4EFT3?1 zWoUTP1)_rR*ovEC=%zT@QD;>gVD#ZOC+}yueE2!i6EkeAFHvknV`zAim22MtPNZe$ z$S48s|Mmz30(h@pBUZl4N>?8};sh_$t^+ij;W{g3o6l4~!7hD4oMxv4@kG>50q|;V z7ZK^;r>Mp;e*5r9{UK-THPRC^#0MP*@xcMo6En)JUt4ShlT=6z4_PB=ow&}GmO@D zT2`;#p-805AU!cdF`EMjV95{wz*GeI;nS62j241eRcRKUq734pXJuORnD`jb#tb(+ttZd^h<|l1Oz+uB68Zz!zRG8Jd`@$2)>8X zcIR?+D#NKF-#7CdZqvhzk_IJIYGJ7bCUsu=Fq={W4y8?$e(htI^N}E3kj)TzlCPov d(&oP){{Rqzi4pub*hc^W002ovPDHLkV1h{{8|MH3 diff --git a/Resources/Textures/Markers/cross.rsi/ai.png b/Resources/Textures/Markers/cross.rsi/ai.png new file mode 100644 index 0000000000000000000000000000000000000000..d74d91be4db4bb860cffb6eefe72410d63353aab GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQcoAhkcif|lg@G-P~d64yzzT| zDtps~=DSh36CL+?^Z!#dRA`x?!JDy`U;6yKgQdUNotU<0uRk2ZD7u4{=QvZxmx+@P z*$Z8Gw{~j~qj6eN*be3NO|#bj^f~bPMV~=AQ`nQGvK=w|w2p)x+I}c?>O=vj6Os%z Ytw9Rhacr!ofDT~rboFyt=akR{06SDb!Th6Uc+1&8LKWkAox;{xRy4*DB2-C)TMDJVqc7zy8u)O;^v^-f|X$gP>woL%N zk1*Rih5*BBnCu;009zr-H82&xT3)jaOa$=O_6&qNlzPi+6ha+JBjq&$(H}|!70wHx z4yBp$>VY^#zagUL*RW`A+J>yTRr4l(ZkS*m)?E2>`tx`LmfB@-I0Zg>00000NkvXX Hu0mjfW+Qp! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Head of Personnel.png b/Resources/Textures/Markers/jobs.rsi/hop.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Head of Personnel.png rename to Resources/Textures/Markers/jobs.rsi/hop.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Head of Security.png b/Resources/Textures/Markers/jobs.rsi/hos.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Head of Security.png rename to Resources/Textures/Markers/jobs.rsi/hos.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Janitor.png b/Resources/Textures/Markers/jobs.rsi/janitor.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Janitor.png rename to Resources/Textures/Markers/jobs.rsi/janitor.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Lawyer.png b/Resources/Textures/Markers/jobs.rsi/lawyer.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Lawyer.png rename to Resources/Textures/Markers/jobs.rsi/lawyer.png diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json new file mode 100644 index 0000000000..cff1d577a0 --- /dev/null +++ b/Resources/Textures/Markers/jobs.rsi/meta.json @@ -0,0 +1,122 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green" + }, + { + "name": "ai" + }, + { + "name": "assistant" + }, + { + "name": "atmospherics" + }, + { + "name": "bartender" + }, + { + "name": "botanist" + }, + { + "name": "captain" + }, + { + "name": "cargo_tech" + }, + { + "name": "centcom" + }, + { + "name": "chaplain" + }, + { + "name": "chemist" + }, + { + "name": "ce" + }, + { + "name": "cmo" + }, + { + "name": "clown" + }, + { + "name": "chef" + }, + { + "name": "curator" + }, + { + "name": "cyborg" + }, + { + "name": "detective" + }, + { + "name": "geneticist" + }, + { + "name": "hop" + }, + { + "name": "hos" + }, + { + "name": "janitor" + }, + { + "name": "lawyer" + }, + { + "name": "doctor" + }, + { + "name": "mime" + }, + { + "name": "paramedic" + }, + { + "name": "prisoner" + }, + { + "name": "psychologist" + }, + { + "name": "qm" + }, + { + "name": "rd" + }, + { + "name": "roboticist" + }, + { + "name": "scientist" + }, + { + "name": "security_officer" + }, + { + "name": "miner" + }, + { + "name": "engineer" + }, + { + "name": "virologist" + }, + { + "name": "warden" + } + ] +} diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Mime.png b/Resources/Textures/Markers/jobs.rsi/mime.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Mime.png rename to Resources/Textures/Markers/jobs.rsi/mime.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Shaft Miner.png b/Resources/Textures/Markers/jobs.rsi/miner.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Shaft Miner.png rename to Resources/Textures/Markers/jobs.rsi/miner.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Paramedic.png b/Resources/Textures/Markers/jobs.rsi/paramedic.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Paramedic.png rename to Resources/Textures/Markers/jobs.rsi/paramedic.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Prisoner.png b/Resources/Textures/Markers/jobs.rsi/prisoner.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Prisoner.png rename to Resources/Textures/Markers/jobs.rsi/prisoner.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Psychologist.png b/Resources/Textures/Markers/jobs.rsi/psychologist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Psychologist.png rename to Resources/Textures/Markers/jobs.rsi/psychologist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Quartermaster.png b/Resources/Textures/Markers/jobs.rsi/qm.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Quartermaster.png rename to Resources/Textures/Markers/jobs.rsi/qm.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Research Director.png b/Resources/Textures/Markers/jobs.rsi/rd.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Research Director.png rename to Resources/Textures/Markers/jobs.rsi/rd.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Roboticist.png b/Resources/Textures/Markers/jobs.rsi/roboticist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Roboticist.png rename to Resources/Textures/Markers/jobs.rsi/roboticist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Scientist.png b/Resources/Textures/Markers/jobs.rsi/scientist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Scientist.png rename to Resources/Textures/Markers/jobs.rsi/scientist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Security Officer.png b/Resources/Textures/Markers/jobs.rsi/security_officer.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Security Officer.png rename to Resources/Textures/Markers/jobs.rsi/security_officer.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Virologist.png b/Resources/Textures/Markers/jobs.rsi/virologist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Virologist.png rename to Resources/Textures/Markers/jobs.rsi/virologist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Warden.png b/Resources/Textures/Markers/jobs.rsi/warden.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Warden.png rename to Resources/Textures/Markers/jobs.rsi/warden.png