diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml index 87af129eab..3739900bfe 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml @@ -5,6 +5,7 @@ components: - type: Clickable - type: InteractionOutline + - type: Rotatable - type: Physics bodyType: Static canCollide: false diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 1e8b9ba8a8..fa9879659a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -9,16 +9,6 @@ name: monkey painting description: Return to monky. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: monkey_painting @@ -30,17 +20,6 @@ name: sec sign description: A direction sign, pointing out which way Security is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_sec @@ -50,80 +29,33 @@ name: evac sign description: A direction sign, pointing out which way evac is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_evac - - type: entity parent: BaseSign id: SignDirectionalBridge name: bridge sign description: A direction sign, pointing out which way the Bridge is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_bridge - - type: entity parent: BaseSign id: SignDirectionalMed name: medical sign description: A direction sign, pointing out which way the Medical department is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_med - - type: entity parent: BaseSign id: SignDirectionalEng name: engineering sign description: A direction sign, pointing out which way the Engineering department is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_eng @@ -133,17 +65,6 @@ name: science sign description: A direction sign, pointing out which way the Science department is. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_sci @@ -153,209 +74,121 @@ name: supply sign description: A direction sign, pointing to some supplies. components: - - type: Rotatable - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.4,-0.1,0.4,0.1" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: direction_supply # Regular Signs # Descriptions intentionally left empty. +- type: entity + parent: BaseSign + id: SignAi + name: ai sign + components: + - type: Sprite + state: ai + - type: entity parent: BaseSign id: SignArmory name: armory sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: armory - - type: entity parent: BaseSign id: SignToolStorage name: tool storage sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: ass - - type: entity parent: BaseSign id: SignAnomaly name: anomaly lab sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: anomaly - - type: entity parent: BaseSign id: SignAtmos name: atmos sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos - - type: entity parent: BaseSign id: SignBar name: bar sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: bar +- type: entity + parent: BaseSign + id: SignHydro1 + name: hydro sign + components: + - type: Sprite + state: hydro1 + +- type: entity + parent: BaseSign + id: SignHydro2 + name: hydro sign + components: + - type: Sprite + state: hydro2 + +- type: entity + parent: BaseSign + id: SignHydro3 + name: hydro sign + components: + - type: Sprite + state: hydro3 - type: entity parent: BaseSign id: SignLibrary name: library sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: biblio - - type: entity parent: BaseSign id: SignChapel name: chapel sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: chapel - - type: entity parent: BaseSign id: SignHead name: head sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: commander - - type: entity parent: BaseSign id: SignConference name: conference room sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: conference_room - - type: entity parent: BaseSign id: SignDrones name: drones sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: drones @@ -364,16 +197,6 @@ id: SignEngine name: engine sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: engine @@ -382,16 +205,6 @@ id: SignCloning name: cloning sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: cloning @@ -400,16 +213,6 @@ id: SignInterrogation name: interrogation sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: interrogation @@ -418,16 +221,6 @@ id: SignSurgery name: surgery sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: surgery @@ -436,16 +229,6 @@ id: SignTelecomms name: telecomms sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: telecoms @@ -454,16 +237,6 @@ id: SignCargo name: cargo sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: cargo @@ -472,16 +245,6 @@ id: SignCargoDock name: cargo dock sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: cargo_dock @@ -490,34 +253,30 @@ id: SignChem name: chemistry sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: chem +- type: entity + parent: BaseSign + id: SignChemistry1 + name: chemistry sign + components: + - type: Sprite + state: chemistry1 + +- type: entity + parent: BaseSign + id: SignChemistry2 + name: chemistry sign + components: + - type: Sprite + state: chemistry2 + - type: entity parent: BaseSign id: SignShipDock name: docking sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: dock @@ -526,16 +285,6 @@ id: SignEngineering name: engineering sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: eng @@ -544,16 +293,6 @@ id: SignEVA name: EVA sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: eva @@ -562,16 +301,6 @@ id: SignGravity name: gravity sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: gravi @@ -580,16 +309,6 @@ id: SignMedical name: medbay sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: medbay @@ -598,16 +317,6 @@ id: SignMorgue name: morgue sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: morgue @@ -616,16 +325,6 @@ id: SignPrison name: prison sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: prison @@ -634,16 +333,6 @@ id: SignRND name: research and development sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: rnd @@ -652,55 +341,314 @@ id: SignScience name: science sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: sci +- type: entity + parent: BaseSign + id: SignScience1 + name: science sign + components: + - type: Sprite + state: science1 + +- type: entity + parent: BaseSign + id: SignScience2 + name: science sign + components: + - type: Sprite + state: science2 + - type: entity parent: BaseSign id: SignToxins name: toxins sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: toxins +- type: entity + parent: BaseSign + id: SignToxins2 + name: toxins sign + components: + - type: Sprite + state: toxins2 + - type: entity parent: BaseSign id: SignBridge name: bridge sign components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: bridge +- type: entity + parent: BaseSign + id: SignBio + name: bio sign + components: + - type: Sprite + state: bio + +- type: entity + parent: BaseSign + id: SignBiohazard + name: biohazard sign + components: + - type: Sprite + state: biohazard + +- type: entity + parent: BaseSign + id: SignCanisters + name: canisters sign + components: + - type: Sprite + state: canisters + +- type: entity + parent: BaseSign + id: SignCorrosives + name: corrosives sign + components: + - type: Sprite + state: corrosives + +- type: entity + parent: BaseSign + id: SignCryogenics + name: cryogenics sign + components: + - type: Sprite + state: cryogenics + +- type: entity + parent: BaseSign + id: SignDanger + name: danger sign + components: + - type: Sprite + state: danger + +- type: entity + parent: BaseSign + id: SignDisposalSpace + name: disposal sign + description: "Disposal: Leads to space" + components: + - type: Sprite + state: deathsposal + +- type: entity + parent: BaseSign + id: SignDoors + name: doors sign + components: + - type: Sprite + state: doors + +- type: entity + parent: BaseSign + id: SignElectrical + name: electrical sign + components: + - type: Sprite + state: electrical + +- type: entity + parent: BaseSign + id: SignExamroom + name: examination room sign + components: + - type: Sprite + state: examroom + +- type: entity + parent: BaseSign + id: SignExplosives + name: explosives sign + components: + - type: Sprite + state: explosives + +- type: entity + parent: BaseSign + id: SignFire + name: fire sign + components: + - type: Sprite + state: fire + +- type: entity + parent: BaseSign + id: SignFlammable + name: flammable sign + components: + - type: Sprite + state: flammable + +- type: entity + parent: BaseSign + id: SignLaser + name: laser sign + components: + - type: Sprite + state: laser + +- type: entity + parent: BaseSign + id: SignMagnetics + name: magnetics sign + components: + - type: Sprite + state: magnetics + +- type: entity + parent: BaseSign + id: SignMail + name: mail sign + components: + - type: Sprite + state: mail + +- type: entity + parent: BaseSign + id: SignMemetic + name: memetic sign + components: + - type: Sprite + state: memetic + +- type: entity + parent: BaseSign + id: SignMinerDock + name: miner dock sign + components: + - type: Sprite + state: miner_dock + +- type: entity + parent: BaseSign + id: SignNosmoking + name: nosmoking sign + components: + - type: Sprite + state: nosmoking + +- type: entity + parent: BaseSign + id: SignOptical + name: optical sign + components: + - type: Sprite + state: optical + +- type: entity + parent: BaseSign + id: SigN + name: oxidants signoxidants + components: + - type: Sprite + state: oxidants + +- type: entity + parent: BaseSign + id: SignPods + name: pods sign + components: + - type: Sprite + state: pods + +- type: entity + parent: BaseSign + id: SignRadiation + name: radiation sign + components: + - type: Sprite + state: radiation + +- type: entity + parent: BaseSign + id: SignRobo + name: robo sign + components: + - type: Sprite + state: robo + +- type: entity + parent: BaseSign + id: SignSecure + name: secure sign + components: + - type: Sprite + state: secure + +- type: entity + parent: BaseSign + id: SignSecurearea + name: securearea sign + components: + - type: Sprite + state: securearea + +- type: entity + parent: BaseSign + id: SignShield + name: shield sign + components: + - type: Sprite + state: shield + +- type: entity + parent: BaseSign + id: SignShock + name: shock sign + components: + - type: Sprite + state: shock + +- type: entity + parent: BaseSign + id: SignSpace + name: space sign + components: + - type: Sprite + state: space + +- type: entity + parent: BaseSign + id: SignVirology + name: virology sign + components: + - type: Sprite + state: virology + +- type: entity + parent: BaseSign + id: SignXenobio + name: xenobio sign + components: + - type: Sprite + state: xenobio + +- type: entity + parent: BaseSign + id: SignXenobio2 + name: xenobio sign + components: + - type: Sprite + state: xenobio2 + +- type: entity + parent: BaseSign + id: SignXenolab + name: xenolab sign + components: + - type: Sprite + state: xenolab + # Atmos Warnings - type: entity @@ -709,16 +657,6 @@ name: air warning sign description: WARNING! Air flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_air @@ -728,16 +666,6 @@ name: CO2 warning sign description: WARNING! CO2 flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_co2 @@ -747,16 +675,6 @@ name: N2 warning sign description: WARNING! N2 flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_n2 @@ -766,16 +684,6 @@ name: N2O warning sign description: WARNING! N2O flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_n2o @@ -785,16 +693,6 @@ name: O2 warning sign description: WARNING! O2 flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_o2 @@ -804,16 +702,6 @@ name: plasma waste sign description: WARNING! Plasma flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_plasma @@ -823,16 +711,6 @@ name: atmos waste sign description: WARNING! Waste flow tube. Ensure the flow is disengaged before working. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.2,0.3,0.2" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: atmos_waste @@ -842,16 +720,6 @@ name: no smoking sign description: A warning sign which reads 'NO SMOKING' components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: nosmoking2 @@ -861,16 +729,6 @@ name: old sign description: Technical information of some sort, shame its too worn-out to read. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: something-old1 @@ -880,15 +738,5 @@ name: old sign description: Looks like a planet crashing by some station above it. Its kinda scary. components: - - type: Physics - - type: Fixtures - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - layer: - - SmallImpassable - mask: - - VaultImpassable - type: Sprite state: something-old2 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index c05bf9d8a2..252f613bdb 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -758,7 +758,7 @@ ] }, { - "name": "toxin_res", + "name": "toxins2", "delays": [ [ 1 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png similarity index 100% rename from Resources/Textures/Structures/Wallmounts/signs.rsi/toxin_res.png rename to Resources/Textures/Structures/Wallmounts/signs.rsi/toxins2.png