diff --git a/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs similarity index 88% rename from Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs rename to Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs index 177a6f7291..e09cd10610 100644 --- a/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs @@ -5,17 +5,18 @@ 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 RandomSpawnerComponent : ConditionalSpawnerComponent + public class TrashSpawnerComponent : ConditionalSpawnerComponent { [Dependency] private readonly IRobustRandom _robustRandom = default!; - public override string Name => "RandomSpawner"; + public override string Name => "TrashSpawner"; [ViewVariables(VVAccess.ReadWrite)] [DataField("rarePrototypes")] @@ -44,7 +45,7 @@ namespace Content.Server.GameObjects.Components.Markers if (Prototypes.Count == 0) { - Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {Owner}"); + Logger.Warning($"Prototype list in TrashSpawnComponent is empty! Entity: {Owner}"); return; } diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 7195e08869..b2d47a1170 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -4102,245 +4102,245 @@ entities: parent: 853 type: Transform - uid: 417 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 9.5,13.5 parent: 853 type: Transform - uid: 418 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,15.5 parent: 853 type: Transform - uid: 419 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 13.5,19.5 parent: 853 type: Transform - uid: 420 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 1.5,16.5 parent: 853 type: Transform - uid: 421 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 4.5,9.5 parent: 853 type: Transform - uid: 422 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -22.5,-6.5 parent: 853 type: Transform - uid: 423 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -25.5,0.5 parent: 853 type: Transform - uid: 424 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -17.5,3.5 parent: 853 type: Transform - uid: 425 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-1.5 parent: 853 type: Transform - uid: 426 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -1.5,-0.5 parent: 853 type: Transform - uid: 427 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -7.5,5.5 parent: 853 type: Transform - uid: 428 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 19.5,3.5 parent: 853 type: Transform - uid: 429 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 25.5,6.5 parent: 853 type: Transform - uid: 430 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 6.5,1.5 parent: 853 type: Transform - uid: 431 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,7.5 parent: 853 type: Transform - uid: 432 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,12.5 parent: 853 type: Transform - uid: 433 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 24.5,11.5 parent: 853 type: Transform - uid: 434 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,13.5 parent: 853 type: Transform - uid: 435 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 26.5,10.5 parent: 853 type: Transform - uid: 436 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 28.5,8.5 parent: 853 type: Transform - uid: 437 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,0.5 parent: 853 type: Transform - uid: 438 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 35.5,2.5 parent: 853 type: Transform - uid: 439 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 44.5,6.5 parent: 853 type: Transform - uid: 440 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 42.5,-2.5 parent: 853 type: Transform - uid: 441 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 37.5,-3.5 parent: 853 type: Transform - uid: 442 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 37.5,-7.5 parent: 853 type: Transform - uid: 443 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 32.5,-6.5 parent: 853 type: Transform - uid: 444 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 20.5,0.5 parent: 853 type: Transform - uid: 445 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-2.5 parent: 853 type: Transform - uid: 446 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 25.5,-1.5 parent: 853 type: Transform - uid: 447 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-3.5 parent: 853 type: Transform - uid: 448 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-7.5 parent: 853 type: Transform - uid: 449 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 24.5,-9.5 parent: 853 type: Transform - uid: 450 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 27.5,-13.5 parent: 853 type: Transform - uid: 451 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 26.5,-17.5 @@ -4354,84 +4354,84 @@ entities: parent: 853 type: Transform - uid: 453 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-17.5 parent: 853 type: Transform - uid: 454 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 21.5,-20.5 parent: 853 type: Transform - uid: 455 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 22.5,-23.5 parent: 853 type: Transform - uid: 456 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 18.5,-25.5 parent: 853 type: Transform - uid: 457 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 14.5,-24.5 parent: 853 type: Transform - uid: 458 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 14.5,-21.5 parent: 853 type: Transform - uid: 459 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 12.5,-19.5 parent: 853 type: Transform - uid: 460 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 7.5,-18.5 parent: 853 type: Transform - uid: 461 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -10.5,-17.5 parent: 853 type: Transform - uid: 462 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-22.5 parent: 853 type: Transform - uid: 463 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,-26.5 parent: 853 type: Transform - uid: 464 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -5.5,-27.5 @@ -4445,7 +4445,7 @@ entities: parent: 853 type: Transform - uid: 466 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -9.5,-25.5 @@ -4459,98 +4459,98 @@ entities: parent: 853 type: Transform - uid: 468 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-27.5 parent: 853 type: Transform - uid: 469 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-23.5 parent: 853 type: Transform - uid: 470 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 0.5,-6.5 parent: 853 type: Transform - uid: 471 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-8.5 parent: 853 type: Transform - uid: 472 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -0.5,-9.5 parent: 853 type: Transform - uid: 473 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,-10.5 parent: 853 type: Transform - uid: 474 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -6.5,-9.5 parent: 853 type: Transform - uid: 475 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -16.5,-5.5 parent: 853 type: Transform - uid: 476 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -11.5,-6.5 parent: 853 type: Transform - uid: 477 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-11.5 parent: 853 type: Transform - uid: 478 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -9.5,-12.5 parent: 853 type: Transform - uid: 479 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -8.5,-15.5 parent: 853 type: Transform - uid: 480 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -12.5,-15.5 parent: 853 type: Transform - uid: 481 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,-13.5 @@ -4564,63 +4564,63 @@ entities: parent: 853 type: Transform - uid: 483 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,-10.5 parent: 853 type: Transform - uid: 484 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -28.5,-11.5 parent: 853 type: Transform - uid: 485 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,-5.5 parent: 853 type: Transform - uid: 486 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -33.5,-11.5 parent: 853 type: Transform - uid: 487 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -33.5,-7.5 parent: 853 type: Transform - uid: 488 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,-0.5 parent: 853 type: Transform - uid: 489 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -19.5,-5.5 parent: 853 type: Transform - uid: 490 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,-8.5 parent: 853 type: Transform - uid: 491 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,1.5 @@ -4634,63 +4634,63 @@ entities: parent: 853 type: Transform - uid: 493 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,5.5 parent: 853 type: Transform - uid: 494 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -35.5,-2.5 parent: 853 type: Transform - uid: 495 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -36.5,10.5 parent: 853 type: Transform - uid: 496 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 0.5,8.5 parent: 853 type: Transform - uid: 497 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -3.5,7.5 parent: 853 type: Transform - uid: 498 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -2.5,20.5 parent: 853 type: Transform - uid: 499 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -4.5,22.5 parent: 853 type: Transform - uid: 500 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -7.5,23.5 parent: 853 type: Transform - uid: 501 - type: RandomSpawner + type: TrashSpawner 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: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,25.5 parent: 853 type: Transform - uid: 504 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -18.5,19.5 parent: 853 type: Transform - uid: 505 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -15.5,9.5 parent: 853 type: Transform - uid: 506 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -17.5,13.5 parent: 853 type: Transform - uid: 507 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,12.5 parent: 853 type: Transform - uid: 508 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -23.5,14.5 parent: 853 type: Transform - uid: 509 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -25.5,13.5 parent: 853 type: Transform - uid: 510 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -30.5,14.5 parent: 853 type: Transform - uid: 511 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -32.5,11.5 parent: 853 type: Transform - uid: 512 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -31.5,7.5 parent: 853 type: Transform - uid: 513 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: -21.5,10.5 @@ -12374,7 +12374,7 @@ entities: parent: 853 type: Transform - uid: 933 - type: RandomSpawner + type: TrashSpawner components: - rot: 4.371139006309477E-08 rad pos: 7.5,13.5 @@ -40729,4 +40729,34 @@ 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 5f3b4009e5..f670343f7e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/arcade.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/arcade.yml @@ -58,3 +58,18 @@ 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/Markers/Spawners/Random/bedsheet.yml b/Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml similarity index 67% rename from Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml rename to Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml index e002208204..262fd2e7ba 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/bedsheet.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/bedsheet_spawner.yml @@ -1,13 +1,17 @@ - type: entity name: Random Sheet Spawner id: BedsheetSpawner - parent: MarkerBase components: - type: Sprite - layers: - - state: red - - texture: Objects/Misc/bedsheets.rsi/random_bedsheet.png - - type: RandomSpawner + netsync: false + visible: false + sprite: Objects/Misc/bedsheets.rsi + state: random_bedsheet + - type: Marker + - type: Clickable + - type: InteractionOutline + - type: Physics + - type: TrashSpawner rarePrototypes: - BedsheetIan - BedsheetCosmos @@ -28,3 +32,5 @@ - BedsheetRainbow chance: 0.97 offset: 0 + placement: + mode: AlignTileAny diff --git a/Resources/Prototypes/Entities/Markers/clientsideclone.yml b/Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml similarity index 100% rename from Resources/Prototypes/Entities/Markers/clientsideclone.yml rename to Resources/Prototypes/Entities/Effects/Markers/clientsideclone.yml diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml similarity index 100% rename from Resources/Prototypes/Entities/Markers/construction_ghost.yml rename to Resources/Prototypes/Entities/Effects/Markers/construction_ghost.yml diff --git a/Resources/Prototypes/Entities/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml similarity index 100% rename from Resources/Prototypes/Entities/Markers/drag_shadow.yml rename to Resources/Prototypes/Entities/Effects/Markers/drag_shadow.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml similarity index 64% rename from Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml rename to Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml index 8b61c6a21b..71939a4229 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/gamemode_conditional_spawners.yml @@ -1,12 +1,22 @@ +- type: entity + name: base conditional spawner + id: BaseConditionalSpawner + parent: MarkerBase + abstract: true + components: + - type: ConditionalSpawner + - type: entity name: Suspicion Rifle Spawner id: SuspicionRifleSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Rifles/ak.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_rifle + - type: ConditionalSpawner prototypes: - RifleAk @@ -24,12 +34,14 @@ - type: entity name: Suspicion Pistol Spawner id: SuspicionPistolSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Pistols/colt.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_pistol + - type: ConditionalSpawner prototypes: - PistolClarissa @@ -50,12 +62,14 @@ - type: entity name: Suspicion Melee Spawner id: SuspicionMeleeSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_melee + - type: ConditionalSpawner prototypes: - ButchCleaver @@ -71,12 +85,14 @@ - type: entity name: Suspicion Revolver Spawner id: SuspicionRevolverSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Revolvers/inspector.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_revolver + - type: ConditionalSpawner prototypes: - RevolverDeckard @@ -89,12 +105,14 @@ - type: entity name: Suspicion Shotgun Spawner id: SuspicionShotgunSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_shotgun + - type: ConditionalSpawner prototypes: - ShotgunBojevic @@ -111,12 +129,14 @@ - type: entity name: Suspicion SMG Spawner id: SuspicionSMGSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_smg + - type: ConditionalSpawner prototypes: - SmgAtreides @@ -131,12 +151,14 @@ - type: entity name: Suspicion Sniper Spawner id: SuspicionSniperSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_sniper + - type: ConditionalSpawner prototypes: - SniperBoltGun @@ -149,12 +171,14 @@ - type: entity name: Suspicion Hitscan Spawner id: SuspicionHitscanSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Battery/xray.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_hitscan + - type: ConditionalSpawner prototypes: - RedLaser @@ -171,12 +195,14 @@ - type: entity name: Suspicion Launchers Spawner id: SuspicionLaunchersSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Launchers/rocket.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_launcher + - type: ConditionalSpawner prototypes: - LauncherChinaLake @@ -188,12 +214,14 @@ - type: entity name: Suspicion Grenades Spawner id: SuspicionGrenadesSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Grenades/grenade.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_grenade + - type: ConditionalSpawner prototypes: - ExGrenade @@ -211,12 +239,14 @@ - type: entity name: Suspicion Rifle Ammo Spawner id: SuspicionRifleMagazineSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_rifle_ammo + - type: ConditionalSpawner prototypes: - MagazineSRifle @@ -232,12 +262,14 @@ - type: entity name: Suspicion Shotgun Ammo Spawner id: SuspicionShotgunMagazineSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_shotgun_ammo + - type: ConditionalSpawner prototypes: - MagazineShotgun @@ -248,12 +280,14 @@ - type: entity name: Suspicion Pistol Ammo Spawner id: SuspicionPistolMagazineSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_pistol_ammo + - type: ConditionalSpawner prototypes: - MagazinePistol @@ -265,12 +299,14 @@ - type: entity name: Suspicion Magnum Ammo Spawner id: SuspicionMagnumMagazineSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_magnum_ammo + - type: ConditionalSpawner prototypes: - MagazineMagnum @@ -282,12 +318,14 @@ - type: entity name: Suspicion Launcher Ammo Spawner id: SuspicionLauncherAmmoSpawner - parent: MarkerBase + parent: BaseConditionalSpawner components: - type: Sprite - layers: - - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/frag.png + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_launcher_ammo + - type: ConditionalSpawner prototypes: - RocketAmmo @@ -295,3 +333,22 @@ 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/hover_entity.yml b/Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml similarity index 100% rename from Resources/Prototypes/Entities/Markers/hover_entity.yml rename to Resources/Prototypes/Entities/Effects/Markers/hover_entity.yml diff --git a/Resources/Prototypes/Entities/Markers/marker_base.yml b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml similarity index 62% rename from Resources/Prototypes/Entities/Markers/marker_base.yml rename to Resources/Prototypes/Entities/Effects/Markers/marker_base.yml index 3ddae99078..9ef628f01e 100644 --- a/Resources/Prototypes/Entities/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/marker_base.yml @@ -6,9 +6,12 @@ - type: Clickable - type: InteractionOutline - type: Sprite - sprite: Markers/cross.rsi -# If serialization was cool this would work. -# layers: -# - state: blue + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: cross_blue placement: mode: AlignTileAny + + + diff --git a/Resources/Prototypes/Entities/Markers/pointing.yml b/Resources/Prototypes/Entities/Effects/Markers/pointing.yml similarity index 100% rename from Resources/Prototypes/Entities/Markers/pointing.yml rename to Resources/Prototypes/Entities/Effects/Markers/pointing.yml diff --git a/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml new file mode 100644 index 0000000000..683e9bc725 --- /dev/null +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points.yml @@ -0,0 +1,27 @@ +- 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/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml similarity index 58% rename from Resources/Prototypes/Entities/Markers/Spawners/jobs.yml rename to Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml index 61b7aac2df..aa69146831 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml @@ -1,297 +1,251 @@ # Base - - type: entity id: SpawnPointJobBase - parent: MarkerBase + parent: SpawnPoint abstract: true - suffix: Job Spawn components: - type: SpawnPoint spawn_type: Job - - type: Sprite - sprite: Markers/jobs.rsi +# Assistant - type: entity - name: observer spawn point - id: SpawnPointObserver + id: SpawnPointAssistant parent: SpawnPointJobBase + name: spawn point (assistant) 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: + job_id: Assistant - type: Sprite - state: green - - type: SpawnPoint - spawn_type: LateJoin - -# Cargo + state: Assistant +# Quartermaster #- type: entity # id: SpawnPointQuartermaster # parent: SpawnPointJobBase -# name: quartermaster +# name: spawn point (quartermaster) # components: # - type: SpawnPoint # job_id: Quartermaster # - type: Sprite # state: Quartermaster +# Cargo tech - type: entity id: SpawnPointCargoTechnician parent: SpawnPointJobBase - name: cargotechnician + name: spawn point (cargotechnician) components: - type: SpawnPoint job_id: CargoTechnician - type: Sprite - layers: - - state: green - - state: cargo_tech + state: Cargo Technician -# 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: bartender + name: spawn point (bartender) components: - type: SpawnPoint job_id: Bartender - type: Sprite - layers: - - state: green - - state: bartender + state: Bartender + +# Chef - type: entity id: SpawnPointChef parent: SpawnPointJobBase - name: chef + name: spawn point (chef) components: - type: SpawnPoint job_id: Chef - type: Sprite - layers: - - state: green - - state: chef + state: Cook +# Botanist - type: entity id: SpawnPointBotanist parent: SpawnPointJobBase - name: botanist + name: spawn point (botanist) components: - - type: SpawnPoint - job_id: Botanist - - type: Sprite - layers: - - state: green - - state: botanist + - type: SpawnPoint + job_id: Botanist + - type: Sprite + state: Botanist +# Clown - type: entity id: SpawnPointClown parent: SpawnPointJobBase - name: clown + name: spawn point (clown) components: - type: SpawnPoint job_id: Clown - type: Sprite - layers: - - state: green - - state: clown + state: Clown + +# Mime - type: entity id: SpawnPointMime parent: SpawnPointJobBase - name: mime + name: spawn point (mime) components: - type: SpawnPoint job_id: Mime - type: Sprite - layers: - - state: green - - state: mime + state: Mime +# Chaplain #- type: entity # id: SpawnPointChaplain # parent: SpawnPointJobBase -# name: chaplain +# name: spawn point (chaplain) # components: # - type: SpawnPoint # job_id: Chaplain # - type: Sprite # state: Chaplain +# Janitor - type: entity id: SpawnPointJanitor parent: SpawnPointJobBase - name: janitor + name: spawn point (janitor) components: - type: SpawnPoint job_id: Janitor - type: Sprite - layers: - - state: green - - state: janitor + state: Janitor -# Command +# Captain - type: entity id: SpawnPointCaptain parent: SpawnPointJobBase - name: captain + name: spawn point (captain) components: - type: SpawnPoint job_id: Captain - type: Sprite - layers: - - state: green - - state: captain + state: Captain + +# Head of Personnel - type: entity id: SpawnPointHeadOfPersonnel parent: SpawnPointJobBase - name: headofpersonnel + name: spawn point (headofpersonnel) components: - type: SpawnPoint job_id: HeadOfPersonnel - type: Sprite - layers: - - state: green - - state: hop + state: Head of Personnel -# Engineering +# ChiefEngineer - type: entity id: SpawnPointChiefEngineer parent: SpawnPointJobBase - name: chiefengineer + name: spawn point (chiefengineer) components: - type: SpawnPoint job_id: ChiefEngineer - type: Sprite - layers: - - state: green - - state: ce + state: Chief Engineer + +# StationEngineer - type: entity id: SpawnPointStationEngineer parent: SpawnPointJobBase - name: stationengineer + name: spawn point (stationengineer) components: - type: SpawnPoint job_id: StationEngineer - type: Sprite - layers: - - state: green - - state: engineer + state: Station Engineer -# Medical +# ChiefMedicalOfficer - type: entity id: SpawnPointChiefMedicalOfficer parent: SpawnPointJobBase - name: chiefmedicalofficer + name: spawn point (chiefmedicalofficer) components: - type: SpawnPoint job_id: ChiefMedicalOfficer - type: Sprite - layers: - - state: green - - state: cmo + state: Chief Medical Officer + +# MedicalDoctor - type: entity id: SpawnPointMedicalDoctor parent: SpawnPointJobBase - name: medicaldoctor + name: spawn point (medicaldoctor) components: - type: SpawnPoint job_id: MedicalDoctor - type: Sprite - layers: - - state: green - - state: doctor + state: Medical Doctor -# Science +# ResearchDirector - type: entity id: SpawnPointResearchDirector parent: SpawnPointJobBase - name: researchdirector + name: spawn point (researchdirector) components: - type: SpawnPoint job_id: ResearchDirector - type: Sprite - layers: - - state: green - - state: rd + state: Research Director + +# Scientist - type: entity id: SpawnPointScientist parent: SpawnPointJobBase - name: scientist + name: spawn point (scientist) components: - type: SpawnPoint job_id: Scientist - type: Sprite - layers: - - state: green - - state: scientist + state: Scientist -# Security +# HeadOfSecurity - type: entity id: SpawnPointHeadOfSecurity parent: SpawnPointJobBase - name: headofsecurity + name: spawn point (headofsecurity) components: - type: SpawnPoint job_id: HeadOfSecurity - type: Sprite - layers: - - state: green - - state: hos + state: Head of Security +# Warden - type: entity id: SpawnPointWarden parent: SpawnPointJobBase - name: warden + name: spawn point (warden) components: - - type: SpawnPoint - job_id: Warden - - type: Sprite - layers: - - state: green - - state: warden + - type: SpawnPoint + job_id: Warden + - type: Sprite + state: Warden +# SecurityOfficer - type: entity id: SpawnPointSecurityOfficer parent: SpawnPointJobBase - name: securityofficer + name: spawn point (securityofficer) components: - type: SpawnPoint job_id: SecurityOfficer - type: Sprite - layers: - - state: green - - state: security_officer + state: Security Officer diff --git a/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml new file mode 100644 index 0000000000..0ce439b354 --- /dev/null +++ b/Resources/Prototypes/Entities/Effects/Markers/timed_spawners.yml @@ -0,0 +1,74 @@ +- 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/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml similarity index 80% rename from Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml rename to Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml index b7bcfa81a6..cbd285d48e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/toy_spawner.yml @@ -4,10 +4,11 @@ parent: MarkerBase components: - type: Sprite - layers: - - state: red - - texture: Objects/Fun/toys.rsi/plushie_h.png - - type: RandomSpawner + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_toy + - type: TrashSpawner rarePrototypes: - CarvingHelpMe - CarvingHello @@ -34,10 +35,11 @@ parent: MarkerBase components: - type: Sprite - layers: - - state: red - - texture: Objects/Fun/toys.rsi/ripleytoy.png - - type: RandomSpawner + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_figure + - type: TrashSpawner prototypes: - ToyAi - ToyNuke diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml similarity index 69% rename from Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml rename to Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml index 6029aeb5f8..e521e6af69 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/trash_spawner.yml @@ -1,13 +1,18 @@ - type: entity name: Trash Spawner - id: RandomSpawner - parent: MarkerBase + id: TrashSpawner components: - type: Sprite - layers: - - state: red - - texture: Objects/Consumable/Trash/candy.rsi/icon.png - - type: RandomSpawner + netsync: false + visible: false + sprite: Interface/Misc/markers.rsi + state: spawner_trash + + - type: Marker + - type: Clickable + - type: InteractionOutline + - type: Physics + - type: TrashSpawner rarePrototypes: - PuddleVomit - TrashPlate diff --git a/Resources/Prototypes/Entities/Markers/warp_point.yml b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml similarity index 82% rename from Resources/Prototypes/Entities/Markers/warp_point.yml rename to Resources/Prototypes/Entities/Effects/Markers/warp_point.yml index b4bd38464f..1806459627 100644 --- a/Resources/Prototypes/Entities/Markers/warp_point.yml +++ b/Resources/Prototypes/Entities/Effects/Markers/warp_point.yml @@ -5,4 +5,8 @@ components: - type: WarpPoint - type: Sprite - state: pink + state: cross_pink + + + + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml deleted file mode 100644 index a68ffe83d1..0000000000 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/timed.yml +++ /dev/null @@ -1,36 +0,0 @@ -- 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 deleted file mode 100644 index 3a4b4236ad..0000000000 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml +++ /dev/null @@ -1,15 +0,0 @@ -- 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 deleted file mode 100644 index 83786369a0..0000000000 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/arcade.yml +++ /dev/null @@ -1,10 +0,0 @@ -- 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/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml deleted file mode 100644 index 80a02ea0c3..0000000000 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ /dev/null @@ -1,17 +0,0 @@ -# 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/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 1911dae349..f245a7e8d6 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: Markers/jobs.rsi - state: centcom + sprite: Interface/Misc/markers.rsi + state: Centcom - type: GhostRoleMobSpawner prototype: HumanMob_CentcomOfficial deleteOnSpawn: true diff --git a/Resources/Prototypes/Entities/chemistry.yml b/Resources/Prototypes/Entities/chemistry.yml new file mode 100644 index 0000000000..c9589e17f8 --- /dev/null +++ b/Resources/Prototypes/Entities/chemistry.yml @@ -0,0 +1,8 @@ +- type: entity + parent: BaseItem + id: ReagentItem + name: "reagent item" + abstract: true + components: + - type: SolutionContainer + maxVol: 5 diff --git a/Resources/Prototypes/Entities/clicktest.yml b/Resources/Prototypes/Entities/clicktest.yml new file mode 100644 index 0000000000..fb154ae7a0 --- /dev/null +++ b/Resources/Prototypes/Entities/clicktest.yml @@ -0,0 +1,83 @@ +# Entities specifically for testing click detection with ClickableComponent. +# +# Each entity has a bounding box AND texture equivalent. +# Note that bounding box versions still have dots on the outside or center to make it possible to... see them. +# These dots' texture detection should not interfere with the actual bounding box being tested. + +- type: entity + abstract: true + id: ClickTestBase + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + noRot: false + sprite: Effects/clicktest.rsi + + +- type: entity + id: ClickTestRotatingCornerVisible + name: ClickTestRotatingCornerVisible + parent: ClickTestBase + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + state: rotating_corner + +- type: entity + id: ClickTestRotatingCornerVisibleNoRot + name: ClickTestRotatingCornerVisibleNoRot + parent: ClickTestRotatingCornerVisible + components: + - type: Sprite + noRot: true + +- type: entity + id: ClickTestRotatingCornerInvisible + name: ClickTestRotatingCornerInvisible + parent: ClickTestBase + components: + - type: Clickable + bounds: + south: "0.125,0.125,0.375,0.375" + north: "-0.375,-0.375,-0.125,-0.125" + east: "0.125,-0.375,0.375,-0.125" + west: "-0.375,0.125,-0.125,0.375" + + - type: InteractionOutline + - type: Sprite + state: invis_base + +- type: entity + id: ClickTestRotatingCornerInvisibleNoRot + name: ClickTestRotatingCornerInvisibleNoRot + parent: ClickTestRotatingCornerInvisible + components: + - type: Sprite + noRot: true + + +- type: entity + id: ClickTestFixedCornerVisible + name: ClickTestFixedCornerVisible + parent: ClickTestBase + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + state: fixed_corner + +- type: entity + id: ClickTestFixedCornerInvisible + name: ClickTestFixedCornerInvisible + parent: ClickTestBase + components: + - type: Clickable + bounds: + all: "0.125,0.125,0.375,0.375" + + - type: InteractionOutline + - type: Sprite + state: invis_base + diff --git a/Resources/Prototypes/Entities/stress_test.yml b/Resources/Prototypes/Entities/stress_test.yml new file mode 100644 index 0000000000..979e2c7cd0 --- /dev/null +++ b/Resources/Prototypes/Entities/stress_test.yml @@ -0,0 +1,7 @@ +- type: entity + id: StressTest + name: stress test + components: + - type: Sprite + texture: Effects/explosion.rsi/explosion.png + - type: StressTestMovement diff --git a/Resources/Textures/Markers/jobs.rsi/ai.png b/Resources/Textures/Interface/Misc/markers.rsi/AI.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/ai.png rename to Resources/Textures/Interface/Misc/markers.rsi/AI.png diff --git a/Resources/Textures/Markers/jobs.rsi/assistant.png b/Resources/Textures/Interface/Misc/markers.rsi/Assistant.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/assistant.png rename to Resources/Textures/Interface/Misc/markers.rsi/Assistant.png diff --git a/Resources/Textures/Markers/jobs.rsi/atmospherics.png b/Resources/Textures/Interface/Misc/markers.rsi/Atmospheric Technician.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/atmospherics.png rename to Resources/Textures/Interface/Misc/markers.rsi/Atmospheric Technician.png diff --git a/Resources/Textures/Markers/jobs.rsi/bartender.png b/Resources/Textures/Interface/Misc/markers.rsi/Bartender.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/bartender.png rename to Resources/Textures/Interface/Misc/markers.rsi/Bartender.png diff --git a/Resources/Textures/Markers/jobs.rsi/botanist.png b/Resources/Textures/Interface/Misc/markers.rsi/Botanist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/botanist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Botanist.png diff --git a/Resources/Textures/Markers/jobs.rsi/captain.png b/Resources/Textures/Interface/Misc/markers.rsi/Captain.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/captain.png rename to Resources/Textures/Interface/Misc/markers.rsi/Captain.png diff --git a/Resources/Textures/Markers/jobs.rsi/cargo_tech.png b/Resources/Textures/Interface/Misc/markers.rsi/Cargo Technician.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/cargo_tech.png rename to Resources/Textures/Interface/Misc/markers.rsi/Cargo Technician.png diff --git a/Resources/Textures/Markers/jobs.rsi/centcom.png b/Resources/Textures/Interface/Misc/markers.rsi/Centcom.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/centcom.png rename to Resources/Textures/Interface/Misc/markers.rsi/Centcom.png diff --git a/Resources/Textures/Markers/jobs.rsi/chaplain.png b/Resources/Textures/Interface/Misc/markers.rsi/Chaplain.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/chaplain.png rename to Resources/Textures/Interface/Misc/markers.rsi/Chaplain.png diff --git a/Resources/Textures/Markers/jobs.rsi/chemist.png b/Resources/Textures/Interface/Misc/markers.rsi/Chemist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/chemist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Chemist.png diff --git a/Resources/Textures/Markers/jobs.rsi/ce.png b/Resources/Textures/Interface/Misc/markers.rsi/Chief Engineer.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/ce.png rename to Resources/Textures/Interface/Misc/markers.rsi/Chief Engineer.png diff --git a/Resources/Textures/Markers/jobs.rsi/cmo.png b/Resources/Textures/Interface/Misc/markers.rsi/Chief Medical Officer.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/cmo.png rename to Resources/Textures/Interface/Misc/markers.rsi/Chief Medical Officer.png diff --git a/Resources/Textures/Markers/jobs.rsi/clown.png b/Resources/Textures/Interface/Misc/markers.rsi/Clown.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/clown.png rename to Resources/Textures/Interface/Misc/markers.rsi/Clown.png diff --git a/Resources/Textures/Markers/jobs.rsi/chef.png b/Resources/Textures/Interface/Misc/markers.rsi/Cook.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/chef.png rename to Resources/Textures/Interface/Misc/markers.rsi/Cook.png diff --git a/Resources/Textures/Markers/jobs.rsi/curator.png b/Resources/Textures/Interface/Misc/markers.rsi/Curator.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/curator.png rename to Resources/Textures/Interface/Misc/markers.rsi/Curator.png diff --git a/Resources/Textures/Markers/jobs.rsi/cyborg.png b/Resources/Textures/Interface/Misc/markers.rsi/Cyborg.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/cyborg.png rename to Resources/Textures/Interface/Misc/markers.rsi/Cyborg.png diff --git a/Resources/Textures/Markers/jobs.rsi/detective.png b/Resources/Textures/Interface/Misc/markers.rsi/Detective.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/detective.png rename to Resources/Textures/Interface/Misc/markers.rsi/Detective.png diff --git a/Resources/Textures/Markers/jobs.rsi/geneticist.png b/Resources/Textures/Interface/Misc/markers.rsi/Geneticist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/geneticist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Geneticist.png diff --git a/Resources/Textures/Markers/jobs.rsi/hop.png b/Resources/Textures/Interface/Misc/markers.rsi/Head of Personnel.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/hop.png rename to Resources/Textures/Interface/Misc/markers.rsi/Head of Personnel.png diff --git a/Resources/Textures/Markers/jobs.rsi/hos.png b/Resources/Textures/Interface/Misc/markers.rsi/Head of Security.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/hos.png rename to Resources/Textures/Interface/Misc/markers.rsi/Head of Security.png diff --git a/Resources/Textures/Markers/jobs.rsi/janitor.png b/Resources/Textures/Interface/Misc/markers.rsi/Janitor.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/janitor.png rename to Resources/Textures/Interface/Misc/markers.rsi/Janitor.png diff --git a/Resources/Textures/Markers/jobs.rsi/lawyer.png b/Resources/Textures/Interface/Misc/markers.rsi/Lawyer.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/lawyer.png rename to Resources/Textures/Interface/Misc/markers.rsi/Lawyer.png diff --git a/Resources/Textures/Markers/jobs.rsi/doctor.png b/Resources/Textures/Interface/Misc/markers.rsi/Medical Doctor.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/doctor.png rename to Resources/Textures/Interface/Misc/markers.rsi/Medical Doctor.png diff --git a/Resources/Textures/Markers/jobs.rsi/mime.png b/Resources/Textures/Interface/Misc/markers.rsi/Mime.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/mime.png rename to Resources/Textures/Interface/Misc/markers.rsi/Mime.png diff --git a/Resources/Textures/Markers/jobs.rsi/paramedic.png b/Resources/Textures/Interface/Misc/markers.rsi/Paramedic.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/paramedic.png rename to Resources/Textures/Interface/Misc/markers.rsi/Paramedic.png diff --git a/Resources/Textures/Markers/jobs.rsi/prisoner.png b/Resources/Textures/Interface/Misc/markers.rsi/Prisoner.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/prisoner.png rename to Resources/Textures/Interface/Misc/markers.rsi/Prisoner.png diff --git a/Resources/Textures/Markers/jobs.rsi/psychologist.png b/Resources/Textures/Interface/Misc/markers.rsi/Psychologist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/psychologist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Psychologist.png diff --git a/Resources/Textures/Markers/jobs.rsi/qm.png b/Resources/Textures/Interface/Misc/markers.rsi/Quartermaster.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/qm.png rename to Resources/Textures/Interface/Misc/markers.rsi/Quartermaster.png diff --git a/Resources/Textures/Markers/jobs.rsi/rd.png b/Resources/Textures/Interface/Misc/markers.rsi/Research Director.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/rd.png rename to Resources/Textures/Interface/Misc/markers.rsi/Research Director.png diff --git a/Resources/Textures/Markers/jobs.rsi/roboticist.png b/Resources/Textures/Interface/Misc/markers.rsi/Roboticist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/roboticist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Roboticist.png diff --git a/Resources/Textures/Markers/jobs.rsi/scientist.png b/Resources/Textures/Interface/Misc/markers.rsi/Scientist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/scientist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Scientist.png diff --git a/Resources/Textures/Markers/jobs.rsi/security_officer.png b/Resources/Textures/Interface/Misc/markers.rsi/Security Officer.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/security_officer.png rename to Resources/Textures/Interface/Misc/markers.rsi/Security Officer.png diff --git a/Resources/Textures/Markers/jobs.rsi/miner.png b/Resources/Textures/Interface/Misc/markers.rsi/Shaft Miner.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/miner.png rename to Resources/Textures/Interface/Misc/markers.rsi/Shaft Miner.png diff --git a/Resources/Textures/Markers/jobs.rsi/engineer.png b/Resources/Textures/Interface/Misc/markers.rsi/Station Engineer.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/engineer.png rename to Resources/Textures/Interface/Misc/markers.rsi/Station Engineer.png diff --git a/Resources/Textures/Markers/jobs.rsi/virologist.png b/Resources/Textures/Interface/Misc/markers.rsi/Virologist.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/virologist.png rename to Resources/Textures/Interface/Misc/markers.rsi/Virologist.png diff --git a/Resources/Textures/Markers/jobs.rsi/warden.png b/Resources/Textures/Interface/Misc/markers.rsi/Warden.png similarity index 100% rename from Resources/Textures/Markers/jobs.rsi/warden.png rename to Resources/Textures/Interface/Misc/markers.rsi/Warden.png diff --git a/Resources/Textures/Markers/cross.rsi/blue.png b/Resources/Textures/Interface/Misc/markers.rsi/cross_blue.png similarity index 100% rename from Resources/Textures/Markers/cross.rsi/blue.png rename to Resources/Textures/Interface/Misc/markers.rsi/cross_blue.png diff --git a/Resources/Textures/Markers/cross.rsi/green.png b/Resources/Textures/Interface/Misc/markers.rsi/cross_green.png similarity index 100% rename from Resources/Textures/Markers/cross.rsi/green.png rename to Resources/Textures/Interface/Misc/markers.rsi/cross_green.png diff --git a/Resources/Textures/Markers/cross.rsi/pink.png b/Resources/Textures/Interface/Misc/markers.rsi/cross_pink.png similarity index 100% rename from Resources/Textures/Markers/cross.rsi/pink.png rename to Resources/Textures/Interface/Misc/markers.rsi/cross_pink.png diff --git a/Resources/Textures/Markers/cross.rsi/red.png b/Resources/Textures/Interface/Misc/markers.rsi/cross_red.png similarity index 100% rename from Resources/Textures/Markers/cross.rsi/red.png rename to Resources/Textures/Interface/Misc/markers.rsi/cross_red.png diff --git a/Resources/Textures/Interface/Misc/markers.rsi/meta.json b/Resources/Textures/Interface/Misc/markers.rsi/meta.json new file mode 100644 index 0000000000..cb45857293 --- /dev/null +++ b/Resources/Textures/Interface/Misc/markers.rsi/meta.json @@ -0,0 +1,196 @@ +{ + "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 new file mode 100644 index 0000000000..309baacb03 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/observer_start.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png new file mode 100644 index 0000000000..6e7304d762 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_ai.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png new file mode 100644 index 0000000000..ac87bd0a27 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_figure.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png new file mode 100644 index 0000000000..bac248ef76 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_grenade.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png new file mode 100644 index 0000000000..5d6dbe39ec Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_hitscan.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png new file mode 100644 index 0000000000..63f0e1b0cc Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher.png 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 new file mode 100644 index 0000000000..b7cffe180e Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_launcher_ammo.png 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 new file mode 100644 index 0000000000..3b59a3ca46 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_magnum_ammo.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png new file mode 100644 index 0000000000..7a1ea775d6 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_melee.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png new file mode 100644 index 0000000000..745347acba Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol.png 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 new file mode 100644 index 0000000000..1e5330cfe2 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_pistol_ammo.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png new file mode 100644 index 0000000000..0e8add9464 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_revolver.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png new file mode 100644 index 0000000000..2dbb558c05 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle.png 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 new file mode 100644 index 0000000000..1c9372e9ea Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_rifle_ammo.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png new file mode 100644 index 0000000000..86092fefa5 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun.png 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 new file mode 100644 index 0000000000..2c341f2218 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_shotgun_ammo.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png new file mode 100644 index 0000000000..b0fb68c028 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_smg.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png new file mode 100644 index 0000000000..b1eef469be Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_sniper.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png new file mode 100644 index 0000000000..9a742f58fd Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_toy.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png new file mode 100644 index 0000000000..0a685dc041 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_trash.png differ diff --git a/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png b/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png new file mode 100644 index 0000000000..4f64d33046 Binary files /dev/null and b/Resources/Textures/Interface/Misc/markers.rsi/spawner_xenoai.png differ diff --git a/Resources/Textures/Markers/cross.rsi/ai.png b/Resources/Textures/Markers/cross.rsi/ai.png deleted file mode 100644 index d74d91be4d..0000000000 Binary files a/Resources/Textures/Markers/cross.rsi/ai.png and /dev/null differ diff --git a/Resources/Textures/Markers/cross.rsi/meta.json b/Resources/Textures/Markers/cross.rsi/meta.json deleted file mode 100644 index 02985b8097..0000000000 --- a/Resources/Textures/Markers/cross.rsi/meta.json +++ /dev/null @@ -1,26 +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": "blue" - }, - { - "name": "green" - }, - { - "name": "pink" - }, - { - "name": "red" - } - ] -} diff --git a/Resources/Textures/Markers/jobs.rsi/green.png b/Resources/Textures/Markers/jobs.rsi/green.png deleted file mode 100644 index 0becfdb0c5..0000000000 Binary files a/Resources/Textures/Markers/jobs.rsi/green.png and /dev/null differ diff --git a/Resources/Textures/Markers/jobs.rsi/meta.json b/Resources/Textures/Markers/jobs.rsi/meta.json deleted file mode 100644 index cff1d577a0..0000000000 --- a/Resources/Textures/Markers/jobs.rsi/meta.json +++ /dev/null @@ -1,122 +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": "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" - } - ] -}