From: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:41:35 +0000 (-0700) Subject: Removed Interior Shuttle Walls (#34261) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d984259db680e3e401e796d0064e7bb731ae2bcd;p=space-station-14.git Removed Interior Shuttle Walls (#34261) * Removed Interior Shuttle Walls * Update migration.yml * Update walls.yml * Update girder.yml * Fix Migration --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 97823cec28..3c2f8c1de1 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -900,7 +900,6 @@ parent: BaseWall id: WallShuttle name: shuttle wall - suffix: Reinforced, Exterior components: - type: Damageable damageContainer: StructuralInorganic @@ -957,51 +956,6 @@ - type: Reflect reflectProb: 1 -- type: entity - parent: BaseWall - id: WallShuttleInterior - name: shuttle wall - suffix: Interior - components: - - type: RCDDeconstructable - cost: 6 - delay: 8 - fx: EffectRCDDeconstruct8 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 400 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: MetalSlam - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalSlam - - !type:ChangeConstructionNodeBehavior - node: girder - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Sprite - sprite: Structures/Walls/shuttleinterior.rsi - - type: Icon - sprite: Structures/Walls/shuttleinterior.rsi - - type: Construction - graph: Girder - node: shuttleInteriorWall - - type: IconSmooth - key: walls - base: state - - type: Reflect - reflectProb: 1 - - type: entity parent: BaseWall id: WallSolid diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index 99525b653b..fb783e0da5 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -134,22 +134,6 @@ amount: 2 doAfter: 2 - - to: shuttleInteriorWall - completed: - - !type:SnapToGrid - southRotation: true - conditions: - - !type:EntityAnchored { } - steps: - - material: MetalRod - amount: 2 - doAfter: 1 - - tool: Screwing - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - node: wall entity: WallSolid edges: @@ -256,23 +240,6 @@ - tool: Prying doAfter: 5 - - node: shuttleInteriorWall - entity: WallShuttleInterior - edges: - - to: girder - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - - !type:SpawnPrototype - prototype: PartRodMetal1 - amount: 2 - steps: - - tool: Welding - doAfter: 10 - - tool: Screwing - doAfter: 1 - - node: reinforcedGirder entity: ReinforcedGirder edges: diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 435524c854..7602a6cb11 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -232,24 +232,6 @@ conditions: - !type:TileNotBlocked -- type: construction - name: interior shuttle wall - id: InteriorShuttleWall - graph: Girder - startNode: start - targetNode: shuttleInteriorWall - category: construction-category-structures - description: Keeps the air in and the greytide out. - icon: - sprite: Structures/Walls/shuttleinterior.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canRotate: false - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction name: diagonal shuttle wall id: DiagonalShuttleWall diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png deleted file mode 100644 index f336d4c73b..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json deleted file mode 100644 index 97ca2aa3b0..0000000000 --- a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/9ddb8cf084e292571d4e9c79745db25befbd82fe/icons/turf/walls/shuttle_wall.dmi", - "states": [ - { - "name": "full" - }, - { - "name": "state0", - "directions": 4 - }, - { - "name": "state1", - "directions": 4 - }, - { - "name": "state2", - "directions": 4 - }, - { - "name": "state3", - "directions": 4 - }, - { - "name": "state4", - "directions": 4 - }, - { - "name": "state5", - "directions": 4 - }, - { - "name": "state6", - "directions": 4 - }, - { - "name": "state7", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png deleted file mode 100644 index f53131b1be..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png deleted file mode 100644 index 3041fa3daf..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png deleted file mode 100644 index f53131b1be..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png deleted file mode 100644 index 1263f7a1ba..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png deleted file mode 100644 index 92ab8365c2..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png deleted file mode 100644 index 430bab8398..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png deleted file mode 100644 index c8c28b2600..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png deleted file mode 100644 index 629e4e3154..0000000000 Binary files a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 851e6ca03c..76109d0c60 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -536,20 +536,23 @@ LightTree04: LightTree LightTree05: LightTree LightTree06: LightTree -#2024-12-28 +# 2024-12-28 DrinkIrishCarBomb: DrinkIrishSlammer -#2025-01-06 +# 2025-01-06 ClothingMaskSexyClown: ClothingMaskBlushingClown ClothingMaskSexyMime: ClothingMaskBlushingMime # 2025-01-27 FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce -#2025-02-05 +# 2025-02-05 WeaponSubMachineGunVector: null WeaponSubMachineGunVectorRubber: null +# 2025-02-11 +WallShuttleInterior: WallShuttle + # 2025-02-20 MagazineBoxAntiMaterielBig: null MagazineBoxCaselessRifle10x24: null