From d4c4606cf43d4e7cda57d00af16b250b2ce9c2ad Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 10 Jun 2025 00:02:31 +0200 Subject: [PATCH] Revert tile aligned barsigns (#38185) fixtures for bar signs (#37756)" --- .../Structures/Wallmounts/Signs/bar_sign.yml | 165 +----------------- Resources/migration.yml | 28 +++ 2 files changed, 29 insertions(+), 164 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml index 05611d04c4..f00216393b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml @@ -1,6 +1,7 @@ - type: entity id: BaseBarSign parent: BaseStructure + name: bar sign abstract: true components: - type: MeleeSound @@ -9,18 +10,6 @@ collection: GlassSmash - type: WallMount arc: 360 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.95,-0.45,0.95,0.45" - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - type: Sprite drawdepth: WallMountedItems sprite: Structures/Wallmounts/barsign.rsi @@ -61,39 +50,12 @@ boardName: wires-board-name-barsign layoutId: BarSign -- type: entity - id: BaseBarSignAlignTile - parent: BaseBarSign - sufix: AlignTile - abstract: true - components: - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,1.45,0.45" - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - type: Sprite - offset: 0.5,0 - - type: entity parent: BaseBarSign id: BarSign name: bar sign suffix: Random -- type: entity - parent: BaseBarSignAlignTile - id: BarSignAlignTile - name: bar sign - suffix: Random, AlignTile - # Missing appearance components & various other sprite issues. #- type: entity # id: LargeBarSign @@ -119,11 +81,6 @@ - type: BarSign current: ComboCafe -- type: entity - parent: [BaseBarSignAlignTile, BarSignComboCafe] - id: BarSignComboCafeAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignEmergencyRumParty @@ -133,11 +90,6 @@ - type: BarSign current: EmergencyRumParty -- type: entity - parent: [BaseBarSignAlignTile, BarSignEmergencyRumParty] - id: BarSignEmergencyRumPartyAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignLV426 @@ -147,11 +99,6 @@ - type: BarSign current: LV426 -- type: entity - parent: [BaseBarSignAlignTile, BarSignLV426] - id: BarSignLV426AlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignMaidCafe @@ -161,11 +108,6 @@ - type: BarSign current: MaidCafe -- type: entity - parent: [BaseBarSignAlignTile, BarSignMaidCafe] - id: BarSignMaidCafeAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignMalteseFalcon @@ -175,11 +117,6 @@ - type: BarSign current: MalteseFalcon -- type: entity - parent: [BaseBarSignAlignTile, BarSignMalteseFalcon] - id: BarSignMalteseFalconAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignOfficerBeersky @@ -189,11 +126,6 @@ - type: BarSign current: OfficerBeersky -- type: entity - parent: [BaseBarSignAlignTile, BarSignOfficerBeersky] - id: BarSignOfficerBeerskyAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignRobustaCafe @@ -203,11 +135,6 @@ - type: BarSign current: RobustaCafe -- type: entity - parent: [BaseBarSignAlignTile, BarSignRobustaCafe] - id: BarSignRobustaCafeAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheAleNath @@ -217,11 +144,6 @@ - type: BarSign current: TheAleNath -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheAleNath] - id: BarSignTheAleNathAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheBirdCage @@ -231,11 +153,6 @@ - type: BarSign current: TheBirdCage -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheBirdCage] - id: BarSignTheBirdCageAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheCoderbus @@ -245,11 +162,6 @@ - type: BarSign current: TheCoderbus -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheCoderbus] - id: BarSignTheCoderbusAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheDrunkCarp @@ -259,11 +171,6 @@ - type: BarSign current: TheDrunkCarp -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheDrunkCarp] - id: BarSignTheDrunkCarpAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignEngineChange @@ -273,11 +180,6 @@ - type: BarSign current: EngineChange -- type: entity - parent: [BaseBarSignAlignTile, BarSignEngineChange] - id: BarSignEngineChangeAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheHarmbaton @@ -287,11 +189,6 @@ - type: BarSign current: Harmbaton -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheHarmbaton] - id: BarSignTheHarmbatonAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheLightbulb @@ -301,11 +198,6 @@ - type: BarSign current: TheLightbulb -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheLightbulb] - id: BarSignTheLightbulbAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheLooseGoose @@ -315,11 +207,6 @@ - type: BarSign current: Goose -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheLooseGoose] - id: BarSignTheLooseGooseAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheNet @@ -329,11 +216,6 @@ - type: BarSign current: TheNet -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheNet] - id: BarSignTheNetAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheOuterSpess @@ -343,11 +225,6 @@ - type: BarSign current: TheOuterSpess -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheOuterSpess] - id: BarSignTheOuterSpessAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheSingulo @@ -357,11 +234,6 @@ - type: BarSign current: TheSingulo -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheSingulo] - id: BarSignTheSinguloAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignTheSun @@ -371,11 +243,6 @@ - type: BarSign current: TheSun -- type: entity - parent: [BaseBarSignAlignTile, BarSignTheSun] - id: BarSignTheSunAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignWiggleRoom @@ -385,11 +252,6 @@ - type: BarSign current: WiggleRoom -- type: entity - parent: [BaseBarSignAlignTile, BarSignWiggleRoom] - id: BarSignWiggleRoomAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignZocalo @@ -399,11 +261,6 @@ - type: BarSign current: Zocalo -- type: entity - parent: [BaseBarSignAlignTile, BarSignZocalo] - id: BarSignZocaloAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignEmprah @@ -413,11 +270,6 @@ - type: BarSign current: Emprah -- type: entity - parent: [BaseBarSignAlignTile, BarSignEmprah] - id: BarSignEmprahAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignSpacebucks @@ -427,11 +279,6 @@ - type: BarSign current: Spacebucks -- type: entity - parent: [BaseBarSignAlignTile, BarSignSpacebucks] - id: BarSignSpacebucksAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignMaltroach @@ -441,11 +288,6 @@ - type: BarSign current: Maltroach -- type: entity - parent: [BaseBarSignAlignTile, BarSignMaltroach] - id: BarSignMaltroachAlignTile - suffix: AlignTile - - type: entity parent: BaseBarSign id: BarSignWhiskeyEchoes @@ -454,8 +296,3 @@ components: - type: BarSign current: WhiskeyEchoes - -- type: entity - parent: [BaseBarSignAlignTile, BarSignWhiskeyEchoes] - id: BarSignWhiskeyEchoesAlignTile - suffix: AlignTile diff --git a/Resources/migration.yml b/Resources/migration.yml index 73f52a3423..c7044570c2 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -648,3 +648,31 @@ SpawnHonkBot: SpawnMobHonkBot # 2025-06-01 CrateFoodPizzaLarge: CrateFoodPizza CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks + +# 2025-06-09 +BarSignAlignTile: BarSign +BarSignComboCafeAlignTile: BarSignComboCafe +BarSignEmergencyRumPartyAlignTile: BarSignEmergencyRumParty +BarSignLV426AlignTile: BarSignLV426 +BarSignMaidCafeAlignTile: BarSignMaidCafe +BarSignMalteseFalconAlignTile: BarSignMalteseFalcon +BarSignOfficerBeerskyAlignTile: BarSignOfficerBeersky +BarSignRobustaCafeAlignTile: BarSignRobustaCafe +BarSignTheAleNathAlignTile: BarSignTheAleNath +BarSignTheBirdCageAlignTile: BarSignTheBirdCage +BarSignTheCoderbusAlignTile: BarSignTheCoderbus +BarSignTheDrunkCarpAlignTile: BarSignTheDrunkCarp +BarSignEngineChangeAlignTile: BarSignEngineChange +BarSignTheHarmbatonAlignTile: BarSignTheHarmbaton +BarSignTheLightbulbAlignTile: BarSignTheLightbulb +BarSignTheLooseGooseAlignTile: BarSignTheLooseGoose +BarSignTheNetAlignTile: BarSignTheNet +BarSignTheOuterSpessAlignTile: BarSignTheOuterSpess +BarSignTheSinguloAlignTile: BarSignTheSingulo +BarSignTheSunAlignTile: BarSignTheSun +BarSignWiggleRoomAlignTile: BarSignWiggleRoom +BarSignZocaloAlignTile: BarSignZocalo +BarSignEmprahAlignTile: BarSignEmprah +BarSignSpacebucksAlignTile: BarSignSpacebucks +BarSignMaltroachAlignTile: BarSignMaltroach +BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes -- 2.51.2