diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml deleted file mode 100644 index 5ef46601a7..0000000000 --- a/Resources/Prototypes/Entities/Clothing/Shoes/jackboots.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: ShoesBase - id: ShoesJackboots - name: jackboots - description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time. - components: - - type: Sprite - sprite: Clothing/Shoes/jackboots.rsi - - type: Icon - sprite: Clothing/Shoes/jackboots.rsi - - type: Clothing - sprite: Clothing/Shoes/jackboots.rsi - - type: LoopingSound - - type: FootstepModifier - footstepSoundCollection: footstep_heavy - diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml index 9bf285fae6..4b27dcff72 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml @@ -11,32 +11,6 @@ - type: Icon state: icon -- type: entity - parent: ShoesBase - id: ShoesAtmosMagboots0 - name: atmos magboots (off) - description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently off. - components: - - type: Sprite - sprite: Clothing/Shoes/atmosmagboots0.rsi - - type: Icon - sprite: Clothing/Shoes/atmosmagboots0.rsi - - type: Clothing - sprite: Clothing/Shoes/atmosmagboots0.rsi - -- type: entity - parent: ShoesBase - id: ShoesAtmosMagboots1 - name: atmos magboots (on) - description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently on. - components: - - type: Sprite - sprite: Clothing/Shoes/atmosmagboots1.rsi - - type: Icon - sprite: Clothing/Shoes/atmosmagboots1.rsi - - type: Clothing - sprite: Clothing/Shoes/atmosmagboots1.rsi - - type: entity parent: ShoesBase id: ShoesBlack @@ -141,19 +115,6 @@ - type: Clothing sprite: Clothing/Shoes/detective.rsi -- type: entity - parent: ShoesBase - id: ShoesDigiboots - name: digiboots - description: A pair of digi boots. - components: - - type: Sprite - sprite: Clothing/Shoes/digiboots.rsi - - type: Icon - sprite: Clothing/Shoes/digiboots.rsi - - type: Clothing - sprite: Clothing/Shoes/digiboots.rsi - - type: entity parent: ShoesBase id: ShoesFlippers @@ -209,55 +170,16 @@ - type: entity parent: ShoesBase - id: ShoesMagboots0 - name: magboots (off) - description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently off. + id: ShoesMagboots + name: magboots + description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. components: - type: Sprite - sprite: Clothing/Shoes/magboots0.rsi + sprite: Clothing/Shoes/magboots.rsi - type: Icon - sprite: Clothing/Shoes/magboots0.rsi + sprite: Clothing/Shoes/magboots.rsi - type: Clothing - sprite: Clothing/Shoes/magboots0.rsi - -- type: entity - parent: ShoesBase - id: ShoesMagboots1 - name: magboots (on) - description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. Currently on. - components: - - type: Sprite - sprite: Clothing/Shoes/magboots1.rsi - - type: Icon - sprite: Clothing/Shoes/magboots1.rsi - - type: Clothing - sprite: Clothing/Shoes/magboots1.rsi - -- type: entity - parent: ShoesBase - id: ShoesMercboots0 - name: merc boots - description: A pair of boots with extra padding and armor. - components: - - type: Sprite - sprite: Clothing/Shoes/mercboots0.rsi - - type: Icon - sprite: Clothing/Shoes/mercboots0.rsi - - type: Clothing - sprite: Clothing/Shoes/mercboots0.rsi - -- type: entity - parent: ShoesBase - id: ShoesMercboots1 - name: merc boots - description: A pair of boots with extra padding and armor. - components: - - type: Sprite - sprite: Clothing/Shoes/mercboots1.rsi - - type: Icon - sprite: Clothing/Shoes/mercboots1.rsi - - type: Clothing - sprite: Clothing/Shoes/mercboots1.rsi + sprite: Clothing/Shoes/magboots.rsi - type: entity parent: ShoesBase @@ -285,19 +207,6 @@ - type: Clothing sprite: Clothing/Shoes/orange.rsi -- type: entity - parent: ShoesBase - id: ShoesOrange1 - name: orange shoes - description: Stylish orange shoes. - components: - - type: Sprite - sprite: Clothing/Shoes/orange1.rsi - - type: Icon - sprite: Clothing/Shoes/orange1.rsi - - type: Clothing - sprite: Clothing/Shoes/orange1.rsi - - type: entity parent: ShoesBase id: ShoesPurple @@ -318,17 +227,17 @@ description: A pair of rainbow shoes. components: - type: Sprite - sprite: Clothing/Shoes/rain_bow.rsi + sprite: Clothing/Shoes/rainbow.rsi - type: Icon - sprite: Clothing/Shoes/rain_bow.rsi + sprite: Clothing/Shoes/rainbow.rsi - type: Clothing - sprite: Clothing/Shoes/rain_bow.rsi + sprite: Clothing/Shoes/rainbow.rsi - type: entity parent: ShoesBase id: ShoesRed name: red shoes - description: Stylish purple shoes. + description: Stylish red shoes. components: - type: Sprite sprite: Clothing/Shoes/red.rsi @@ -337,19 +246,6 @@ - type: Clothing sprite: Clothing/Shoes/red.rsi -- type: entity - parent: ShoesBase - id: ShoesReinforced - name: reinforced shoes - description: A pair of reinforced shoes. - components: - - type: Sprite - sprite: Clothing/Shoes/reinforced.rsi - - type: Icon - sprite: Clothing/Shoes/reinforced.rsi - - type: Clothing - sprite: Clothing/Shoes/reinforced.rsi - - type: entity parent: ShoesBase id: ShoesSlippers @@ -363,19 +259,6 @@ - type: Clothing sprite: Clothing/Shoes/slippers.rsi -- type: entity - parent: ShoesBase - id: ShoesSlippersWorn - name: slippers (worn) - description: Fluffy... - components: - - type: Sprite - sprite: Clothing/Shoes/slippers_worn.rsi - - type: Icon - sprite: Clothing/Shoes/slippers_worn.rsi - - type: Clothing - sprite: Clothing/Shoes/slippers_worn.rsi - - type: entity parent: ShoesBase id: ShoesSpringjacks @@ -505,3 +388,16 @@ sprite: Clothing/Shoes/codersocks.rsi - type: Clothing sprite: Clothing/Shoes/codersocks.rsi + +- type: entity + parent: ShoesBase + id: ShoesJackboots + name: jackboots + description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time. + components: + - type: Sprite + sprite: Clothing/Shoes/jackboots.rsi + - type: Icon + sprite: Clothing/Shoes/jackboots.rsi + - type: Clothing + sprite: Clothing/Shoes/jackboots.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Ground/table.yml b/Resources/Prototypes/Entities/Constructible/Ground/table.yml index dbf64465ec..3c7bff137d 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml @@ -1,7 +1,7 @@ - type: entity id: Table name: "table" - description: A square piece of metal standing on four metal legs. It can not move. + description: A square piece of metal standing on four metal legs. components: - type: Clickable - type: InteractionOutline @@ -27,18 +27,31 @@ deadThreshold: 50 spawnOnDestroy: SteelSheet1 -# TODO: drop wood instead of steel when destroyed when that's added - type: entity id: TableWood - parent: Table name: "wood table" description: Do not apply fire to this. Rumour says it burns easily. components: + - type: Clickable + - type: InteractionOutline + - type: PlaceableSurface - type: Sprite + netsync: false sprite: Constructible/Structures/Tables/wood.rsi + - type: Icon + sprite: Constructible/Structures/Tables/wood.rsi + state: icon + - type: Collidable + shapes: + - !type:PhysShapeAabb + layer: + - VaultImpassable + - type: SnapGrid + offset: Center - type: IconSmooth key: wood base: wood_ + - type: Climbable - type: Destructible - deadThreshold: 50 - spawnOnDestroy: SteelSheet1 + deadThreshold: 15 + spawnOnDestroy: WoodPlank diff --git a/Resources/Prototypes/Entities/Objects/materials.yml b/Resources/Prototypes/Entities/Objects/materials.yml index 154f7da4ec..664c8af7ea 100644 --- a/Resources/Prototypes/Entities/Objects/materials.yml +++ b/Resources/Prototypes/Entities/Objects/materials.yml @@ -201,3 +201,13 @@ components: - type: Stack count: 1 + +- type: entity + name: wood plank + id: WoodPlank + parent: BaseItem + components: + - type: Sprite + texture: Objects/Materials/wood.png + - type: Icon + texture: Objects/Materials/wood.png diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index f42372b89c..ddff2ce5f9 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -22,3 +22,4 @@ backpack: BackpackEngineeringFilled shoes: ShoesBrown idcard: CEPDA + belt: UtilityBeltClothingFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index fbeaf3b5b8..63a91ba0e1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -20,3 +20,4 @@ shoes: ShoesWorkboots outerclothing: OuterclothingHazard idcard: EngineerPDA + belt: UtilityBeltClothingFilled diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index 6ba1322845..63cba91e32 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png index de30fff884..50fd9ca1a7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png index 117a22ef91..58efd84c6c 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/equipped-FEET.png deleted file mode 100644 index 299c256914..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/icon.png b/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/icon.png deleted file mode 100644 index d6fd61e825..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-left.png deleted file mode 100644 index 43f340739d..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-right.png deleted file mode 100644 index 49dda801e4..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/equipped-FEET.png deleted file mode 100644 index 184bbab1e2..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/icon.png b/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/icon.png deleted file mode 100644 index 3c382db45e..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-left.png deleted file mode 100644 index ebc3faa779..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-right.png deleted file mode 100644 index 7c5cb35045..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/meta.json b/Resources/Textures/Clothing/Shoes/atmosmagboots1.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/atmosmagboots1.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/digiboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/digiboots.rsi/equipped-FEET.png deleted file mode 100644 index 00d8f2200f..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/digiboots.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/digiboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/digiboots.rsi/icon.png deleted file mode 100644 index 73e2268f10..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/digiboots.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-left.png deleted file mode 100644 index 3882ddbe55..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-right.png deleted file mode 100644 index 03414cbd29..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/digiboots.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/digiboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/digiboots.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/digiboots.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/jackboots.rsi/equipped-FEET.png index 4e3696a4c9..fce29d1595 100644 Binary files a/Resources/Textures/Clothing/Shoes/jackboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/jackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png index 1b56f19751..4ee3de12f2 100644 Binary files a/Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/jackboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png index 7d52650c48..31538aabaf 100644 Binary files a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png index 5f98182a5a..795844cdb8 100644 Binary files a/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/jackboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json index 21a93ec435..1d8cc6b131 100644 --- a/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/jackboots.rsi/meta.json @@ -1 +1,60 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/magboots0.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots0.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/equipped-FEET.png diff --git a/Resources/Textures/Clothing/Shoes/magboots1.rsi/icon.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/icon-on.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots1.rsi/icon.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/icon-on.png diff --git a/Resources/Textures/Clothing/Shoes/magboots0.rsi/icon.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots0.rsi/icon.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/icon.png diff --git a/Resources/Textures/Clothing/Shoes/magboots0.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots0.rsi/inhand-left.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Shoes/magboots0.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots0.rsi/inhand-right.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json new file mode 100644 index 0000000000..93c522d46d --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/magboots.rsi/meta.json @@ -0,0 +1,109 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "icon-on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/magboots1.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/on-equipped-FEET.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots1.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/on-equipped-FEET.png diff --git a/Resources/Textures/Clothing/Shoes/magboots1.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots1.rsi/inhand-left.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-left.png diff --git a/Resources/Textures/Clothing/Shoes/magboots1.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/magboots1.rsi/inhand-right.png rename to Resources/Textures/Clothing/Shoes/magboots.rsi/on-inhand-right.png diff --git a/Resources/Textures/Clothing/Shoes/magboots0.rsi/meta.json b/Resources/Textures/Clothing/Shoes/magboots0.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/magboots0.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/magboots1.rsi/meta.json b/Resources/Textures/Clothing/Shoes/magboots1.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/magboots1.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/mercboots0.rsi/equipped-FEET.png deleted file mode 100644 index 6360a6733d..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/icon.png b/Resources/Textures/Clothing/Shoes/mercboots0.rsi/icon.png deleted file mode 100644 index 826ffe7f78..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-left.png deleted file mode 100644 index 6c4fc10b9a..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-right.png deleted file mode 100644 index 9f3253dcf8..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots0.rsi/meta.json b/Resources/Textures/Clothing/Shoes/mercboots0.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/mercboots0.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/mercboots1.rsi/equipped-FEET.png deleted file mode 100644 index 6360a6733d..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/icon.png b/Resources/Textures/Clothing/Shoes/mercboots1.rsi/icon.png deleted file mode 100644 index 826ffe7f78..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-left.png deleted file mode 100644 index 6c4fc10b9a..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-right.png deleted file mode 100644 index 9f3253dcf8..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/mercboots1.rsi/meta.json b/Resources/Textures/Clothing/Shoes/mercboots1.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/mercboots1.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/orange1.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/orange1.rsi/equipped-FEET.png deleted file mode 100644 index 48b8edb45e..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/orange1.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/orange1.rsi/icon.png b/Resources/Textures/Clothing/Shoes/orange1.rsi/icon.png deleted file mode 100644 index 83808593fc..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/orange1.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-left.png deleted file mode 100644 index 5a4aa85a1e..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-right.png deleted file mode 100644 index bd6df3f1e3..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/orange1.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/orange1.rsi/meta.json b/Resources/Textures/Clothing/Shoes/orange1.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/orange1.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/rain_bow.rsi/meta.json b/Resources/Textures/Clothing/Shoes/rain_bow.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/rain_bow.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/rain_bow.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/rainbow.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/rain_bow.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Shoes/rainbow.rsi/equipped-FEET.png diff --git a/Resources/Textures/Clothing/Shoes/rain_bow.rsi/icon.png b/Resources/Textures/Clothing/Shoes/rainbow.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/rain_bow.rsi/icon.png rename to Resources/Textures/Clothing/Shoes/rainbow.rsi/icon.png diff --git a/Resources/Textures/Clothing/Shoes/rain_bow.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/rainbow.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/rain_bow.rsi/inhand-left.png rename to Resources/Textures/Clothing/Shoes/rainbow.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Shoes/rain_bow.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/rainbow.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/rain_bow.rsi/inhand-right.png rename to Resources/Textures/Clothing/Shoes/rainbow.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/meta.json b/Resources/Textures/Clothing/Shoes/rainbow.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Shoes/atmosmagboots0.rsi/meta.json rename to Resources/Textures/Clothing/Shoes/rainbow.rsi/meta.json diff --git a/Resources/Textures/Clothing/Shoes/reinforced.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/reinforced.rsi/equipped-FEET.png deleted file mode 100644 index 931dd764c8..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/reinforced.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/reinforced.rsi/icon.png b/Resources/Textures/Clothing/Shoes/reinforced.rsi/icon.png deleted file mode 100644 index aa48b69efd..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/reinforced.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-left.png deleted file mode 100644 index dbb537754b..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-right.png deleted file mode 100644 index 8ffea8a923..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/reinforced.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/reinforced.rsi/meta.json b/Resources/Textures/Clothing/Shoes/reinforced.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/reinforced.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/equipped-FEET.png deleted file mode 100644 index 45d29f75f3..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/equipped-FEET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/icon.png b/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/icon.png deleted file mode 100644 index d182348f98..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-left.png deleted file mode 100644 index 29419c9edd..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-right.png deleted file mode 100644 index df115ff460..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/meta.json b/Resources/Textures/Clothing/Shoes/slippers_worn.rsi/meta.json deleted file mode 100644 index 21a93ec435..0000000000 --- a/Resources/Textures/Clothing/Shoes/slippers_worn.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/discordia-space/CEV-Eris/raw/b099b76491a850ab376aa4d574d5103900f72f2d/icons/inventory/feet/mob.dmi", "states": [{"name": "equipped-FEET", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/icon.png b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/icon.png new file mode 100644 index 0000000000..622e64d622 Binary files /dev/null and b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/icon.png differ diff --git a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json index 2502a2b4d4..b102c12206 100644 --- a/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json +++ b/Resources/Textures/Constructible/Structures/Tables/wood.rsi/meta.json @@ -7,6 +7,15 @@ "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, { "name": "wood_0", "directions": 4, diff --git a/Resources/Textures/Objects/Materials/wood.png b/Resources/Textures/Objects/Materials/wood.png new file mode 100644 index 0000000000..57d8ccafb0 Binary files /dev/null and b/Resources/Textures/Objects/Materials/wood.png differ diff --git a/Resources/Textures/Objects/Misc/hand_tele.png b/Resources/Textures/Objects/Misc/hand_tele.png deleted file mode 100644 index 68e8459c5a..0000000000 Binary files a/Resources/Textures/Objects/Misc/hand_tele.png and /dev/null differ diff --git a/Resources/Textures/emergency_mask.png b/Resources/Textures/emergency_mask.png deleted file mode 100644 index 2cd329b99c..0000000000 Binary files a/Resources/Textures/emergency_mask.png and /dev/null differ