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 309baacb03..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/observer_start.png and /dev/null differ 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 6e7304d762..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png and /dev/null differ 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 ac87bd0a27..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png deleted file mode 100644 index bac248ef76..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png deleted file mode 100644 index 5d6dbe39ec..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png deleted file mode 100644 index 63f0e1b0cc..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png deleted file mode 100644 index b7cffe180e..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png deleted file mode 100644 index 3b59a3ca46..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png deleted file mode 100644 index 7a1ea775d6..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png and /dev/null differ 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 745347acba..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png and /dev/null differ 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 1e5330cfe2..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png deleted file mode 100644 index 0e8add9464..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png and /dev/null differ 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 2dbb558c05..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png and /dev/null differ 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 1c9372e9ea..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png and /dev/null differ 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 86092fefa5..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png deleted file mode 100644 index 2c341f2218..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png and /dev/null differ 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 b0fb68c028..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png deleted file mode 100644 index b1eef469be..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png deleted file mode 100644 index 9a742f58fd..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png deleted file mode 100644 index 0a685dc041..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png and /dev/null differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png deleted file mode 100644 index 4f64d33046..0000000000 Binary files a/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png and /dev/null differ diff --git a/Resources/Textures/Markers/cross.rsi/ai.png b/Resources/Textures/Markers/cross.rsi/ai.png new file mode 100644 index 0000000000..d74d91be4d Binary files /dev/null and b/Resources/Textures/Markers/cross.rsi/ai.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/cross_blue.png b/Resources/Textures/Markers/cross.rsi/blue.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/cross_blue.png rename to Resources/Textures/Markers/cross.rsi/blue.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/cross_green.png b/Resources/Textures/Markers/cross.rsi/green.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/cross_green.png rename to Resources/Textures/Markers/cross.rsi/green.png diff --git a/Resources/Textures/Markers/cross.rsi/meta.json b/Resources/Textures/Markers/cross.rsi/meta.json new file mode 100644 index 0000000000..02985b8097 --- /dev/null +++ b/Resources/Textures/Markers/cross.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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": "blue" + }, + { + "name": "green" + }, + { + "name": "pink" + }, + { + "name": "red" + } + ] +} diff --git a/Resources/Textures/Interface/Misc/markers.rsi/cross_pink.png b/Resources/Textures/Markers/cross.rsi/pink.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/cross_pink.png rename to Resources/Textures/Markers/cross.rsi/pink.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/cross_red.png b/Resources/Textures/Markers/cross.rsi/red.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/cross_red.png rename to Resources/Textures/Markers/cross.rsi/red.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/AI.png b/Resources/Textures/Markers/jobs.rsi/ai.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/AI.png rename to Resources/Textures/Markers/jobs.rsi/ai.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Assistant.png b/Resources/Textures/Markers/jobs.rsi/assistant.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Assistant.png rename to Resources/Textures/Markers/jobs.rsi/assistant.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Atmospheric Technician.png b/Resources/Textures/Markers/jobs.rsi/atmospherics.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Atmospheric Technician.png rename to Resources/Textures/Markers/jobs.rsi/atmospherics.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Bartender.png b/Resources/Textures/Markers/jobs.rsi/bartender.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Bartender.png rename to Resources/Textures/Markers/jobs.rsi/bartender.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Botanist.png b/Resources/Textures/Markers/jobs.rsi/botanist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Botanist.png rename to Resources/Textures/Markers/jobs.rsi/botanist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Captain.png b/Resources/Textures/Markers/jobs.rsi/captain.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Captain.png rename to Resources/Textures/Markers/jobs.rsi/captain.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Cargo Technician.png b/Resources/Textures/Markers/jobs.rsi/cargo_tech.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Cargo Technician.png rename to Resources/Textures/Markers/jobs.rsi/cargo_tech.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Chief Engineer.png b/Resources/Textures/Markers/jobs.rsi/ce.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Chief Engineer.png rename to Resources/Textures/Markers/jobs.rsi/ce.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Centcom.png b/Resources/Textures/Markers/jobs.rsi/centcom.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Centcom.png rename to Resources/Textures/Markers/jobs.rsi/centcom.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Chaplain.png b/Resources/Textures/Markers/jobs.rsi/chaplain.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Chaplain.png rename to Resources/Textures/Markers/jobs.rsi/chaplain.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Cook.png b/Resources/Textures/Markers/jobs.rsi/chef.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Cook.png rename to Resources/Textures/Markers/jobs.rsi/chef.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Chemist.png b/Resources/Textures/Markers/jobs.rsi/chemist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Chemist.png rename to Resources/Textures/Markers/jobs.rsi/chemist.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Clown.png b/Resources/Textures/Markers/jobs.rsi/clown.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Clown.png rename to Resources/Textures/Markers/jobs.rsi/clown.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Chief Medical Officer.png b/Resources/Textures/Markers/jobs.rsi/cmo.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Chief Medical Officer.png rename to Resources/Textures/Markers/jobs.rsi/cmo.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Curator.png b/Resources/Textures/Markers/jobs.rsi/curator.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Curator.png rename to Resources/Textures/Markers/jobs.rsi/curator.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Cyborg.png b/Resources/Textures/Markers/jobs.rsi/cyborg.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Cyborg.png rename to Resources/Textures/Markers/jobs.rsi/cyborg.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Detective.png b/Resources/Textures/Markers/jobs.rsi/detective.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Detective.png rename to Resources/Textures/Markers/jobs.rsi/detective.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Medical Doctor.png b/Resources/Textures/Markers/jobs.rsi/doctor.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Medical Doctor.png rename to Resources/Textures/Markers/jobs.rsi/doctor.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Station Engineer.png b/Resources/Textures/Markers/jobs.rsi/engineer.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Station Engineer.png rename to Resources/Textures/Markers/jobs.rsi/engineer.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/Geneticist.png b/Resources/Textures/Markers/jobs.rsi/geneticist.png similarity index 100% rename from Resources/Textures/Interface/Misc/markers.rsi/Geneticist.png rename to Resources/Textures/Markers/jobs.rsi/geneticist.png diff --git a/Resources/Textures/Markers/jobs.rsi/green.png b/Resources/Textures/Markers/jobs.rsi/green.png new file mode 100644 index 0000000000..0becfdb0c5 Binary files /dev/null and b/Resources/Textures/Markers/jobs.rsi/green.png differ 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