From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Thu, 25 Jan 2024 01:08:46 +0000 (-0600) Subject: Better rusty wall sprites (#24471) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1abbf378321259d4c9c245ec204cab27d5757813;p=space-station-14.git Better rusty wall sprites (#24471) * makes rusty walls use their /tg/ sprites * my furniture. is. broken * robocop --- diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 1878cc8e19..570e5fbbf7 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -550,6 +550,24 @@ - type: RadiationBlocker resistance: 5 +- type: entity + parent: WallReinforced + id: WallReinforcedRust + name: reinforced wall + suffix: rusted + components: + - type: Sprite + sprite: Structures/Walls/solid_rust.rsi + - type: Icon + sprite: Structures/Walls/solid_rust.rsi + state: rgeneric + - type: Construction + graph: Girder + node: reinforcedWall + - type: IconSmooth + key: walls + base: reinf_over + - type: entity parent: WallShuttleDiagonal id: WallReinforcedDiagonal @@ -876,44 +894,22 @@ state: state0 - type: entity - parent: BaseWall + parent: WallSolid id: WallSolidRust name: solid wall suffix: rusted components: - type: Sprite - sprite: Structures/Walls/solidrust.rsi + sprite: Structures/Walls/solid_rust.rsi - type: Icon - sprite: Structures/Walls/solidrust.rsi + sprite: Structures/Walls/solid_rust.rsi state: full - type: Construction graph: Girder node: wallrust - - 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: IconSmooth key: walls - base: solidrust + base: solid - type: entity parent: BaseWall diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png new file mode 100644 index 0000000000..bac03f82f1 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json new file mode 100644 index 0000000000..af5ebe04cf --- /dev/null +++ b/Resources/Textures/Structures/Walls/solid_rust.rsi/meta.json @@ -0,0 +1,99 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/67a5373b4649937dd63dd94153e05e8506f40a5d and modified.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "solid0", + "directions": 4 + }, + { + "name": "solid1", + "directions": 4 + }, + { + "name": "solid2", + "directions": 4 + }, + { + "name": "solid3", + "directions": 4 + }, + { + "name": "solid4", + "directions": 4 + }, + { + "name": "solid5", + "directions": 4 + }, + { + "name": "solid6", + "directions": 4 + }, + { + "name": "solid7", + "directions": 4 + }, + { + "name": "reinf_construct-0" + }, + { + "name": "reinf_construct-1" + }, + { + "name": "reinf_construct-2" + }, + { + "name": "reinf_construct-3" + }, + { + "name": "reinf_construct-4" + }, + { + "name": "reinf_construct-5" + }, + { + "name": "reinf_over0", + "directions": 4 + }, + { + "name": "reinf_over1", + "directions": 4 + }, + { + "name": "reinf_over2", + "directions": 4 + }, + { + "name": "reinf_over3", + "directions": 4 + }, + { + "name": "reinf_over4", + "directions": 4 + }, + { + "name": "reinf_over5", + "directions": 4 + }, + { + "name": "reinf_over6", + "directions": 4 + }, + { + "name": "reinf_over7", + "directions": 4 + }, + { + "name": "rgeneric" + } + ] +} diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png new file mode 100644 index 0000000000..3af1774039 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png new file mode 100644 index 0000000000..57f9a29657 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png new file mode 100644 index 0000000000..122fb41398 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png new file mode 100644 index 0000000000..2e7be27dd0 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png new file mode 100644 index 0000000000..48a07386ad Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png new file mode 100644 index 0000000000..0969ca3ecd Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png new file mode 100644 index 0000000000..89314482b3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png new file mode 100644 index 0000000000..79fb38bd6a Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png new file mode 100644 index 0000000000..89314482b3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png new file mode 100644 index 0000000000..79fb38bd6a Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png new file mode 100644 index 0000000000..3fd3d1f3a2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png new file mode 100644 index 0000000000..a9d7e71737 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png new file mode 100644 index 0000000000..3fd3d1f3a2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png new file mode 100644 index 0000000000..970ef1f1f5 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png new file mode 100644 index 0000000000..02a1c5c63b Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png new file mode 100644 index 0000000000..b6720ad5a3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png new file mode 100644 index 0000000000..9d1da43e6f Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png new file mode 100644 index 0000000000..b6720ad5a3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png new file mode 100644 index 0000000000..9d1da43e6f Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png new file mode 100644 index 0000000000..f31f3a6bc9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png new file mode 100644 index 0000000000..7c18f9c11a Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png new file mode 100644 index 0000000000..8737894cbf Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png new file mode 100644 index 0000000000..15f74bcaee Binary files /dev/null and b/Resources/Textures/Structures/Walls/solid_rust.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/full.png b/Resources/Textures/Structures/Walls/solidrust.rsi/full.png deleted file mode 100644 index f76449b04a..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json b/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json deleted file mode 100644 index 3176ddd0cc..0000000000 --- a/Resources/Textures/Structures/Walls/solidrust.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "full"}, {"name": "solidrust0", "directions": 4}, {"name": "solidrust1", "directions": 4}, {"name": "solidrust2", "directions": 4}, {"name": "solidrust3", "directions": 4}, {"name": "solidrust4", "directions": 4}, {"name": "solidrust5", "directions": 4}, {"name": "solidrust6", "directions": 4}, {"name": "solidrust7", "directions": 4}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png deleted file mode 100644 index 063c345fb7..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png deleted file mode 100644 index 7cf44a388e..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png deleted file mode 100644 index 063c345fb7..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png deleted file mode 100644 index 7cf44a388e..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png deleted file mode 100644 index dc035c9933..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png deleted file mode 100644 index a9e64f62c3..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png deleted file mode 100644 index dc035c9933..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png b/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png deleted file mode 100644 index 396f37008b..0000000000 Binary files a/Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png and /dev/null differ