From 6e15c734e18cfede977efcf10ee43b6ed35a459e Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 14:47:59 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9=20=D0=B8=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=BE=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20Locate=20Textures=20=D0=B8?= =?UTF-8?q?=20Prototypes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Clothing/OuterClothing/coats.ftl | 4 - .../Objects/Misc/identification_cards.ftl | 5 -- .../Roles/Jobs => Job}/departments.ftl | 0 .../Locale/ru-RU/ADT/Job/job-description.ftl | 2 + Resources/Locale/ru-RU/ADT/Job/job-names.ftl | 1 + .../ADT/{ => headset}/headset-component.ftl | 0 .../ADT/{ => prototypes}/Body/Organs/ipc.ftl | 0 .../ADT/{ => prototypes}/Body/Parts/ipc.ftl | 0 .../Catalog/Fills/Backpacks/backpack.ftl | 0 .../Catalog/Fills/Backpacks/duffelbag.ftl | 0 .../Catalog/Fills/Backpacks/satchel.ftl | 0 .../Entites/Clothing/OuterClothing/coats.ftl | 2 - .../Entities}/Clothing/Back/backpack.ftl | 0 .../Entities/Clothing/OuterClothing/coats.ftl | 6 ++ .../Entities}/Clothing/Uniform/jumpsuits.ftl | 0 .../Mobs/Customization/Markings/ipc.yml | 0 .../Entities/Mobs/Player/ipc.ftl | 0 .../Objects/Misc/identification_cards.ftl | 6 ++ .../prototypes/Entities/Roles/Jobs/jobs.ftl | 2 - .../Structures/Machines/silicon_chargers.ftl | 0 .../Structures}/Machines/vending_machines.ftl | 0 .../ADT/reagents/{ => meta}/biological.ftl | 0 Resources/Prototypes/ADT/Access/fill.txt | 1 - .../Prototypes/ADT/Catalog/Cargo/fill.txt | 1 - .../ADT/Catalog/Fills/Crates/fill.txt | 1 - .../ADT/Catalog/Fills/Items/fill.txt | 1 - .../Catalog/Fills/{ => Items}/weaponcase.yml | 21 ----- .../{ADTmodifiers.yml => modifier_sets.yml} | 0 .../Datasets/{ => Names}/first_shadekin.yml | 0 .../ADT/Entities/Clothing/Ears/fill.txt | 1 - .../ADT/Entities/Clothing/Head/fill.txt | 1 - .../ADT/Entities/Clothing/Shoes/fill.txt | 1 - .../Entities/Clothing/Uniforms/Jumpsuits.yml | 4 +- .../ADT/Entities/Clothing/Uniforms/fill.txt | 1 - .../Mobs/Customization/Markings/Drask.yml | 4 +- .../Mobs/Customization/Markings/demon.yml | 30 +++---- .../Markings/{antenna.yml => ipc_antenna.yml} | 20 ++--- .../Markings/{screens.yml => ipc_screens.yml} | 78 +++++++++--------- .../ADT/Entities/Mobs/SlugCats/fill.txt | 1 - .../Objects/Consumable/Drinks/fill.txt | 1 - .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../ADT/Entities/Objects/Misc/weaponcase.yml | 20 +++++ .../Objects/Weapons/Guns/Battery/fill.txt | 1 - .../Objects/Weapons/Guns/Pistols/fill.txt | 1 - .../Objects/Weapons/Guns/Projectiles/fill.txt | 1 - .../Entities/Objects/Weapons/Melee/fill.txt | 1 - .../Structures/Doors/Airlock/fill.txt | 1 - .../Body/Parts/fill.txt | 1 - .../Body/Prototypes/fill.txt | 1 - .../Damage/fill.txt | 1 - .../Mobs/Customization/Markings/fill.txt | 1 - .../Entities/Mobs/Player/fill.txt | 1 - .../Entities/Mobs/Species/fill.txt | 1 - .../Names/fill.txt | 1 - .../Species/fill.txt | 1 - Resources/Prototypes/ADT/Polymorphs/fill.txt | 1 - Resources/Prototypes/ADT/Research/fill.txt | 1 - .../ADT/Roles/Jobs/Science/fill.txt | 1 - .../Prototypes/ADT/SoundCollections/fill.txt | 1 - .../equipped-INNERCLOTHING.png | Bin .../white-diplomat-suit.rsi/icon.png | Bin .../white-diplomat-suit.rsi/inhand-left.png | Bin .../white-diplomat-suit.rsi/inhand-right.png | Bin .../white-diplomat-suit.rsi/meta.json | 0 .../Demon/custom.rsi/cow_ears.png | Bin .../Demon/custom.rsi/cow_horns.png | Bin .../Demon/custom.rsi/cow_spots.png | Bin .../Demon/custom.rsi/deer_antlers_horns.png | Bin .../Demon/custom.rsi/demon_ears.png | Bin .../Demon/custom.rsi/demon_tail.png | Bin .../Demon/custom.rsi/goatee.png | Bin .../Demon/custom.rsi/guards_stripes.png | Bin .../Demon/custom.rsi/lines_emperos.png | Bin .../Demon/custom.rsi/long.png | Bin .../Demon/custom.rsi/meta.json | 0 .../Demon/custom.rsi/queen_lines.png | Bin .../Demon/custom.rsi/small_horns.png | Bin .../Demon/custom.rsi/tree_lines.png | Bin .../Demon/custom.rsi/trinity_spots.png | Bin .../Demon/custom.rsi/up.png | Bin .../Drask/custom.rsi/l_arm.png | Bin .../Drask/custom.rsi/meta.json | 0 .../Drask/custom.rsi/r_arm.png | Bin .../ipc_antenna.rsi/ipc_antenna_antlers.png | Bin .../ipc_antenna.rsi/ipc_antenna_crowned.png | Bin .../ipc_antenna.rsi/ipc_antenna_cyberhead.png | Bin .../ipc_antenna.rsi/ipc_antenna_droneeyes.png | Bin .../ipc_antenna.rsi/ipc_antenna_light.png | Bin .../ipc_antenna.rsi/ipc_antenna_lightb.png | Bin .../ipc_antenna_sidelights.png | Bin .../ipc_antenna.rsi/ipc_antenna_tesla.png | Bin .../ipc_antenna.rsi/ipc_antenna_towers.png | Bin .../ipc_antenna.rsi/ipc_antenna_tv.png | Bin .../{ => Ipc}/ipc_antenna.rsi/meta.json | 0 .../ipc_screens.rsi/ipc_screen_blank.png | Bin .../ipc_screens.rsi/ipc_screen_blue.png | Bin .../ipc_screens.rsi/ipc_screen_breakout.png | Bin .../ipc_screens.rsi/ipc_screen_bsod.png | Bin .../ipc_screens.rsi/ipc_screen_console.png | Bin .../ipc_screens.rsi/ipc_screen_ecgwave.png | Bin .../ipc_screens.rsi/ipc_screen_eight.png | Bin .../ipc_screens.rsi/ipc_screen_exclaim.png | Bin .../ipc_screens.rsi/ipc_screen_eyes.png | Bin .../ipc_screens.rsi/ipc_screen_eyesangry.png | Bin .../ipc_screens.rsi/ipc_screen_eyestall.png | Bin .../ipc_screens.rsi/ipc_screen_frown.png | Bin .../ipc_screens.rsi/ipc_screen_glider.png | Bin .../ipc_screens.rsi/ipc_screen_goggles.png | Bin .../ipc_screens.rsi/ipc_screen_heart.png | Bin .../ipc_screens.rsi/ipc_screen_l.png | Bin .../ipc_screens.rsi/ipc_screen_loading.png | Bin .../ipc_screens.rsi/ipc_screen_monoeye.png | Bin .../ipc_screens.rsi/ipc_screen_nature.png | Bin .../ipc_screens.rsi/ipc_screen_orange.png | Bin .../ipc_screens.rsi/ipc_screen_pink.png | Bin .../ipc_screens.rsi/ipc_screen_question.png | Bin .../ipc_screen_rainbowdiag.png | Bin .../ipc_screen_rainbowhoriz.png | Bin .../ipc_screens.rsi/ipc_screen_redtext.png | Bin .../ipc_screens.rsi/ipc_screen_rgb.png | Bin .../ipc_screens.rsi/ipc_screen_ring.png | Bin .../ipc_screens.rsi/ipc_screen_scroll.png | Bin .../ipc_screens.rsi/ipc_screen_shower.png | Bin .../ipc_screens.rsi/ipc_screen_sinewave.png | Bin .../ipc_screens.rsi/ipc_screen_smile.png | Bin .../ipc_screens.rsi/ipc_screen_squarewave.png | Bin .../ipc_screens.rsi/ipc_screen_stars.png | Bin .../ipc_screens.rsi/ipc_screen_static.png | Bin .../ipc_screens.rsi/ipc_screen_tetris.png | Bin .../ipc_screens.rsi/ipc_screen_textdrop.png | Bin .../ipc_screens.rsi/ipc_screen_tv.png | Bin .../ipc_screens.rsi/ipc_screen_windowsxp.png | Bin .../ipc_screens.rsi/ipc_screen_yellow.png | Bin .../{ => Ipc}/ipc_screens.rsi/meta.json | 0 .../{stampsADT.rsi => stamps.rsi}/meta.json | 0 .../stamp-magistrat.png | Bin 136 files changed, 104 insertions(+), 130 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/coats.ftl delete mode 100644 Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl rename Resources/Locale/ru-RU/ADT/{prototypes/Entities/Roles/Jobs => Job}/departments.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => headset}/headset-component.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Body/Organs/ipc.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Body/Parts/ipc.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes/Catalog/Fills}/Catalog/Fills/Backpacks/backpack.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes/Catalog/Fills}/Catalog/Fills/Backpacks/duffelbag.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes/Catalog/Fills}/Catalog/Fills/Backpacks/satchel.ftl (100%) delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entites/Clothing/OuterClothing/coats.ftl rename Resources/Locale/ru-RU/ADT/{ => prototypes/Entities}/Clothing/Back/backpack.ftl (100%) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl rename Resources/Locale/ru-RU/ADT/{ => prototypes/Entities}/Clothing/Uniform/jumpsuits.ftl (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Entities/Mobs/Customization/Markings/ipc.yml (100%) rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Entities/Mobs/Player/ipc.ftl (100%) delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Entities/Structures/Machines/silicon_chargers.ftl (100%) rename Resources/Locale/ru-RU/ADT/{Entities/Structuries => prototypes/Entities/Structures}/Machines/vending_machines.ftl (100%) rename Resources/Locale/ru-RU/ADT/reagents/{ => meta}/biological.ftl (100%) delete mode 100644 Resources/Prototypes/ADT/Access/fill.txt delete mode 100644 Resources/Prototypes/ADT/Catalog/Cargo/fill.txt delete mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/fill.txt delete mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Items/fill.txt rename Resources/Prototypes/ADT/Catalog/Fills/{ => Items}/weaponcase.yml (84%) rename Resources/Prototypes/ADT/Damage/{ADTmodifiers.yml => modifier_sets.yml} (100%) rename Resources/Prototypes/ADT/Datasets/{ => Names}/first_shadekin.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Ears/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Shoes/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/fill.txt rename Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/{antenna.yml => ipc_antenna.yml} (73%) rename Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/{screens.yml => ipc_screens.yml} (76%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SlugCats/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/fill.txt create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/weaponcase.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/fill.txt delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/fill.txt delete mode 100644 Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/fill.txt delete mode 100644 Resources/Prototypes/ADT/Polymorphs/fill.txt delete mode 100644 Resources/Prototypes/ADT/Research/fill.txt delete mode 100644 Resources/Prototypes/ADT/Roles/Jobs/Science/fill.txt delete mode 100644 Resources/Prototypes/ADT/SoundCollections/fill.txt rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpsuits => Jumpsuit}/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpsuits => Jumpsuit}/white-diplomat-suit.rsi/icon.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpsuits => Jumpsuit}/white-diplomat-suit.rsi/inhand-left.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpsuits => Jumpsuit}/white-diplomat-suit.rsi/inhand-right.png (100%) rename Resources/Textures/ADT/Clothing/Uniforms/{Jumpsuits => Jumpsuit}/white-diplomat-suit.rsi/meta.json (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/cow_ears.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/cow_horns.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/cow_spots.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/deer_antlers_horns.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/demon_ears.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/demon_tail.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/goatee.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/guards_stripes.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/lines_emperos.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/long.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/meta.json (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/queen_lines.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/small_horns.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/tree_lines.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/trinity_spots.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Demon/custom.rsi/up.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Drask/custom.rsi/l_arm.png (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Drask/custom.rsi/meta.json (100%) rename Resources/Textures/ADT/Mobs/{Species => Customization}/Drask/custom.rsi/r_arm.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_antlers.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_crowned.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_cyberhead.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_droneeyes.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_light.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_lightb.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_sidelights.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_tesla.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_towers.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/ipc_antenna_tv.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_antenna.rsi/meta.json (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_blank.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_blue.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_breakout.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_bsod.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_console.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_ecgwave.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_eight.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_exclaim.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_eyes.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_eyesangry.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_eyestall.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_frown.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_glider.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_goggles.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_heart.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_l.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_loading.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_monoeye.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_nature.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_orange.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_pink.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_question.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_rainbowdiag.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_rainbowhoriz.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_redtext.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_rgb.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_ring.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_scroll.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_shower.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_sinewave.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_smile.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_squarewave.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_stars.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_static.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_tetris.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_textdrop.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_tv.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_windowsxp.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/ipc_screen_yellow.png (100%) rename Resources/Textures/ADT/Mobs/Customization/{ => Ipc}/ipc_screens.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/Misc/{stampsADT.rsi => stamps.rsi}/meta.json (100%) rename Resources/Textures/ADT/Objects/Misc/{stampsADT.rsi => stamps.rsi}/stamp-magistrat.png (100%) diff --git a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/coats.ftl deleted file mode 100644 index 61e7c94938..0000000000 --- a/Resources/Locale/ru-RU/ADT/Clothing/OuterClothing/coats.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома - .desc = { ent-ClothingOuterCoatLab.desc } -ent-ADTClothingOuterApronPathologist = фартук патологоанатома - .desc = Фартук для работы с трупами. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl deleted file mode 100644 index 4f4bf7cf87..0000000000 --- a/Resources/Locale/ru-RU/ADT/Entities/Objects/Misc/identification_cards.ftl +++ /dev/null @@ -1,5 +0,0 @@ -ent-ADTPathologistIDCard = ID карта патологоанатома - .desc = { ent-IDCardStandard.desc } - -ent-ADTRoboticistIDCard = ID карта робототехника - .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl b/Resources/Locale/ru-RU/ADT/Job/departments.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/departments.ftl rename to Resources/Locale/ru-RU/ADT/Job/departments.ftl diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl index 28828431bb..1d579e08d9 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl @@ -1,3 +1,5 @@ job-description-ADTPathologist = Осматривайте тела мёртвого экипажа, выявляйте причины их смерти и не забывайте клонировать трупы. job-description-roboticist = Собирайте боргов, мехов, обслуживайте синтетиков и поражайте (либо пугайте) экипаж своими новейшими разработками. + +job-description-magistrat = Самый грозный и богатый на станции. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index 74e8f228d7..35f1074f61 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -3,3 +3,4 @@ JobADTPathologist = Патологоанатом job-name-roboticist = робототехник JobRoboticist = робототехник +job-name-magistrat = Магистрат diff --git a/Resources/Locale/ru-RU/ADT/headset-component.ftl b/Resources/Locale/ru-RU/ADT/headset/headset-component.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/headset-component.ftl rename to Resources/Locale/ru-RU/ADT/headset/headset-component.ftl diff --git a/Resources/Locale/ru-RU/ADT/Body/Organs/ipc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Body/Organs/ipc.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Body/Organs/ipc.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Body/Organs/ipc.ftl diff --git a/Resources/Locale/ru-RU/ADT/Body/Parts/ipc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Body/Parts/ipc.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Body/Parts/ipc.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Body/Parts/ipc.ftl diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/backpack.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/backpack.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/backpack.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/backpack.ftl diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/duffelbag.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/duffelbag.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/duffelbag.ftl diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/satchel.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/satchel.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Catalog/Fills/Backpacks/satchel.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Catalog/Fills/Backpacks/satchel.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entites/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entites/Clothing/OuterClothing/coats.ftl deleted file mode 100644 index f60ebe76e5..0000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entites/Clothing/OuterClothing/coats.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-ADTClothingKadet = шинель для Кадетов СБ - .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Back/backpack.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Clothing/Back/backpack.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl new file mode 100644 index 0000000000..33ec516f0b --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -0,0 +1,6 @@ +ent-ADTClothingOuterCoatLabPathologist = халат патологоанатома + .desc = { ent-ClothingOuterCoatLab.desc } +ent-ADTClothingOuterApronPathologist = фартук патологоанатома + .desc = Фартук для работы с трупами. +ent-ADTClothingKadet = шинель для Кадетов СБ + .desc = шинель, сшитая для новобранцев службы безопасности. Она очень похожа на шинели младших чинов РИА diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Customization/Markings/ipc.yml b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.yml similarity index 100% rename from Resources/Locale/ru-RU/ADT/Entities/Mobs/Customization/Markings/ipc.yml rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Customization/Markings/ipc.yml diff --git a/Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/ipc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/ipc.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Entities/Mobs/Player/ipc.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/ipc.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl index 08cf8797b4..a87586d412 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/identification_cards.ftl @@ -1,2 +1,8 @@ ent-MagistratIDCard = ID Магистрата .desc = Серебрянная карта с значком Юриста. + +ent-ADTPathologistIDCard = ID карта патологоанатома + .desc = { ent-IDCardStandard.desc } + +ent-ADTRoboticistIDCard = ID карта робототехника + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl deleted file mode 100644 index 4c5ca3d3ff..0000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Roles/Jobs/jobs.ftl +++ /dev/null @@ -1,2 +0,0 @@ -job-name-magistrat = Магистрат -job-description-magistrat = Самый грозный и богатый на станции. diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structures/Machines/silicon_chargers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/silicon_chargers.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Entities/Structures/Machines/silicon_chargers.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/silicon_chargers.ftl diff --git a/Resources/Locale/ru-RU/ADT/Entities/Structuries/Machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Entities/Structuries/Machines/vending_machines.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl diff --git a/Resources/Locale/ru-RU/ADT/reagents/biological.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/biological.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/reagents/biological.ftl rename to Resources/Locale/ru-RU/ADT/reagents/meta/biological.ftl diff --git a/Resources/Prototypes/ADT/Access/fill.txt b/Resources/Prototypes/ADT/Access/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Access/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/fill.txt b/Resources/Prototypes/ADT/Catalog/Cargo/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Catalog/Cargo/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fill.txt b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/fill.txt b/Resources/Prototypes/ADT/Catalog/Fills/Items/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Catalog/Fills/Items/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/weaponcase.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/weaponcase.yml similarity index 84% rename from Resources/Prototypes/ADT/Catalog/Fills/weaponcase.yml rename to Resources/Prototypes/ADT/Catalog/Fills/Items/weaponcase.yml index 94bbd3e8c9..4554626c88 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/weaponcase.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/weaponcase.yml @@ -1,24 +1,3 @@ -- type: entity - id: WeaponCaseNT - name: weapon case - description: Case with weapons. - parent: [ BaseStorageItem, BaseBagOpenClose ] - components: - - type: Sprite - sprite: ADT/Objects/Storage/weaponcase.rsi - layers: - - state: closed - - state: open - map: ["openLayer"] - - type: Appearance - - type: Item - sprite: ADT/Objects/Storage/weaponcase.rsi - size: Huge - - type: Storage - grid: - - 0,0,8,3 - maxItemSize: Huge - - type: entity id: WeaponCaseNTM90 name: weapon Case diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/ADT/Damage/ADTmodifiers.yml rename to Resources/Prototypes/ADT/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/ADT/Datasets/first_shadekin.yml b/Resources/Prototypes/ADT/Datasets/Names/first_shadekin.yml similarity index 100% rename from Resources/Prototypes/ADT/Datasets/first_shadekin.yml rename to Resources/Prototypes/ADT/Datasets/Names/first_shadekin.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Ears/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Ears/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Head/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index a2ef44656e..014d6f6474 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -5,6 +5,6 @@ description: white-diplomat-suit-desc components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi + sprite: ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml index 01c1fbcc99..d3c8ce04e7 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Drask.yml @@ -17,7 +17,7 @@ !type:SimpleColoring color: "#171717" sprites: - - sprite: ADT/Mobs/Species/Drask/custom.rsi + - sprite: ADT/Mobs/Customization/Drask/custom.rsi state: r_arm - type: marking @@ -39,5 +39,5 @@ !type:SimpleColoring color: "#171717" sprites: - - sprite: ADT/Mobs/Species/Drask/custom.rsi + - sprite: ADT/Mobs/Customization/Drask/custom.rsi state: l_arm diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml index 8fc7794f51..a7a299f07f 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml @@ -4,7 +4,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: demon_tail - type: marking @@ -13,7 +13,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: long - type: marking @@ -22,7 +22,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: up - type: marking @@ -31,7 +31,7 @@ markingCategory: HeadSide speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: cow_ears - type: marking @@ -40,7 +40,7 @@ markingCategory: HeadSide speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: demon_ears - type: marking @@ -49,7 +49,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: cow_horns - type: marking @@ -58,7 +58,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: deer_antlers_horns - type: marking @@ -67,7 +67,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: small_horns - type: marking @@ -76,7 +76,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: cow_spots - type: marking @@ -85,7 +85,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: guards_stripes - type: marking @@ -94,7 +94,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: lines_emperos - type: marking @@ -103,7 +103,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: queen_lines - type: marking @@ -112,7 +112,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: tree_lines - type: marking @@ -121,7 +121,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: trinity_spots - type: marking @@ -129,5 +129,5 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Species/Demon/custom.rsi + - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi state: goatee diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/antenna.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_antenna.yml similarity index 73% rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/antenna.yml rename to Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_antenna.yml index d114bb4874..3c07f6474b 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/antenna.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_antenna.yml @@ -6,7 +6,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_tv - type: marking @@ -15,7 +15,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_tesla # - type: marking @@ -24,7 +24,7 @@ # bodyPart: Hair # markingCategory: Hair # sprites: -# - sprite: ADT/Mobs/Customization/ipc_antenna.rsi +# - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi # state: ipc_antenna_lightb # - type: marking @@ -33,7 +33,7 @@ # bodyPart: Hair # markingCategory: Hair # sprites: -# - sprite: ADT/Mobs/Customization/ipc_antenna.rsi +# - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi # state: ipc_antenna_light - type: marking @@ -42,7 +42,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_cyberhead # - type: marking @@ -51,7 +51,7 @@ # bodyPart: Hair # markingCategory: Hair # sprites: -# - sprite: ADT/Mobs/Customization/ipc_antenna.rsi +# - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi # state: ipc_antenna_sidelights - type: marking @@ -60,7 +60,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_antlers - type: marking @@ -69,7 +69,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_droneeyes - type: marking @@ -78,7 +78,7 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_crowned - type: marking @@ -87,5 +87,5 @@ bodyPart: Hair markingCategory: Hair sprites: - - sprite: ADT/Mobs/Customization/ipc_antenna.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_antenna.rsi state: ipc_antenna_towers diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/screens.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml similarity index 76% rename from Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/screens.yml rename to Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml index 2dfb75f970..9f79c99976 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/screens.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/ipc_screens.yml @@ -7,7 +7,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_static - type: marking @@ -16,7 +16,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_blue - type: marking @@ -26,7 +26,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_breakout - type: marking @@ -36,7 +36,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_eight - type: marking @@ -45,7 +45,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_goggles - type: marking @@ -54,7 +54,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_exclaim - type: marking @@ -63,7 +63,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_heart - type: marking @@ -72,7 +72,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_monoeye - type: marking @@ -81,7 +81,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_nature - type: marking @@ -91,7 +91,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_orange - type: marking @@ -100,7 +100,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_pink - type: marking @@ -109,7 +109,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_question - type: marking @@ -119,7 +119,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_shower - type: marking @@ -129,7 +129,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_yellow - type: marking @@ -139,7 +139,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_scroll - type: marking @@ -148,7 +148,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_console - type: marking @@ -158,7 +158,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_rgb - type: marking @@ -168,7 +168,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_glider - type: marking @@ -178,7 +178,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_rainbowhoriz - type: marking @@ -188,7 +188,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_bsod - type: marking @@ -198,7 +198,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_redtext - type: marking @@ -208,7 +208,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_sinewave - type: marking @@ -218,7 +218,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_squarewave - type: marking @@ -228,7 +228,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_ecgwave - type: marking @@ -237,7 +237,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_eyes - type: marking @@ -246,7 +246,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_eyestall - type: marking @@ -255,7 +255,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_eyesangry - type: marking @@ -265,7 +265,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_loading - type: marking @@ -275,7 +275,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_windowsxp - type: marking @@ -285,7 +285,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_tetris - type: marking @@ -295,7 +295,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_tv - type: marking @@ -305,7 +305,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_textdrop - type: marking @@ -315,7 +315,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_stars - type: marking @@ -325,7 +325,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_rainbowdiag - type: marking @@ -334,7 +334,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_blank - type: marking @@ -343,7 +343,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_smile - type: marking @@ -352,7 +352,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_frown - type: marking @@ -361,7 +361,7 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_ring - type: marking @@ -370,5 +370,5 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Customization/ipc_screens.rsi + - sprite: ADT/Mobs/Customization/Ipc/ipc_screens.rsi state: ipc_screen_l diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SlugCats/fill.txt b/Resources/Prototypes/ADT/Entities/Mobs/SlugCats/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SlugCats/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml index df00f40884..d06412ce83 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/rubber_stamp.yml @@ -9,5 +9,5 @@ stampedColor: "#754d36" stampState: "paper_stamp-detective" - type: Sprite - sprite: ADT/Objects/Misc/stampsADT.rsi + sprite: ADT/Objects/Misc/stamps.rsi state: stamp-magistrat diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/weaponcase.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/weaponcase.yml new file mode 100644 index 0000000000..ec3ea5ec75 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/weaponcase.yml @@ -0,0 +1,20 @@ +- type: entity + id: WeaponCaseNT + name: weapon case + description: Case with weapons. + parent: [ BaseStorageItem, BaseBagOpenClose ] + components: + - type: Sprite + sprite: ADT/Objects/Storage/weaponcase.rsi + layers: + - state: closed + - state: open + map: ["openLayer"] + - type: Appearance + - type: Item + sprite: ADT/Objects/Storage/weaponcase.rsi + size: Huge + - type: Storage + grid: + - 0,0,8,3 + maxItemSize: Huge \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Pistols/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/fill.txt b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/fill.txt b/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Parts/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Body/Prototypes/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Damage/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Customization/Markings/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Player/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Entities/Mobs/Species/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Names/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/fill.txt b/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Moth(Must resolved,then deleted)/Species/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Polymorphs/fill.txt b/Resources/Prototypes/ADT/Polymorphs/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Polymorphs/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Research/fill.txt b/Resources/Prototypes/ADT/Research/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Research/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Science/fill.txt b/Resources/Prototypes/ADT/Roles/Jobs/Science/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/Roles/Jobs/Science/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/SoundCollections/fill.txt b/Resources/Prototypes/ADT/SoundCollections/fill.txt deleted file mode 100644 index b4954caf47..0000000000 --- a/Resources/Prototypes/ADT/SoundCollections/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/icon.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-left.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/inhand-left.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/inhand-right.png rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/inhand-right.png diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Clothing/Uniforms/Jumpsuits/white-diplomat-suit.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/white-diplomat-suit.rsi/meta.json diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_ears.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_ears.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_ears.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_ears.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_horns.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_horns.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_horns.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_horns.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_spots.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_spots.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/cow_spots.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/cow_spots.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/deer_antlers_horns.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/deer_antlers_horns.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/deer_antlers_horns.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/deer_antlers_horns.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/demon_ears.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/demon_ears.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/demon_ears.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/demon_ears.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/demon_tail.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/demon_tail.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/demon_tail.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/demon_tail.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/goatee.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/goatee.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/goatee.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/goatee.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/guards_stripes.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/guards_stripes.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/guards_stripes.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/guards_stripes.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/lines_emperos.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/lines_emperos.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/lines_emperos.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/lines_emperos.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/long.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/long.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/long.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/long.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/meta.json rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/meta.json diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/queen_lines.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/queen_lines.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/queen_lines.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/queen_lines.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/small_horns.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/small_horns.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/small_horns.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/small_horns.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/tree_lines.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/tree_lines.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/tree_lines.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/tree_lines.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/trinity_spots.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/trinity_spots.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/trinity_spots.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/trinity_spots.png diff --git a/Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/up.png b/Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/up.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Demon/custom.rsi/up.png rename to Resources/Textures/ADT/Mobs/Customization/Demon/custom.rsi/up.png diff --git a/Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/l_arm.png b/Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/l_arm.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/l_arm.png rename to Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/l_arm.png diff --git a/Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/meta.json rename to Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/meta.json diff --git a/Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/r_arm.png b/Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/r_arm.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Species/Drask/custom.rsi/r_arm.png rename to Resources/Textures/ADT/Mobs/Customization/Drask/custom.rsi/r_arm.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_antlers.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_antlers.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_antlers.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_antlers.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_crowned.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_crowned.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_crowned.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_crowned.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_cyberhead.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_cyberhead.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_cyberhead.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_cyberhead.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_droneeyes.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_droneeyes.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_droneeyes.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_droneeyes.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_light.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_light.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_light.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_light.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_lightb.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_lightb.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_lightb.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_lightb.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_sidelights.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_sidelights.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_sidelights.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_sidelights.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tesla.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_tesla.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tesla.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_tesla.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_towers.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_towers.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_towers.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_towers.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tv.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_tv.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tv.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/ipc_antenna_tv.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_antenna.rsi/meta.json rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_antenna.rsi/meta.json diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_blank.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_blank.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_blank.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_blank.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_blue.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_blue.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_blue.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_blue.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_breakout.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_breakout.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_breakout.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_breakout.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_bsod.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_bsod.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_bsod.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_bsod.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_console.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_console.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_console.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_console.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_ecgwave.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_ecgwave.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_ecgwave.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_ecgwave.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eight.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eight.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eight.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eight.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_exclaim.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_exclaim.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_exclaim.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_exclaim.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyes.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyes.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyes.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyes.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyesangry.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyesangry.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyesangry.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyesangry.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyestall.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyestall.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyestall.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_eyestall.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_frown.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_frown.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_frown.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_frown.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_glider.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_glider.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_glider.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_glider.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_goggles.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_goggles.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_goggles.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_goggles.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_heart.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_heart.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_heart.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_heart.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_l.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_l.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_l.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_l.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_loading.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_loading.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_loading.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_loading.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_monoeye.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_monoeye.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_monoeye.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_monoeye.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_nature.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_nature.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_nature.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_nature.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_orange.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_orange.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_orange.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_orange.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_pink.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_pink.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_pink.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_pink.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_question.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_question.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_question.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_question.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowdiag.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rainbowdiag.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowdiag.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rainbowdiag.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowhoriz.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rainbowhoriz.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowhoriz.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rainbowhoriz.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_redtext.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_redtext.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_redtext.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_redtext.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rgb.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rgb.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_rgb.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_rgb.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_ring.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_ring.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_ring.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_ring.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_scroll.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_scroll.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_scroll.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_scroll.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_shower.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_shower.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_shower.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_shower.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_sinewave.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_sinewave.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_sinewave.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_sinewave.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_smile.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_smile.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_smile.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_smile.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_squarewave.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_squarewave.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_squarewave.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_squarewave.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_stars.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_stars.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_stars.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_stars.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_static.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_static.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_static.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_static.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_tetris.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_tetris.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_tetris.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_tetris.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_textdrop.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_textdrop.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_textdrop.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_textdrop.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_tv.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_tv.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_tv.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_tv.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_windowsxp.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_windowsxp.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_windowsxp.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_windowsxp.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_yellow.png b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_yellow.png similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/ipc_screen_yellow.png rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/ipc_screen_yellow.png diff --git a/Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Mobs/Customization/ipc_screens.rsi/meta.json rename to Resources/Textures/ADT/Mobs/Customization/Ipc/ipc_screens.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/meta.json rename to Resources/Textures/ADT/Objects/Misc/stamps.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png b/Resources/Textures/ADT/Objects/Misc/stamps.rsi/stamp-magistrat.png similarity index 100% rename from Resources/Textures/ADT/Objects/Misc/stampsADT.rsi/stamp-magistrat.png rename to Resources/Textures/ADT/Objects/Misc/stamps.rsi/stamp-magistrat.png From 8c959a2b30ca1352141ccdac9f53dbf08eb0bb00 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 15:03:59 +0300 Subject: [PATCH 2/9] fix --- .../Prototypes/ADT/Damage/ADTmodifiers.yml | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 Resources/Prototypes/ADT/Damage/ADTmodifiers.yml diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml new file mode 100644 index 0000000000..ab6acb5ad4 --- /dev/null +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -0,0 +1,120 @@ +- type: damageModifierSet + id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть + coefficients: + Blunt: 1 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.6 + Heat: 1.5 + Poison: 1 + +- type: damageModifierSet + id: Kobalt # мне даже жаль кобальдов, но жизнь такова какова она какова и больше не какова + coefficients: + Blunt: 1 + Piercing: 1 + Slash: 1.0 + Cold: 1.5 + Heat: 0.9 + Poison: 1 + Bloodloss: 0.3 + +- type: damageModifierSet + id: Demon # они вообще то мутанты, но кого ебёт так? + coefficients: + Blunt: 1 + Piercing: 1 + Slash: 1.0 + Cold: 0.8 + Heat: 0.8 + Poison: 0.8 + Cellular: 1.5 + +- type: damageModifierSet + id: Shadekin # пупупу + coefficients: + Blunt: 1.2 + Piercing: 1.2 + Slash: 1.2 + Cold: 0.8 + Heat: 0.8 + Poison: 1 + Cellular: 1 + +- type: damageModifierSet + id: Drask # саморезы + coefficients: + Heat: 1.5 + Asphyxiation: 2.0 + +- type: damageModifierSet + id: Felinid # мяу + coefficients: + Blunt: 1.0 + Piercing: 1.15 + Slash: 1.30 + Cold: 1.5 + Heat: 2.0 + Poison: 1.1 + +- type: damageModifierSet + id: BloodlossIPC + coefficients: + Blunt: 1 + Slash: 0.6 + Piercing: 1.85 + Shock: 0.0 + Cold: 0.0 + Heat: 0 # heat damage doesn't cauterize metal! + Poison: 0.0 + Radiation: 0.0 + Asphyxiation: 0.0 + Bloodloss: 0.0 # no double dipping + Cellular: 0.0 + flatReductions: # Gotta crack a few borgs to get some coolant... + Blunt: 10 + Slash: 10 + Piercing: 10 + +- type: damageModifierSet + id: Moth # Slightly worse at everything but cold + coefficients: + Blunt: 1 + Piercing: 1.15 + Slash: 1.15 + Cold: 0.7 + Heat: 1.5 + Poison: 1.5 + +- type: damageModifierSet + id: CyborgMetallic + coefficients: + Blunt: 0.8 + Slash: 0.7 + Piercing: 0.8 + Heat: 1.2 + Shock: 1.5 + flatReductions: + Blunt: 5 + Slash: 5 + Piercing: 5 + Heat: 5 + +- type: damageModifierSet + id: CyborgMetallicStrong + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + Shock: 1.1 + flatReductions: + Blunt: 9 + Slash: 9 + Piercing: 9 + Heat: 9 + +- type: damageModifierSet + id: Ursus # мишк + coefficients: + Blunt: 1.0 From 46b1a67e43d66fe3368941f1b741ca9cffb95bd2 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 15:04:18 +0300 Subject: [PATCH 3/9] fix --- .../Prototypes/ADT/Damage/ADTmodifiers.yml | 120 ------------------ 1 file changed, 120 deletions(-) delete mode 100644 Resources/Prototypes/ADT/Damage/ADTmodifiers.yml diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml deleted file mode 100644 index ab6acb5ad4..0000000000 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ /dev/null @@ -1,120 +0,0 @@ -- type: damageModifierSet - id: Fur # 1) - ебучий годспид, балансим уроном. 2) - шерсть должна гореть - coefficients: - Blunt: 1 - Piercing: 1.2 - Slash: 1.2 - Cold: 0.6 - Heat: 1.5 - Poison: 1 - -- type: damageModifierSet - id: Kobalt # мне даже жаль кобальдов, но жизнь такова какова она какова и больше не какова - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 1.0 - Cold: 1.5 - Heat: 0.9 - Poison: 1 - Bloodloss: 0.3 - -- type: damageModifierSet - id: Demon # они вообще то мутанты, но кого ебёт так? - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 1.0 - Cold: 0.8 - Heat: 0.8 - Poison: 0.8 - Cellular: 1.5 - -- type: damageModifierSet - id: Shadekin # пупупу - coefficients: - Blunt: 1.2 - Piercing: 1.2 - Slash: 1.2 - Cold: 0.8 - Heat: 0.8 - Poison: 1 - Cellular: 1 - -- type: damageModifierSet - id: Drask # саморезы - coefficients: - Heat: 1.5 - Asphyxiation: 2.0 - -- type: damageModifierSet - id: Felinid # мяу - coefficients: - Blunt: 1.0 - Piercing: 1.15 - Slash: 1.30 - Cold: 1.5 - Heat: 2.0 - Poison: 1.1 - -- type: damageModifierSet - id: BloodlossIPC - coefficients: - Blunt: 1 - Slash: 0.6 - Piercing: 1.85 - Shock: 0.0 - Cold: 0.0 - Heat: 0 # heat damage doesn't cauterize metal! - Poison: 0.0 - Radiation: 0.0 - Asphyxiation: 0.0 - Bloodloss: 0.0 # no double dipping - Cellular: 0.0 - flatReductions: # Gotta crack a few borgs to get some coolant... - Blunt: 10 - Slash: 10 - Piercing: 10 - -- type: damageModifierSet - id: Moth # Slightly worse at everything but cold - coefficients: - Blunt: 1 - Piercing: 1.15 - Slash: 1.15 - Cold: 0.7 - Heat: 1.5 - Poison: 1.5 - -- type: damageModifierSet - id: CyborgMetallic - coefficients: - Blunt: 0.8 - Slash: 0.7 - Piercing: 0.8 - Heat: 1.2 - Shock: 1.5 - flatReductions: - Blunt: 5 - Slash: 5 - Piercing: 5 - Heat: 5 - -- type: damageModifierSet - id: CyborgMetallicStrong - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.8 - Shock: 1.1 - flatReductions: - Blunt: 9 - Slash: 9 - Piercing: 9 - Heat: 9 - -- type: damageModifierSet - id: Ursus # мишк - coefficients: - Blunt: 1.0 From 2fb29897c3672ec8d24affe5d6f7fefd4d70f2c5 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 15:05:29 +0300 Subject: [PATCH 4/9] prikol --- .../{modifier_sets.yml => ADTmodifiers.yml} | 98 ------------------- 1 file changed, 98 deletions(-) rename Resources/Prototypes/ADT/Damage/{modifier_sets.yml => ADTmodifiers.yml} (59%) diff --git a/Resources/Prototypes/ADT/Damage/modifier_sets.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml similarity index 59% rename from Resources/Prototypes/ADT/Damage/modifier_sets.yml rename to Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index a81fe618e2..ab6acb5ad4 100644 --- a/Resources/Prototypes/ADT/Damage/modifier_sets.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -118,101 +118,3 @@ id: Ursus # мишк coefficients: Blunt: 1.0 - -- type: damageModifierSet - id: AshWalker # Груба кожа = умно ящериц - coefficients: - Blunt: 0.8 - -- type: damageModifierSet - id: ADTAntagDroneIPCDamageModSet - coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.55 - Heat: 0.80 - #Explosive: 0.25 - Structural: 0 - # zap - Shock: 0.5 - Cold: 0 - Caustic: 0.3 - -- type: damageModifierSet - id: ADTSecurityCybDamagModSet - coefficients: - Blunt: 0.5 - Slash: 0.4 - Piercing: 0.45 - # fire and lasers burn it good - Heat: 1.0 - # zap - Shock: 1.2 - Cold: 0 - Caustic: 0.4 - -- type: damageModifierSet - id: distorted - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 1.0 - Cold: 0.5 - Heat: 0.5 - Poison: 0.5 - Bloodloss: 1 - -- type: damageModifierSet - id: echo - coefficients: - Blunt: 1 - Piercing: 1 - Slash: 0.4 - Cold: 0.6 - Heat: 0.6 - Poison: 1.0 - Bloodloss: 1 - -- type: damageModifierSet - id: grant - coefficients: - Blunt: 0.5 - Piercing: 0.7 - Slash: 0.5 - Cold: 0.7 - Heat: 0.7 - Poison: 0.7 - Bloodloss: 1 - -- type: damageModifierSet - id: hunter - coefficients: - Blunt: 0.45 - Piercing: 0.6 - Slash: 0.45 - Cold: 0.6 - Heat: 0.45 - Poison: 0.6 - Bloodloss: 1 - -- type: damageModifierSet - id: soldier - coefficients: - Blunt: 0.8 - Piercing: 0.8 - Slash: 0.8 - Cold: 0.8 - Heat: 0.8 - Poison: 0.8 - Bloodloss: 1 - -- type: damageModifierSet - id: wrecker - coefficients: - Blunt: 0.4 - Piercing: 0.55 - Slash: 0.4 - Cold: 0.55 - Heat: 0.65 - Poison: 0.55 - Bloodloss: 1 From d59f74477f899f9468ca647bcf1df995e37016d0 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 15:07:29 +0300 Subject: [PATCH 5/9] ok da? --- .../Prototypes/ADT/Damage/{ADTmodifiers.yml => modifier_sets.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/ADT/Damage/{ADTmodifiers.yml => modifier_sets.yml} (100%) diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/ADT/Damage/ADTmodifiers.yml rename to Resources/Prototypes/ADT/Damage/modifier_sets.yml From e8fd5e2b46bc71dd369af310611410b78ba685db Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:20:08 +0300 Subject: [PATCH 6/9] Update jumpsuits.ftl --- .../ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl index 973fee8314..10e4713634 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl @@ -1,3 +1,5 @@ +ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата + .desc = Специально сделанный белый костюм дипломата NanoTrasen. ent-ADTClothingUniformPathologistSuit = костюм патологоанатома .desc = Лёгкий комбинезон для работника морга. ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома @@ -5,4 +7,4 @@ ent-ADTClothingUniformPathologistSkirt = юбка-костюм патолого ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома - .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. \ No newline at end of file + .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. From 1ba5dbb6489943acb69fa2ba818abb6ea8d86826 Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:27:59 +0300 Subject: [PATCH 7/9] Delete Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl --- .../prototypes/Entities/Clothing/Uniform/jumpsuits.ftl | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl deleted file mode 100644 index 10e4713634..0000000000 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniform/jumpsuits.ftl +++ /dev/null @@ -1,10 +0,0 @@ -ent-ADTClothingUniformsJumpsuitWhiteDiplomatSuitL = Белый костюм дипломата - .desc = Специально сделанный белый костюм дипломата NanoTrasen. -ent-ADTClothingUniformPathologistSuit = костюм патологоанатома - .desc = Лёгкий комбинезон для работника морга. -ent-ADTClothingUniformPathologistSkirt = юбка-костюм патологоанатома - .desc = Лёгкая юбка-комбинезон для работницы морга. -ent-ADTClothingUniformPathologistSuitAlt = чёрный костюм патологоанатома - .desc = Лёгкий комбинезон для работника морга. Более угрюмая версия. -ent-ADTClothingUniformPathologistSkirtAlt = чёрная юбка-костюм патологоанатома - .desc = Лёгкая юбка-комбинезон для работницы морга. Более угрюмая версия. From 6cad736589ff405b0b8d5139e654f6e529d45cb3 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 7 Aug 2024 15:36:51 +0300 Subject: [PATCH 8/9] demon fix --- .../Mobs/Customization/Markings/demon.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml index a7a299f07f..8940c83837 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/demon.yml @@ -4,7 +4,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: demon_tail - type: marking @@ -13,7 +13,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: long - type: marking @@ -22,7 +22,7 @@ markingCategory: Tail speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: up - type: marking @@ -31,7 +31,7 @@ markingCategory: HeadSide speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: cow_ears - type: marking @@ -40,7 +40,7 @@ markingCategory: HeadSide speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: demon_ears - type: marking @@ -49,7 +49,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: cow_horns - type: marking @@ -58,7 +58,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: deer_antlers_horns - type: marking @@ -67,7 +67,7 @@ markingCategory: HeadTop speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: small_horns - type: marking @@ -76,7 +76,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: cow_spots - type: marking @@ -85,7 +85,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: guards_stripes - type: marking @@ -94,7 +94,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: lines_emperos - type: marking @@ -103,7 +103,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: queen_lines - type: marking @@ -112,7 +112,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: tree_lines - type: marking @@ -121,7 +121,7 @@ markingCategory: Chest speciesRestriction: [DemonSpecies] sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: trinity_spots - type: marking @@ -129,5 +129,5 @@ bodyPart: FacialHair markingCategory: FacialHair sprites: - - sprite: ADT/Mobs/Species/Customization/Demon/custom.rsi + - sprite: ADT/Mobs/Customization/Demon/custom.rsi state: goatee From 42a0721b4201f760553dd1829de95ec691b730b3 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Thu, 8 Aug 2024 00:31:02 +0300 Subject: [PATCH 9/9] add JobMagistrat .ftl --- Resources/Locale/ru-RU/ADT/Job/job-names.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl index 35f1074f61..abc0bf8711 100644 --- a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl +++ b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl @@ -3,4 +3,6 @@ JobADTPathologist = Патологоанатом job-name-roboticist = робототехник JobRoboticist = робототехник + job-name-magistrat = Магистрат +JobMagistrat = Магистрат \ No newline at end of file