diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 8e4bdfb0fa..6c262afee4 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -1,3 +1,5 @@ +#Asteroid rocks +#These can probably be merged with the rock types below these now, but I'm not going to mess with it since I don't want to risk altering any behavior. - type: entity id: AsteroidRock parent: BaseStructure @@ -9,9 +11,22 @@ whitelist: tags: - Pickaxe + - type: IconSmooth + key: walls + mode: NoSprite + - type: SmoothEdge - type: Sprite - sprite: Structures/Walls/asteroid_rock.rsi - state: full + sprite: Structures/Walls/rock.rsi + layers: + - state: rock_asteroid + - map: [ "enum.EdgeLayer.South" ] + state: rock_asteroid_south + - map: [ "enum.EdgeLayer.East" ] + state: rock_asteroid_east + - map: [ "enum.EdgeLayer.North" ] + state: rock_asteroid_north + - map: [ "enum.EdgeLayer.West" ] + state: rock_asteroid_west - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic @@ -36,9 +51,6 @@ - FullTileMask layer: - WallLayer - - type: IconSmooth - key: walls - base: rock_ - type: OreVein oreChance: 0.2 oreRarityPrototypeId: RandomOreDistributionStandard @@ -58,6 +70,47 @@ oreChance: 0.33 oreRarityPrototypeId: RandomOreDistributionStandard + +- type: entity + id: IronRock + parent: AsteroidRock + name: ironrock + suffix: Low Ore Yield + description: A rocky asteroid. + components: + - type: IconSmooth + key: walls + mode: NoSprite + - type: SmoothEdge + - type: Sprite + sprite: Structures/Walls/rock.rsi + layers: + - state: ironrock + - map: [ "enum.EdgeLayer.South" ] + state: ironrock_south + - map: [ "enum.EdgeLayer.East" ] + state: ironrock_east + - map: [ "enum.EdgeLayer.North" ] + state: ironrock_north + - map: [ "enum.EdgeLayer.West" ] + state: ironrock_west + +- type: entity + id: IronRockMining + parent: IronRock + name: ironrock + suffix: higher ore yield + description: An asteroid. + components: + - type: Gatherable + whitelist: + tags: + - Pickaxe + - type: OreVein + oreChance: 0.33 + oreRarityPrototypeId: RandomOreDistributionStandard + + # Rocks and ore veins - type: entity id: WallRock diff --git a/Resources/Prototypes/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/Entities/Structures/Walls/mountain.yml deleted file mode 100644 index 82a204620a..0000000000 --- a/Resources/Prototypes/Entities/Structures/Walls/mountain.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - id: MountainRock - parent: AsteroidRock - name: mountain rock - description: A craggy mountain wall. - components: - - type: Sprite - sprite: Structures/Walls/mountain_rock.rsi - state: full - -- type: entity - id: MountainRockMining - parent: AsteroidRockMining - name: mountain rock - description: A craggy mountain wall. - components: - - type: Sprite - sprite: Structures/Walls/mountain_rock.rsi - state: full diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png deleted file mode 100644 index 26034ae376..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json deleted file mode 100644 index c9407ed74f..0000000000 --- a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/commit/a0c067f688288aeb167157203e2170b14cfa9d7f", "size": {"x": 32, "y": 32}, "states": [{"name": "rock_0", "directions": 4}, {"name": "rock_1", "directions": 4}, {"name": "rock_2", "directions": 4}, {"name": "rock_3", "directions": 4}, {"name": "rock_4", "directions": 4}, {"name": "rock_5", "directions": 4}, {"name": "rock_6", "directions": 4}, {"name": "rock_7", "directions": 4}, {"name": "full"}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png deleted file mode 100644 index ba1045c22b..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png deleted file mode 100644 index 2a2baa735d..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png deleted file mode 100644 index ba1045c22b..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png deleted file mode 100644 index 2a2baa735d..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png deleted file mode 100644 index 1d5d4320fa..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png deleted file mode 100644 index 6524c4facf..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png deleted file mode 100644 index 1d5d4320fa..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png deleted file mode 100644 index 753c8293f2..0000000000 Binary files a/Resources/Textures/Structures/Walls/asteroid_rock.rsi/rock_7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/full.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/full.png deleted file mode 100644 index 0ecec3d6ef..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/meta.json b/Resources/Textures/Structures/Walls/mountain_rock.rsi/meta.json deleted file mode 100644 index 4621946ff8..0000000000 --- a/Resources/Textures/Structures/Walls/mountain_rock.rsi/meta.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": 1, - "copyright": "recolor of https://github.com/discordia-space/CEV-Eris/commit/a0c067f688288aeb167157203e2170b14cfa9d7f", - "license": "CC-BY-SA-3.0", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "directions": 4, - "name": "rock_0" - }, - { - "directions": 4, - "name": "rock_1" - }, - { - "directions": 4, - "name": "rock_2" - }, - { - "directions": 4, - "name": "rock_3" - }, - { - "directions": 4, - "name": "rock_4" - }, - { - "directions": 4, - "name": "rock_5" - }, - { - "directions": 4, - "name": "rock_6" - }, - { - "directions": 4, - "name": "rock_7" - }, - { - "name": "full" - } - ] -} diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_0.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_0.png deleted file mode 100644 index 2a64ecdddf..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_1.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_1.png deleted file mode 100644 index 694dd628fb..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_2.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_2.png deleted file mode 100644 index 2a64ecdddf..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_3.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_3.png deleted file mode 100644 index 694dd628fb..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_4.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_4.png deleted file mode 100644 index b5a6e30f7b..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_5.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_5.png deleted file mode 100644 index e7ebe59915..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_6.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_6.png deleted file mode 100644 index b5a6e30f7b..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_7.png b/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_7.png deleted file mode 100644 index 8456763d94..0000000000 Binary files a/Resources/Textures/Structures/Walls/mountain_rock.rsi/rock_7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironrock.png b/Resources/Textures/Structures/Walls/rock.rsi/ironrock.png new file mode 100644 index 0000000000..69b51febd2 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironrock.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironrock_east.png b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_east.png new file mode 100644 index 0000000000..7cabfbb13e Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_east.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironrock_north.png b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_north.png new file mode 100644 index 0000000000..777e0cc18c Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_north.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironrock_south.png b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_south.png new file mode 100644 index 0000000000..91c3ddb07a Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_south.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/ironrock_west.png b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_west.png new file mode 100644 index 0000000000..0cb281976e Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/ironrock_west.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json index e198018251..75e173270e 100644 --- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow + rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi, rock_bananium made by brainfood1183 (github) for ss14, rock_snow, rock_asteroid, & rock_wall and co from https://github.com/tgstation/tgstation/tree/e929cf39cded5207d63df1fa8521f41f2816b383. ironrock taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", "size": { "x": 32, "y": 32 @@ -52,6 +52,36 @@ { "name": "rock_wall_west" }, + { + "name": "rock_asteroid" + }, + { + "name": "rock_asteroid_south" + }, + { + "name": "rock_asteroid_east" + }, + { + "name": "rock_asteroid_north" + }, + { + "name": "rock_asteroid_west" + }, + { + "name": "ironrock" + }, + { + "name": "ironrock_south" + }, + { + "name": "ironrock_east" + }, + { + "name": "ironrock_north" + }, + { + "name": "ironrock_west" + }, { "name": "rock_artifact_fragment" }, diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid.png new file mode 100644 index 0000000000..51db57b9b7 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_east.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_east.png new file mode 100644 index 0000000000..678e06dd58 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_east.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_north.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_north.png new file mode 100644 index 0000000000..94c7e76e00 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_north.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_south.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_south.png new file mode 100644 index 0000000000..beb4369ffc Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_south.png differ diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_west.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_west.png new file mode 100644 index 0000000000..eb95c87758 Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_asteroid_west.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 7cb135062f..6717b1f043 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -152,3 +152,9 @@ MagazinePistolSubMachineGunHighVelocity: MagazinePistolSubMachineGun MagazineRifleHighVelocity: MagazineRifle SpeedLoaderMagnumHighVelocity: SpeedLoaderMagnum SpeedLoaderPistolHighVelocity: SpeedLoaderPistol + +# 2023-08-07 +#If the name is anything to go off of, these are presumably just CEV-Eris versions of the snow rock (which we already have.) +#They are practically never used in this way however, so they're migrated to the basic rock type. +MountainRock: AsteroidRock +MountainRockMining: AsteroidRockMining