From 088c9bc3ca3cb4aa7f67e53eac3a0e1f291e2e58 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Mon, 20 May 2024 21:43:04 +0300 Subject: [PATCH 01/13] =?UTF-8?q?=D0=A1=D0=BE=D1=80=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20Ent?= =?UTF-8?q?ities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Actions/boots.yml | 79 ++ .../Prototypes/ADT/Actions/jumpboots.yml | 36 - .../Parts/securitycyborg.yml} | 46 - .../ADT/Body/Prototypes/securitycyborg.yml | 45 + .../{Fills => }/Cargo/cargo_armory.yml | 0 .../Catalog/{Fills => }/Cargo/cargo_food.yml | 0 .../Catalog/{Fills => }/Cargo/cargo_fun.yml | 0 .../{Fills => }/Cargo/cargo_service.yml | 0 .../Fills/Backpacks/StarterGear/backpack.yml | 229 +++- .../Fills/Backpacks/StarterGear/duffelbag.yml | 25 + .../Fills/Backpacks/StarterGear/satchel.yml | 94 ++ .../ADT/Catalog/Fills/Backpacks/duffelbag.yml | 60 + .../ADT/Catalog/Fills/Crates/food.yml | 56 + .../ADT/Catalog/Fills/Crates/fun.yml | 108 ++ .../ADT/Catalog/Fills/Crates/halloween.yml | 49 - .../ADT/Catalog/Fills/Crates/oktoberfest.yml | 99 -- .../ADT/Catalog/Fills/Crates/traider.yml | 232 ++++ .../ADT/Catalog/Fills/Items/belt.yml | 139 ++- .../ADT/Catalog/Fills/Items/briefcases.yml | 29 +- .../ADT/Catalog/Fills/Items/syndicate.yml | 44 + .../ADT/Catalog/Fills/Syndicate.yml | 142 --- .../ADT/Catalog/Loadout/sponsor.yml | 38 + .../Catalog/RadioChannels/LawyerChannel.yml | 7 - .../ADT/Catalog/RadioChannels/MercChannel.yml | 7 - .../ADT/Catalog/RadioChannels/SpecChannel.yml | 39 - .../Prototypes/ADT/Damage/ADTmodifiers.yml | 14 + .../Names/securitycybrog.yml} | 0 .../ADT/Entities/Clothing/Back/backpacks.yml | 321 +---- .../ADT/Entities/Clothing/Back/duffels.yml | 2 +- .../ADT/Entities/Clothing/Back/satchels.yml | 41 - .../ADT/Entities/Clothing/Belt/belts.yml | 137 --- .../ADT/Entities/Clothing/Ears/headsets.yml | 131 ++ .../Clothing/Eyes/SupremeCommanderGlass.yml | 17 - .../ADT/Entities/Clothing/Eyes/glasses.yml | 46 +- .../ADT/Entities/Clothing/Eyes/halloween.yml | 25 - .../{eyepatch_tretyakova.yml => misc.yml} | 0 .../Entities/Clothing/FriskisSet/raven.yml | 106 -- .../Clothing/Hands/SupremeCommanderGloves.yml | 13 - .../Entities/Clothing/Hands/djah_rings.yml | 29 - .../ADT/Entities/Clothing/Hands/gloves.yml | 76 ++ .../Entities/Clothing/Head/Hats/JayBeret.yml | 10 - .../Clothing/Head/Hats/MogesNanoScale.yml | 43 - .../Clothing/Head/Hats/blueshield_beret.yml | 10 - .../ADT/Entities/Clothing/Head/Hats/ears.yml | 16 - .../Clothing/Head/Hats/flower_crown_blue.yml | 10 - .../Entities/Clothing/Head/Hats/halloween.yml | 81 -- .../Entities/Clothing/Head/Hats/ilisuim.yml | 115 -- .../Clothing/Head/Hats/orientalears.yml | 38 - .../Entities/Clothing/Head/Hats/pink_hat.yml | 10 - .../ADT/Entities/Clothing/Head/Hats/veil.yml | 33 - .../Clothing/Head/Hats/wedding_hats.yml | 13 - .../Entities/Clothing/Head/Hats/zepelli.yml | 16 - .../Clothing/Head/hardsuit-helmets.yml | 478 +++++++- .../Clothing/Head/{Hats => }/hats.yml | 339 +++++- .../Head/head_helmet_security_modern.yml | 97 -- .../ADT/Entities/Clothing/Head/helmets.yml | 46 + .../ADT/Entities/Clothing/Head/misc.yml | 171 +++ .../ADT/Entities/Clothing/Head/specific.yml | 32 + .../Clothing/KivchikSet/kivchikset.yml | 76 -- .../ADT/Entities/Clothing/Masks/mask.yml | 32 + .../ADT/Entities/Clothing/Neck/Chokers.yml | 18 - .../ADT/Entities/Clothing/Neck/Cloaks.yml | 90 ++ .../Entities/Clothing/Neck/KirravaCloaks.yml | 24 - .../Entities/Clothing/Neck/NecklaceWith.yml | 35 - .../ADT/Entities/Clothing/Neck/halloween.yml | 19 - .../ADT/Entities/Clothing/Neck/manties.yml | 35 + .../Clothing/Neck/manties_chaplain.yml | 8 - .../ADT/Entities/Clothing/Neck/misc.yml | 46 +- .../ADT/Entities/Clothing/Neck/scarfs.yml | 12 + .../Neck/{armyjeton.yml => specific.yml} | 20 + .../Entities/Clothing/Neck/unrobust_scarf.yml | 10 - .../OuterClothing/FunOuterClothing.yml | 45 - .../OuterClothing/Hardsuits/Cybersun.yml | 76 -- .../OuterClothing/Hardsuits/MogesSpecOps.yml | 70 -- .../Clothing/OuterClothing/Hardsuits/USSP.yml | 417 ------- .../OuterClothing/Hardsuits/cerber.yml | 31 - .../OuterClothing/Hardsuits/fem_syndie.yml | 91 -- .../OuterClothing/Hardsuits/heavy_ERT.yml | 53 - .../OuterClothing/Hardsuits/paramedic.yml | 52 - .../Hardsuits/pioneer_hardsuit.yml | 33 - .../OuterClothing/Hardsuits/saibasain.yml | 30 - .../Hardsuits/security_modern.yml | 127 -- .../Hardsuits/veteransechardsuit.yml | 51 - .../Clothing/OuterClothing/KirravaCloak.yml | 45 - .../Clothing/OuterClothing/SindiPoncho.yml | 12 - .../OuterClothing/SupremeCommanderArmor.yml | 24 - .../Clothing/OuterClothing/USSPjuggernaut.yml | 73 -- .../Clothing/OuterClothing/aprons.yml | 21 - .../Entities/Clothing/OuterClothing/armor.yml | 188 ++- .../Clothing/OuterClothing/barjacket.yml | 10 - .../OuterClothing/blueshield_armor.yml | 21 - .../Entities/Clothing/OuterClothing/coats.yml | 352 ++++++ .../Clothing/OuterClothing/furcoat.yml | 44 - .../Clothing/OuterClothing/halloween.yml | 96 -- .../Clothing/OuterClothing/hardsuits.yml | 967 +++++++++++++++ .../Clothing/OuterClothing/hunger_games.yml | 35 - .../Clothing/OuterClothing/impmonk.yml | 17 - .../Clothing/OuterClothing/inquisitory.yml | 54 - .../Clothing/OuterClothing/jacket.yml | 99 -- .../Clothing/OuterClothing/jaybomber.yml | 9 - .../Clothing/OuterClothing/labcoats.yml | 44 - .../Clothing/OuterClothing/marinne.yml | 53 - .../Entities/Clothing/OuterClothing/misc.yml | 135 +++ .../Clothing/OuterClothing/pilots.yml | 91 -- .../Clothing/OuterClothing/pyotr_coat.yml | 90 -- .../Clothing/OuterClothing/rasy_chaplain.yml | 9 - .../{clothing_shahid.yml => specific.yml} | 0 .../{tsf_armor.yml => vests.yml} | 23 + .../ADT/Entities/Clothing/Shoes/Boots.yml | 301 +---- .../ADT/Entities/Clothing/Shoes/halloween.yml | 23 - .../ADT/Entities/Clothing/Shoes/misc.yml | 252 ++++ .../Entities/Clothing/Underwear/Bottom.yml | 75 +- .../ADT/Entities/Clothing/Underwear/Socks.yml | 38 + .../ADT/Entities/Clothing/Underwear/Top.yml | 55 + .../ADT/Entities/Clothing/Underwear/USSP.yml | 9 - .../Underwear/blueshield_underwear.yml | 26 - .../Clothing/Underwear/clothingmuns.yml | 35 - .../Clothing/Underwear/lace_underwear.yml | 86 -- .../Clothing/Underwear/socks_liexer.yml | 8 - .../Clothing/Uniforms/GorkaClothingset.yml | 18 - .../Entities/Clothing/Uniforms/Jumpsuit.yml | 336 +++++- .../ADT/Entities/Clothing/Uniforms/USSP.yml | 165 --- .../Entities/Clothing/Uniforms/halloween.yml | 181 --- .../ADT/Entities/Loadout/loadouts.yml | 27 - .../Random/Food_Drinks/drinks_glass.yml | 23 + .../Spawners/Random/Food_Drinks/food_meal.yml | 29 + .../Markers/Spawners/Random/halloween.yml | 23 + .../Spawners/{UristSpawn.yml => human.yml} | 16 +- .../Markers/Spawners/{manul.yml => mobs.yml} | 0 .../Spawners}/soundgenerators.yml | 0 .../ftl_point.yml => Markers/shuttle.yml} | 19 +- .../ADT/Entities/Mobs/Capibara/Capibara.yml | 71 -- .../ADT/Entities/Mobs/{ => Cyborgs}/borgi.yml | 0 .../ADT/Entities/Mobs/Daniel/daniel.yml | 40 - .../ADT/Entities/Mobs/NPCs/Hermit.yml | 41 - .../ADT/Entities/Mobs/NPCs/animals.yml | 221 ++++ .../Mobs/{ => NPCs}/anomally_abomination.yml | 0 .../Mobs/{nukiecarp.yml => NPCs/carp.yml} | 0 .../Mobs/NPCs/{DroneAntag.yml => drones.yml} | 0 .../Mobs/NPCs/{AshWalker.yml => human.yml} | 42 + .../halloween_slime.yml => NPCs/slimes.yml} | 0 .../ADT/Entities/Mobs/{ => NPCs}/xeno.yml | 0 .../Entities/Mobs/SecurityCyborg/cyb_pda.yml | 123 -- .../Mobs/SecurityCyborg/damage_mod_set.yml | 12 - .../Mobs/SecurityCyborg/equipment.yml | 151 --- .../SecurityCyborg/identification_cards.yml | 17 - .../Entities/Mobs/SecurityCyborg/sounds.yml | 43 - .../base.yml => Species/secutirycyborg.yml} | 0 .../ADT/Entities/Mobs/guards_of_newyear.yml | 101 -- .../Prototypes/ADT/Entities/Mobs/manul.yml | 31 - .../ADT/Entities/Mobs/player/drones.yml | 498 ++++++++ .../Entities/Mobs/player/engineeringdrone.yml | 122 -- .../ADT/Entities/Mobs/player/medicaldrone.yml | 121 -- .../securitycyborg.yml} | 0 .../ADT/Entities/Mobs/player/servicedrone.yml | 131 -- .../Entities/Mobs/player/servicedrone_alt.yml | 125 -- .../ADT/Entities/Mobs/player/trader.yml | 331 +----- .../ADT/Entities/Mobs/wild_animals.yml | 46 - .../Objects/Consumable/Drinks/cans.yml | 15 - .../Drinks/cherry_exquisite_wine.yml | 17 - .../Consumable/Drinks/chocodrink_glass.yml | 16 - .../Objects/Consumable/Drinks/cocoa_glass.yml | 16 - .../Consumable/Drinks/cup_and_teapot.yml | 41 - .../Objects/Consumable/Drinks/cup_tea.yml | 74 -- ...st_kekc_cocktails_glass.yml => drinks.yml} | 284 +++++ .../{drink_bottles.yml => drinks_bottles.yml} | 0 .../{hell_energy.yml => drinks_cans.yml} | 16 + .../{juices_carton.yml => drinks_carton.yml} | 0 .../{oktoberfest.yml => drinks_cups.yml} | 237 ++-- .../{ArmyFlask.yml => drinks_flasks.yml} | 0 .../Drinks/{DrinkJugs.yml => drinks_jugs.yml} | 0 .../Objects/Consumable/Drinks/new_year.yml | 194 --- .../Consumable/Drinks/trash_drinks.yml | 1 + .../Objects/Consumable/Drinks/ussp_mug.yml | 11 - .../Consumable/Drinks/vodka_antivirus.yml | 17 - .../Objects/Consumable/Food/Baked/cake.yml | 41 + .../Objects/Consumable/Food/Baked/donut.yml | 83 ++ .../Objects/Consumable/Food/Baked/pie.yml | 97 ++ .../Consumable/Food/Containers/box.yml | 155 +++ .../Consumable/Food/buckwheat_bushel.yml | 16 - .../Consumable/Food/buckwheat_pack.yml | 18 - .../Objects/Consumable/Food/chocolate.yml | 258 ---- .../Objects/Consumable/Food/cocoa_pod.yml | 16 - .../Consumable/Food/cocoa_solid_pack.yml | 18 - .../Objects/Consumable/Food/croissant.yml | 110 -- .../{changeling_lavra.yml => disgustings.yml} | 1 + .../Objects/Consumable/Food/easter_food.yml | 137 --- .../Entities/Objects/Consumable/Food/egg.yml | 60 + .../Objects/Consumable/Food/fried_egg.yml | 29 - .../Objects/Consumable/Food/halloween.yml | 424 ------- .../Food/hypoallergen_chocolate.yml | 30 - .../Objects/Consumable/Food/ice_pack.yml | 46 - .../Objects/Consumable/Food/ingredients.yml | 56 + .../Objects/Consumable/Food/khachapuri.yml | 26 - .../Objects/Consumable/Food/mandarin.yml | 165 --- .../Objects/Consumable/Food/meals.yml | 514 ++++++++ .../Entities/Objects/Consumable/Food/meat.yml | 132 ++ .../Objects/Consumable/Food/new_year.yml | 780 ------------ .../Objects/Consumable/Food/oktoberfest.yml | 197 --- .../Objects/Consumable/Food/produce.yml | 293 ++++- .../Objects/Consumable/Food/sashimisafe.yml | 23 - .../Objects/Consumable/Food/sausage.yml | 47 - .../Objects/Consumable/Food/sawdustsoup.yml | 37 - .../Objects/Consumable/Food/shawerma.yml | 117 -- .../Objects/Consumable/Food/snacks.yml | 958 ++++++++++++++- .../Food/{buckwheat_kasha.yml => soup.yml} | 76 ++ .../Objects/Consumable/Food/valentine_day.yml | 181 --- .../Objects/Consumable/Food/vulpix.yml | 29 - .../Cigarettes/Cigars/melnikov_case.yml | 12 - .../Cigarettes/joints.yml | 0 .../Consumable/Smokeables/Cigars/case.yml | 24 +- .../Cigars/cigar.yml} | 16 + .../Decoration/{palmtree.yml => flora.yml} | 0 .../Entities/Objects/Decoration/new_year.yml | 1 + .../Circuitboards/Machine/production.yml | 86 ++ .../Device/Circuitboards/computers.yml | 8 + .../Device/Circuitboards/industrial.yml | 16 - .../Entities/Objects/Device/EncryptionKey.yml | 29 - .../Device/Misc/translator_implants.yml | 287 ----- .../Objects/Device/encryption_keys.yml | 157 +++ .../ADT/Entities/Objects/Device/listening.yml | 47 + .../ADT/Entities/Objects/Device/pda.yml | 27 + .../Objects/Device/{Misc => }/translators.yml | 0 .../Entities/Objects/Fun/Cards/card_base.yml | 32 - .../Objects/Fun/Cards/card_box_base.yml | 36 - .../Objects/Fun/Cards/card_box_full.yml | 115 -- .../Entities/Objects/Fun/Cards/card_clubs.yml | 146 --- .../Objects/Fun/Cards/card_dimond.yml | 146 --- .../Objects/Fun/Cards/card_hearts.yml | 146 --- .../Objects/Fun/Cards/card_jocker.yml | 21 - .../Objects/Fun/Cards/card_spades.yml | 146 --- .../Entities/Objects/Fun/Cards/card_tag.yml | 2 - .../instruments_percussion.yml} | 2 +- .../ADT/Entities/Objects/Fun/aidan.yml | 9 - .../ADT/Entities/Objects/Fun/c4toy.yml | 56 - .../ADT/Entities/Objects/Fun/cards.yml | 795 +++++++++++++ .../ADT/Entities/Objects/Fun/nine.yml | 164 --- .../Objects/Fun/{Cards => }/poker_chips.yml | 0 .../ADT/Entities/Objects/Fun/toys.yml | 69 +- .../Objects/Fun/weapon_polymorphUSSP.yml | 163 --- .../ADT/Entities/Objects/Magic/vulpunator.yml | 23 + .../Entities/Objects/Materials/materials.yml | 19 + .../Objects/Misc/ADTLawyerEncryptionKey.yml | 14 - .../Objects/Misc/ADTLawyerHeadset.yml | 14 - .../ADT/Entities/Objects/Misc/CratesCase.yml | 65 - .../ADT/Entities/Objects/Misc/EvidenceBag.yml | 113 -- .../ADT/Entities/Objects/Misc/Hyppo.yml | 33 - .../Objects/Misc/MercEncryptionKey.yml | 14 - .../ADT/Entities/Objects/Misc/MercHeadset.yml | 14 - .../Objects/Misc/SpecEncryptionKey.yml | 49 - .../ADT/Entities/Objects/Misc/SpecHeadset.yml | 172 --- .../ADT/Entities/Objects/Misc/books.yml | 18 + .../ADT/Entities/Objects/Misc/glass_jug.yml | 26 - .../Objects/Misc/identification_cards.yml | 34 + .../ADT/Entities/Objects/Misc/implanters.yml | 296 ++++- .../Objects/Misc/investigator_sjp.yml | 45 - .../ADT/Entities/Objects/Misc/itensil.yml | 105 ++ .../ADT/Entities/Objects/Misc/jigger.yml | 40 - .../Objects/Misc/mindshield_implant.yml | 16 - .../Objects/Misc/mini_fire_extinguisher.yml | 4 +- .../Entities/Objects/Misc/mixing_glass.yml | 36 - .../ADT/Entities/Objects/Misc/newyear.yml | 216 ++++ .../ADT/Entities/Objects/Misc/paper.yml | 505 ++++++++ .../Entities/Objects/Misc/printerdocument.yml | 1058 ----------------- .../Entities/Objects/Misc/radio_handheld.yml | 102 ++ .../Misc/{RingStorage.yml => ring_box.yml} | 0 .../ADT/Entities/Objects/Misc/schrodinger.yml | 179 --- .../syndie.yml => Objects/Misc/syndiebox.yml} | 0 .../ADT/Entities/Objects/Misc/weapon_case.yml | 14 + .../ADT/Entities/Objects/Misc/wiretapping.yml | 104 -- .../ADT/Entities/Objects/Misc/zipbag.yml | 35 + .../ADT/Entities/Objects/Power/powercell.yml | 7 - .../ert_shield.yml => Shields/shields.yml} | 0 .../Objects/Specific/{ => Chapel}/cross.yml | 0 .../Specific/Hydroponics/buckwheat_seeds.yml | 9 - .../Specific/Hydroponics/cocoa_seeds.yml | 9 - .../Specific/Hydroponics/seeds/seeds.yml | 24 +- .../Specific/Medical/Chemistry/Bottles.yml | 39 + .../Specific/Medical/Chemistry/Chemistry.yml | 113 ++ .../Specific/Medical/Chemistry/Pills.yml | 2 +- .../{ChemicalJugs.yml => chemical_jugs.yml} | 0 .../Melee => Specific/Service}/bouquets.yml | 0 .../Specific/{ => Service}/perfume.yml | 0 .../{ => Service}/zookeperhealthanalyzer.yml | 0 .../Entities/Objects/Specific/cyberhypo.yml | 23 - .../Entities/Objects/Tools/FlippoLighter.yml | 6 + .../ADT/Entities/Objects/Tools/Tools.yml | 21 + .../Entities/Objects/Tools/UrogCrowbar.yml | 20 - ...rate_jaws_of_life.yml => jaws_of_life.yml} | 0 .../Boxes/{muchhurt.yml => pistol.yml} | 0 .../Guns/Ammunition/Cartridges/bibis.yml | 150 --- .../Cartridges/{muchhurt.yml => pistol.yml} | 0 .../Guns/Ammunition/Cartridges/strikeball.yml | 30 + .../Guns/Ammunition/Magazines/pistol.yml | 3 - .../Magazines/{rifle_ext.yml => rifle.yml} | 52 +- .../Guns/Ammunition/Magazines/strikeball.yml | 48 + .../Guns/Ammunition/Magazines/ussp.yml | 26 +- .../Projectiles/{muchhurt.yml => pistol.yml} | 0 .../Guns/Ammunition/Projectiles/rockets.yml | 6 - .../Speedloader/{muchhurt.yml => pistol.yml} | 0 .../Syndicate.yml => Basic/whitecane.yml} | 2 +- .../Weapons/Guns/Battery/battery_gun.yml | 46 + .../Weapons/Guns/LMG/{ussp.yml => lmgs.yml} | 0 .../impacts.yml => Projectiles/impact.yml} | 0 .../Weapons/Guns/Projectiles/projectiles.yml | 17 + .../Objects/Weapons/Guns/Revolvers/Unica.yml | 107 -- .../Weapons/Guns/Revolvers/revolvers.yml | 140 +++ .../Objects/Weapons/Guns/Rifels/abakan.yml | 261 ---- .../Objects/Weapons/Guns/Rifels/fmfal.yml | 128 -- .../Objects/Weapons/Guns/Rifels/rifles.yml | 486 ++++++++ .../Objects/Weapons/Guns/Rifels/xc67.yml | 55 - .../Objects/Weapons/Guns/SMGs/smgs.yml | 167 +++ .../Objects/Weapons/Guns/SMGs/ussp.yml | 166 --- .../{snipers/ussp.yml => Snipers/snipers.yml} | 57 + .../Weapons/Guns/snipers/new_hristov.yml | 56 - .../Objects/Weapons/Melee/AstraKnife.yml | 37 - .../Objects/Weapons/Melee/BoneKnife.yml | 30 - .../Objects/Weapons/Melee/KiiravaSword.yml | 22 - .../Entities/Objects/Weapons/Melee/Sabre.yml | 48 - .../Entities/Objects/Weapons/Melee/Swords.yml | 102 ++ .../Objects/Weapons/Melee/folding_knife.yml | 45 - .../Entities/Objects/Weapons/Melee/knife.yml | 129 ++ .../Objects/Weapons/Melee/pyotr_sabre.yml | 28 - .../Melee/{jaystunbaton.yml => security.yml} | 0 .../{Syndicate.yml => stun_baguette.yml} | 0 .../Entities/Objects/Weapons/Melee/ussp.yml | 19 - .../Objects/Weapons/Melee/vizhivalovo.yml | 1 + ...{christmas_fireplace.yml => fireplace.yml} | 0 .../Structures/Doors/{ => Airlock}/access.yml | 0 .../Furniture/{doublebed.yml => beds.yml} | 0 .../Furniture/{blackchair.yml => chairs.yml} | 33 + .../Structures/Furniture/christmas_tree.yml | 258 +--- .../Structures/Furniture/deckchair.yml | 15 - .../Structures/Furniture/halloween.yml | 54 - .../Furniture/oktoberfest_table.yml | 94 -- .../{oneyearbirthday.yml => party.yml} | 0 .../Structures/Furniture/roundtable.yml | 140 --- .../Furniture/sink.yml} | 0 .../Entities/Structures/Furniture/table.yml | 219 ++++ .../Machines/Computers/computers.yml | 30 + .../Machines/centcommeConsoleShuttle.yml | 55 - ...n_electrical_machines.yml => furnance.yml} | 30 - .../Entities/Structures/Machines/lathe.yml | 98 ++ .../Structures/Mannequin/mannequin-female.yml | 70 -- .../Structures/Mannequin/mannequin-male.yml | 71 -- .../Power/Generation/generator.yml} | 17 +- .../Power/{industrial.yml => smes.yml} | 0 .../Mannequin/mannequin.yml} | 142 +++ .../Structures/Storage/Tanks/tanks.yml | 154 +++ .../{ => Walls}/ADTWallInvisible.yml | 0 .../Structures/Walls/miningwallgirder.yml | 9 + Resources/Prototypes/ADT/Flavors/flavors.yml | 11 + .../Prototypes/ADT/Hydroponics/seeds.yml | 27 + .../securitycyborg.yml} | 2 +- .../Prototypes/ADT/Polymorphs/polymorphs.yml | 14 +- .../ADT/Reagents/Consumable/Drink/alcohol.yml | 641 ++++++++++ .../Drink/cherry_exquisite_wine.yml | 19 - .../Reagents/Consumable/Drink/cocktails.yml | 494 -------- .../ADT/Reagents/Consumable/Drink/cup_tea.yml | 35 - .../ADT/Reagents/Consumable/Drink/drinks.yml | 329 +++++ .../ADT/Reagents/Consumable/Drink/juice.yml | 18 + .../ADT/Reagents/Consumable/Drink/juices.yml | 8 - .../Consumable/Drink/liquid_chocolate.yml | 22 - .../Consumable/Drink/liquid_cocoa.yml | 20 - .../Reagents/Consumable/Drink/new_year.yml | 141 --- .../Consumable/Drink/oktoberfest_beer.yml | 213 ---- .../Consumable/Drink/vodka_antivirus.yml | 19 - .../Graph/structures/minninggeiger.yml} | 11 - .../ADT/Recipes/Cooking/meal_recipe.yml | 118 ++ .../ADT/Recipes/Lathes/electronics.yml | 8 + .../Prototypes/ADT/Recipes/Lathes/printer.yml | 424 +++++++ .../ADT/SoundCollections/emotes.yml | 44 + .../ADT/SoundCollections/gun_sound.yml | 9 + .../securitycyborg.yml} | 0 Resources/Prototypes/ADT/radio_channels.yml | 72 ++ .../laws.yml => silicon-laws.yml} | 0 Resources/Prototypes/ADT/tags.yml | 96 ++ .../Guns/AbakanRifle/burstFireRifles.yml | 94 -- 378 files changed, 15466 insertions(+), 16023 deletions(-) create mode 100644 Resources/Prototypes/ADT/Actions/boots.yml delete mode 100644 Resources/Prototypes/ADT/Actions/jumpboots.yml rename Resources/Prototypes/ADT/{Entities/Mobs/SecurityCyborg/body.yml => Body/Parts/securitycyborg.yml} (81%) create mode 100644 Resources/Prototypes/ADT/Body/Prototypes/securitycyborg.yml rename Resources/Prototypes/ADT/Catalog/{Fills => }/Cargo/cargo_armory.yml (100%) rename Resources/Prototypes/ADT/Catalog/{Fills => }/Cargo/cargo_food.yml (100%) rename Resources/Prototypes/ADT/Catalog/{Fills => }/Cargo/cargo_fun.yml (100%) rename Resources/Prototypes/ADT/Catalog/{Fills => }/Cargo/cargo_service.yml (100%) create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml delete mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/halloween.yml delete mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/oktoberfest.yml create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml create mode 100644 Resources/Prototypes/ADT/Catalog/Fills/Items/syndicate.yml delete mode 100644 Resources/Prototypes/ADT/Catalog/RadioChannels/LawyerChannel.yml delete mode 100644 Resources/Prototypes/ADT/Catalog/RadioChannels/MercChannel.yml delete mode 100644 Resources/Prototypes/ADT/Catalog/RadioChannels/SpecChannel.yml rename Resources/Prototypes/ADT/{Entities/Mobs/SecurityCyborg/name_dataset.yml => Datasets/Names/securitycybrog.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Eyes/SupremeCommanderGlass.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Eyes/halloween.yml rename Resources/Prototypes/ADT/Entities/Clothing/Eyes/{eyepatch_tretyakova.yml => misc.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Hands/SupremeCommanderGloves.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/MogesNanoScale.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/blueshield_beret.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/flower_crown_blue.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ilisuim.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/pink_hat.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/wedding_hats.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml rename Resources/Prototypes/ADT/Entities/Clothing/Head/{Hats => }/hats.yml (69%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/head_helmet_security_modern.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/specific.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/KivchikSet/kivchikset.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/Chokers.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/KirravaCloaks.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/NecklaceWith.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/halloween.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml rename Resources/Prototypes/ADT/Entities/Clothing/Neck/{armyjeton.yml => specific.yml} (59%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Neck/unrobust_scarf.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/USSP.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/heavy_ERT.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/security_modern.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/KirravaCloak.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SupremeCommanderArmor.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/USSPjuggernaut.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barjacket.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/blueshield_armor.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/furcoat.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/impmonk.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/inquisitory.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jacket.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jaybomber.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pilots.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pyotr_coat.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{clothing_shahid.yml => specific.yml} (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{tsf_armor.yml => vests.yml} (52%) delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Shoes/halloween.yml create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Underwear/USSP.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Underwear/blueshield_underwear.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Underwear/clothingmuns.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Underwear/lace_underwear.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Underwear/socks_liexer.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/GorkaClothingset.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/USSP.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml create mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml create mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml create mode 100644 Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/halloween.yml rename Resources/Prototypes/ADT/Entities/Markers/Spawners/{UristSpawn.yml => human.yml} (60%) rename Resources/Prototypes/ADT/Entities/Markers/Spawners/{manul.yml => mobs.yml} (100%) rename Resources/Prototypes/ADT/Entities/{Objects/Misc => Markers/Spawners}/soundgenerators.yml (100%) rename Resources/Prototypes/ADT/Entities/{Objects/Misc/ftl_point.yml => Markers/shuttle.yml} (61%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Capibara/Capibara.yml rename Resources/Prototypes/ADT/Entities/Mobs/{ => Cyborgs}/borgi.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/Daniel/daniel.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml rename Resources/Prototypes/ADT/Entities/Mobs/{ => NPCs}/anomally_abomination.yml (100%) rename Resources/Prototypes/ADT/Entities/Mobs/{nukiecarp.yml => NPCs/carp.yml} (100%) rename Resources/Prototypes/ADT/Entities/Mobs/NPCs/{DroneAntag.yml => drones.yml} (100%) rename Resources/Prototypes/ADT/Entities/Mobs/NPCs/{AshWalker.yml => human.yml} (74%) rename Resources/Prototypes/ADT/Entities/Mobs/{HalloweenSlime/halloween_slime.yml => NPCs/slimes.yml} (100%) rename Resources/Prototypes/ADT/Entities/Mobs/{ => NPCs}/xeno.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/cyb_pda.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/identification_cards.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml rename Resources/Prototypes/ADT/Entities/Mobs/{SecurityCyborg/base.yml => Species/secutirycyborg.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/guards_of_newyear.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/manul.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml rename Resources/Prototypes/ADT/Entities/Mobs/{SecurityCyborg/sec_cyborg.yml => player/securitycyborg.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/wild_animals.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cherry_exquisite_wine.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/chocodrink_glass.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cocoa_glass.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_and_teapot.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_tea.yml rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{just_kekc_cocktails_glass.yml => drinks.yml} (59%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{drink_bottles.yml => drinks_bottles.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{hell_energy.yml => drinks_cans.yml} (64%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{juices_carton.yml => drinks_carton.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{oktoberfest.yml => drinks_cups.yml} (64%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{ArmyFlask.yml => drinks_flasks.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{DrinkJugs.yml => drinks_jugs.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/trash_drinks.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/vodka_antivirus.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donut.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_bushel.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_pack.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/chocolate.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_pod.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_solid_pack.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/{changeling_lavra.yml => disgustings.yml} (80%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/easter_food.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/egg.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ice_pack.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ingredients.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/new_year.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sawdustsoup.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/{buckwheat_kasha.yml => soup.yml} (51%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/valentine_day.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_case.yml rename Resources/Prototypes/ADT/Entities/Objects/Consumable/{Smokeable => Smokeables}/Cigarettes/joints.yml (100%) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/{Smokeable/Cigarettes/Cigars/melnikov_cigar.yml => Smokeables/Cigars/cigar.yml} (50%) rename Resources/Prototypes/ADT/Entities/Objects/Decoration/{palmtree.yml => flora.yml} (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/computers.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/industrial.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translator_implants.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml rename Resources/Prototypes/ADT/Entities/Objects/Device/{Misc => }/translators.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_base.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_base.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_full.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_clubs.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_dimond.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_hearts.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_jocker.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_spades.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_tag.yml rename Resources/Prototypes/ADT/Entities/Objects/Fun/{rock-guitar.yml => Instruments/instruments_percussion.yml} (95%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/aidan.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/c4toy.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/cards.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/nine.yml rename Resources/Prototypes/ADT/Entities/Objects/Fun/{Cards => }/poker_chips.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Fun/weapon_polymorphUSSP.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Magic/vulpunator.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Materials/materials.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerEncryptionKey.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerHeadset.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/CratesCase.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/MercEncryptionKey.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/MercHeadset.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/SpecEncryptionKey.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/SpecHeadset.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/investigator_sjp.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/newyear.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/printerdocument.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml rename Resources/Prototypes/ADT/Entities/Objects/Misc/{RingStorage.yml => ring_box.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/schrodinger.yml rename Resources/Prototypes/ADT/Entities/{Structures/syndie.yml => Objects/Misc/syndiebox.yml} (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/weapon_case.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/zipbag.yml rename Resources/Prototypes/ADT/Entities/Objects/{Weapons/Melee/ert_shield.yml => Shields/shields.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Specific/{ => Chapel}/cross.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/buckwheat_seeds.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/cocoa_seeds.yml rename Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/{ChemicalJugs.yml => chemical_jugs.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/{Weapons/Melee => Specific/Service}/bouquets.yml (100%) rename Resources/Prototypes/ADT/Entities/Objects/Specific/{ => Service}/perfume.yml (100%) rename Resources/Prototypes/ADT/Entities/Objects/Specific/{ => Service}/zookeperhealthanalyzer.yml (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml rename Resources/Prototypes/ADT/Entities/Objects/Tools/{pirate_jaws_of_life.yml => jaws_of_life.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/{muchhurt.yml => pistol.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/{muchhurt.yml => pistol.yml} (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.yml rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/{rifle_ext.yml => rifle.yml} (59%) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{muchhurt.yml => pistol.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/{muchhurt.yml => pistol.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/{Revolvers/Syndicate.yml => Basic/whitecane.yml} (98%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/LMG/{ussp.yml => lmgs.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/{Ammunition/Projectiles/impacts.yml => Projectiles/impact.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/xc67.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/ussp.yml rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/{snipers/ussp.yml => Snipers/snipers.yml} (52%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/new_hristov.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/BoneKnife.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/{jaystunbaton.yml => security.yml} (100%) rename Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/{Syndicate.yml => stun_baguette.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ussp.yml rename Resources/Prototypes/ADT/Entities/Structures/Decorations/{christmas_fireplace.yml => fireplace.yml} (100%) rename Resources/Prototypes/ADT/Entities/Structures/Doors/{ => Airlock}/access.yml (100%) rename Resources/Prototypes/ADT/Entities/Structures/Furniture/{doublebed.yml => beds.yml} (100%) rename Resources/Prototypes/ADT/Entities/Structures/Furniture/{blackchair.yml => chairs.yml} (88%) delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/deckchair.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/oktoberfest_table.yml rename Resources/Prototypes/ADT/Entities/Structures/Furniture/{oneyearbirthday.yml => party.yml} (100%) delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml rename Resources/Prototypes/ADT/Entities/{Objects/Fun/moonshine_still.yml => Structures/Furniture/sink.yml} (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Machines/Computers/computers.yml rename Resources/Prototypes/ADT/Entities/Structures/Machines/{non_electrical_machines.yml => furnance.yml} (88%) create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Machines/lathe.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml delete mode 100644 Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml rename Resources/Prototypes/ADT/Entities/{Objects/Device/Circuitboards/pacman_hard.yml => Structures/Power/Generation/generator.yml} (76%) rename Resources/Prototypes/ADT/Entities/Structures/Power/{industrial.yml => smes.yml} (100%) rename Resources/Prototypes/ADT/Entities/Structures/{Mannequin/mannequin-base.yml => Storage/Mannequin/mannequin.yml} (54%) rename Resources/Prototypes/ADT/Entities/Structures/{ => Walls}/ADTWallInvisible.yml (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Walls/miningwallgirder.yml rename Resources/Prototypes/ADT/{Entities/Mobs/SecurityCyborg/inventory.yml => InventoryTemplates/securitycyborg.yml} (99%) delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/cherry_exquisite_wine.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/cup_tea.yml create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/juice.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/juices.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_chocolate.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_cocoa.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml delete mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Drink/vodka_antivirus.yml rename Resources/Prototypes/ADT/{Entities/Structures/miningwallgirder.yml => Recipes/Construction/Graph/structures/minninggeiger.yml} (86%) create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/printer.yml create mode 100644 Resources/Prototypes/ADT/SoundCollections/gun_sound.yml rename Resources/Prototypes/ADT/{Entities/Mobs/SecurityCyborg/species.yml => Species/securitycyborg.yml} (100%) rename Resources/Prototypes/ADT/{Entities/Mobs/SecurityCyborg/laws.yml => silicon-laws.yml} (100%) delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml diff --git a/Resources/Prototypes/ADT/Actions/boots.yml b/Resources/Prototypes/ADT/Actions/boots.yml new file mode 100644 index 00000000000..71ac554dda8 --- /dev/null +++ b/Resources/Prototypes/ADT/Actions/boots.yml @@ -0,0 +1,79 @@ +- type: entity + id: ActionJumpboots + name: action-jump + description: action-jump-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 45 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: ADT/Clothing/Shoes/Boots/jumpboots.rsi + state: icon + event: !type:JumpbootsActionEvent + + +- type: entity + id: ActionJumpbootsSynd + name: action-jump + description: action-jump-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 15 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: ADT/Clothing/Shoes/Boots/jumpboots_syndie.rsi + state: icon + event: !type:JumpbootsActionEvent + +- type: entity + id: ActionToggleADTMagboots + parent: ActionBaseToggleMagboots + noSpawn: true + components: + - type: InstantAction + icon: { sprite: ADT/Clothing/Shoes/Boots/advanced.rsi, state: icon } + iconOn: ADT/Clothing/Shoes/Boots/advanced.rsi/icon-on.png + #itemIconStyle: NoItem + #event: !type:ToggleActionEvent + +- type: entity + id: ActionToggleADTGasTank + name: action-name-internals-toggle + description: action-description-internals-toggle + noSpawn: true + components: + - type: InstantAction + icon: + sprite: Interface/Alerts/internals.rsi + state: internal2 + iconOn: + sprite: Interface/Alerts/internals.rsi + state: internal1 + event: !type:ToggleActionEvent + useDelay: 1 + +- type: entity + id: ActionToggleADTJetpack + name: action-name-jetpack-toggle + description: action-description-jetpack-toggle + noSpawn: true + components: + - type: InstantAction + icon: + sprite: Objects/Tanks/Jetpacks/blue.rsi + state: icon + iconOn: + sprite: Objects/Tanks/Jetpacks/blue.rsi + state: icon-on + #useDelay: 1.0 + event: !type:ToggleJetpackEvent \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Actions/jumpboots.yml b/Resources/Prototypes/ADT/Actions/jumpboots.yml deleted file mode 100644 index df02f049964..00000000000 --- a/Resources/Prototypes/ADT/Actions/jumpboots.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: entity - id: ActionJumpboots - name: action-jump - description: action-jump-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 45 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: ADT/Clothing/Shoes/Boots/jumpboots.rsi - state: icon - event: !type:JumpbootsActionEvent - - -- type: entity - id: ActionJumpbootsSynd - name: action-jump - description: action-jump-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 15 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: ADT/Clothing/Shoes/Boots/jumpboots_syndie.rsi - state: icon - event: !type:JumpbootsActionEvent diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/body.yml b/Resources/Prototypes/ADT/Body/Parts/securitycyborg.yml similarity index 81% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/body.yml rename to Resources/Prototypes/ADT/Body/Parts/securitycyborg.yml index f52922f1592..e8cabb62845 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/body.yml +++ b/Resources/Prototypes/ADT/Body/Parts/securitycyborg.yml @@ -183,49 +183,3 @@ - type: BodyPart partType: Foot symmetry: Right - -- type: body - id: ADTBodyCyborgSec - name: "ipc" - root: torso - slots: - head: - part: ADTHeadCyborgSec - connections: - - torso - organs: - eyes: OrganIPCEyes - torso: - part: ADTTorsolCyborgSec - connections: - - left arm - - right arm - - left leg - - right leg - organs: - brain: OrganIPCBrain - heart: OrganIPCPump - right arm: - part: ADTRightArmCyborgSec - connections: - - right hand - left arm: - part: ADTLeftArmCyborgSec - connections: - - left hand - right hand: - part: ADTRightHandCyborgSec - left hand: - part: ADTLeftHandCyborgSec - right leg: - part: ADTRightLegCyborgSec - connections: - - right foot - left leg: - part: ADTLeftLegCyborgSec - connections: - - left foot - right foot: - part: ADTRightFootCyborgSec - left foot: - part: ADTLeftFootCyborgSec diff --git a/Resources/Prototypes/ADT/Body/Prototypes/securitycyborg.yml b/Resources/Prototypes/ADT/Body/Prototypes/securitycyborg.yml new file mode 100644 index 00000000000..8b63795dcf0 --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Prototypes/securitycyborg.yml @@ -0,0 +1,45 @@ +- type: body + id: ADTBodyCyborgSec + name: "ipc" + root: torso + slots: + head: + part: ADTHeadCyborgSec + connections: + - torso + organs: + eyes: OrganIPCEyes + torso: + part: ADTTorsolCyborgSec + connections: + - left arm + - right arm + - left leg + - right leg + organs: + brain: OrganIPCBrain + heart: OrganIPCPump + right arm: + part: ADTRightArmCyborgSec + connections: + - right hand + left arm: + part: ADTLeftArmCyborgSec + connections: + - left hand + right hand: + part: ADTRightHandCyborgSec + left hand: + part: ADTLeftHandCyborgSec + right leg: + part: ADTRightLegCyborgSec + connections: + - right foot + left leg: + part: ADTLeftLegCyborgSec + connections: + - left foot + right foot: + part: ADTRightFootCyborgSec + left foot: + part: ADTLeftFootCyborgSec diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_armory.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_armory.yml rename to Resources/Prototypes/ADT/Catalog/Cargo/cargo_armory.yml diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_food.yml rename to Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_fun.yml rename to Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_service.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Cargo/cargo_service.yml rename to Resources/Prototypes/ADT/Catalog/Cargo/cargo_service.yml diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index da9350ac907..82ba00b6c96 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -145,4 +145,231 @@ - type: StorageFill contents: - id: JawsOfLife - - id: WeaponLaserGun \ No newline at end of file + - id: WeaponLaserGun + +#рюкзак следователя + +- type: entity + #noSpawn: true + parent: ClothingBackpackDuffelSecurity + id: ADTClothingBackpackDuffelInvestigatorFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: Pen + amount: 2 + #- id: PaperOffice + # amount: 20 + - id: ADTInvestigatorBoxFolderBase + amount: 1 + - id: ADTInvestigatorBoxFolderRed + amount: 2 + - id: ADTInvestigatorBoxFolderBlue + amount: 1 + - id: ADTBookInvestigator + - id: ADTRubberStampinvestigator + - id: SpaceCash500 + +- type: entity + noSpawn: true + parent: ADTClothingBackpackPathologist + id: ADTClothingBackpackPathologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: BodyBag_Folded + - id: ADTFootTag + - id: SpaceCash500 + +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackADTBlueShieldOfficerFilled + components: + - type: Storage + maxItemSize: Huge + grid: + - 0,0,9,5 + - type: StorageFill + contents: + - id: Zipties + amount: 3 + - id: ADTPowerCellLasgunRevolver + amount: 2 + - id: WeaponDisabler + - id: Stunbaton + - id: BoxSurvivalSecurity + - id: BlueShieldsuit + - id: SpaceCash1000 + - id: OxygenTankFilled + - type: Sprite + sprite: ADT/Clothing/Back/blueshield_backpack.rsi + +#СССП штуки +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR40L + id: ADTClothingBackpackOR40L_OBS5Gear + components: + - type: StorageFill + contents: + - id: ADTWeaponRifleAK55 + - id: MedkitCombatFilled + - id: OxygenTankFilled + - id: Zipties + amount: 2 + - id: ADTMagazineUSSPAK74 + amount: 4 + - id: MagazineBoxRifleRubber + +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR80L + id: ADTClothingBackpackOR80L_OBS7Gear + components: + - type: StorageFill + contents: + - id: ADTWeaponSMGBizon + - id: MedkitCombatFilled + - id: JawsOfLife + - id: CombatMedipen + - id: DoubleEmergencyOxygenTankFilled + - id: Zipties + amount: 2 + - id: ADTMagazineBizon + amount: 4 + - id: MagazineBoxPistolRubber + +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR40L + id: ADTClothingBackpackOR40L_PilotGear + components: + - type: StorageFill + contents: + - id: MedkitCombatFilled + - id: JawsOfLife + - id: CombatMedipen + - id: DoubleEmergencyOxygenTankFilled + - id: ADTMagazineSR2M + amount: 3 + - id: MagazineBoxPistolRubber + +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR80L + id: ADTClothingBackpackOR80L_SpetsnazGear + components: + - type: StorageFill + contents: + - id: ADTWeaponSMGSR3M + - id: MedkitCombatFilled + - id: JawsOfLife + - id: CombatMedipen + amount: 3 + - id: OmnizineChemistryBottle + amount: 2 + - id: EphedrineChemistryBottle + amount: 2 + - id: ADTCombatHypo + - id: DoubleEmergencyOxygenTankFilled + - id: Zipties + amount: 3 + - id: ADTMagazineSR3M + amount: 4 + - id: MagazineBoxLightRifleRubber + +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR80L + id: ADTClothingBackpackOR80L_SpetsnazLMGGear + components: + - type: StorageFill + contents: + - id: ADTWeaponLightMachineGunPKP60 + - id: MedkitCombatFilled + - id: JawsOfLife + - id: CombatMedipen + amount: 2 + - id: OmnizineChemistryBottle + amount: 2 + - id: EphedrineChemistryBottle + amount: 2 + - id: ADTCombatHypo + - id: DoubleEmergencyOxygenTankFilled + - id: Zipties + amount: 3 + - id: ADTMagazineUSSPLMG + amount: 2 + + +- type: entity + noSpawn: true + parent: ADTClothingBackpackOR40L + id: ADTClothingBackpackOR40L_MedicGear + components: + - type: StorageFill + contents: + - id: ADTWeaponPistolPMM + - id: MedkitCombatFilled + amount: 2 + - id: MedkitAdvancedFilled + - id: OxygenTankFilled + - id: ADTMagazinePistolPMM + amount: 2 + - id: SyndiHypo + - id: OmnizineChemistryBottle + amount: 4 + +- type: entity + id: ADTWardrobeKBSFilled + parent: WardrobeSecurity + name: USSP Wardrobe + description: "Cross the thin red line." + suffix: USSP + components: + - type: StorageFill + contents: + - id: ADTClothingRPSUSSP + - id: ADTClothingBackpackOR40L + - id: ADTClothingOuterHardsuitOBS5USSP + - id: MedkitCombatFilled + - id: ADTClothingMaskGasUSSP + - id: OxygenTankFilled + - id: NitrogenTankFilled + - id: ADTWeaponRifleAK55 + prob: 0.5 + orGroup: USSPInfantryWeapon + - id: ADTWeaponLightMachineGunPRK + prob: 0.25 + orGroup: USSPInfantryWeapon + - id: ADTWeaponSMGBizon + prob: 0.25 + orGroup: USSPInfantryWeapon + +- type: entity + parent: ClothingBackpackERTLeader # ADTADTClothingBackpackSecurityCybBase + id: ADTClothingBackpackSecurityCyb + name: backpack cyborg + description: desc + components: + - type: Sprite + sprite: ADT/Clothing/Back/ertleader_cyb.rsi + - type: Unremoveable + - type: StorageFill + contents: + - id: ADTMagazineRifleFNFAL + - id: ADTMagazineRifleFNFAL + - id: ADTMagazineRifleFNFAL + - id: Flash + - id: JawsOfLife + - id: CombatKnife + - id: FlashlightSeclite + - id: GrenadeStinger + - id: GrenadeStinger + - id: GrenadeFlashBang + - id: GrenadeFlashBang + - id: ADTSecurityCybPDA + #- id: WelderIndustrialAdvanced \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 24b21c6e340..b8bdfd818da 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -118,3 +118,28 @@ contents: - id: SmokeGrenade amount: 6 + +- type: entity + noSpawn: true + parent: ADTClothingBackpackDuffelPathologist + id: ADTClothingBackpackDuffelPathologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: BodyBag_Folded + - id: ADTFootTag + - id: SpaceCash500 + +- type: entity + noSpawn: true + parent: ADTClothingBackpackDuffelDurathead + id: ClothingBackpackTraderFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampTrader + - id: AppraisalTool + - id: SpaceCash500 + - id: ADTClothingOuterCoatTrader \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 4a32d348a7f..f67304cc256 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -8,3 +8,97 @@ - id: BoxSurvivalMedical - id: JawsOfLife - id: SpaceCash500 + +- type: entity + #noSpawn: true + parent: ClothingBackpackSatchelSecurity + id: ADTClothingBackpackSatchelInvestigatorFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: Pen + amount: 2 + #- id: PaperOffice + # amount: 20 + #- id: MaterialCardboard1 + # amount: 2 + - id: ADTInvestigatorBoxFolderBase + amount: 1 + - id: ADTInvestigatorBoxFolderRed + amount: 2 + - id: ADTInvestigatorBoxFolderBlue + amount: 1 + - id: ADTBookInvestigator + - id: ADTRubberStampinvestigator + - id: SpaceCash500 + +- type: entity + noSpawn: true + parent: ADTClothingBackpackSatchelPathologist + id: ADTClothingBackpackSatchelPathologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: BodyBag_Folded + - id: ADTFootTag + - id: SpaceCash500 + +- type: entity + parent: ClothingBackpackSatchelSecurity + id: ADTClothingBackpackSatchelLapkee + name: lapkee satchel + description: lapkee satchel + suffix: Personal, Lapkee + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: MagazinePistol + - id: ADTSpaceLaw + - type: Sprite + sprite: ADT/Clothing/Back/lapkee_satchel.rsi + +- type: entity + parent: ADTClothingBackpackSatchelninja + id: ADTClothingBackpackSatchelninjaTools + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Wirecutter + - id: Welder + - id: Multitool + +- type: entity + parent: ClothingBackpackMilitarySatchel + id: ADTClothingBackpackMilitarySatchelFleetPilot + name: paramedical satchel + description: A satchel to store some paramedical equipment. + components: + - type: StorageFill + contents: + - id: SpaceMedipen + amount: 2 + - id: OxygenTankFilled + - id: BoxSurvivalSecurity + - id: SheetPlasma + +- type: entity + parent: ClothingBackpackMilitarySatchel + id: ClothingBackpackMilitarySatchelEngineer + name: paramedical satchel + description: A satchel to store some paramedical equipment. + components: + - type: StorageFill + contents: + - id: OxygenTankFilled + - id: RCD + - id: RCDAmmo + amount: 6 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml new file mode 100644 index 00000000000..c6fc9a6a549 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml @@ -0,0 +1,60 @@ +#Приколы синдикатов яо обр и тд херни что не StartingGear у экипажа + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ADTClothingBackpackDuffelSyndicateFilledMaid # 20 TC + name: Maid bundle + description: Good syndie. + components: + - type: StorageFill + contents: + - id: ClothingHeadHatCatEars + - id: ClothingUniformJumpskirtJanimaidmini + - id: ClothingUnderSocksCoder + - id: SirenaChokerWithHeart + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ADTClothingBackpackDuffelSyndicateFilledStealth # 12 TC + name: Stealth bundle + description: I'm tired of creating descs + components: + - type: StorageFill + contents: + - id: WeaponPistolCobra + - id: Fulton + - id: FultonBeacon + - id: ADTStealthBoxBox + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ADTClothingBackpackDuffelSyndicateFilledIntruder # 20 TC + name: Intruder bundle + description: I'm tired of creating descs + components: + - type: StorageFill + contents: + - id: Emag + - id: SyndicateJawsOfLife + - id: C4 + - id: C4 + - id: Flash + - id: ClothingEyesGlassesSunglasses + - id: AgentIDCard + - id: RadioJammer + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ADTClothingBackpackDuffelSyndicateFilledBlackmail # 15 TC + name: Blackmail bundle + description: I'm tired of creating descs + components: + - type: StorageFill + contents: + - id: ClothingMaskGasVoiceChameleon + - id: RemoteSignaller + - id: RemoteSignaller + - id: C4 + - id: C4 + - id: C4 + - id: AgentIDCard diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml index 659eda80d03..cd442e4a5f7 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml @@ -10,3 +10,59 @@ amount: 6 - id: ADTFoodFishCutlet amount: 3 + +- type: entity + id: ADTCrateChocolateGorilla + parent: CratePlastic + name: chocolate gorilla crate + description: chocolate gorilla crate + suffix: New Year + components: + - type: StorageFill + contents: + - id: ADTChocolateGorillaLarge + amount: 1 + +- type: entity + id: ADTCrateHalloweenFood + parent: CratePlastic + name: halloween candy crate + description: halloween candy crate + suffix: Halloween + components: + - type: StorageFill + contents: + - id: ADTBoxHalloweenCandy + amount: 4 + - id: ADTHalloweenCandyBowl + - id: ADTHalloweenSmileCandyBowl + - id: ADTHalloweenNTCandyBowl + - id: ADTHalloweenSyndieCandyBowl + - id: ADTHalloweenZombieCandyBowl + - id: ADTHalloweenSealCandyBowl + + + +- type: entity + id: ADTCrateOktoberfestSnack + parent: CratePlastic + name: oktoberfest snack crate + description: oktoberfest snack crate + suffix: Oktoberfest + components: + - type: StorageFill + contents: + - id: ADTFoodWeissWurst + amount: 6 + - id: ADTFoodBratWurst + amount: 6 + - id: ADTFoodBreadBrezel + amount: 4 + - id: ADTFoodBreadBrezelPoppySeeds + amount: 4 + - id: ADTFoodBreadBrezelSalt + amount: 4 + - id: ADTFoodBreadBrezelChocolate + amount: 4 + - id: ADTFoodBreadBrezelVanilla + amount: 4 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml index 3f234f2daed..54d30652e8e 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml @@ -156,3 +156,111 @@ - id: ADTBoomBoxTapeHotlineMogesDisco - id: ADTBoomBoxTapeHotlineMusik - id: ADTBoomBoxTapeHotlineParis + +- type: entity + id: ADTCrateHalloweenCloth + parent: CratePlastic + name: halloween clothing crate + description: halloween clothing crate + suffix: Halloween + components: + - type: StorageFill + contents: + - id: ADTBoxHalloweenCandy + amount: 4 + - id: ADTBoxNightmareClown + - id: ADTBoxCrueltySquad + - id: ADTBoxJason + - id: ADTBoxVyazov + - id: ADTBoxHotlineMiami + - id: ADTBoxKilla + - id: ADTBoxServantOfEvil + - id: ADTBoxDude + - id: ADTBoxSquidPlayers + - id: ADTBoxSquidOrganizer + - id: ADTBoxTagilla + - id: ADTBoxNevadaClown + - id: ADTBoxTransilvania + - id: ADTBoxVergile + - id: ADTXenoBox + - id: ADTSuperstarPoliceBox + - id: ADTSuperstarPoliceWingmanBox + - id: ADTBunnyDancerBox + - id: ADTPayDayBox + - id: ADTChainSawManBox + +- type: entity + id: ADTCrateOktoberfestCloth + parent: CratePlastic + name: oktoberfest clothing crate + description: oktoberfest clothing crate + suffix: Oktoberfest + components: + - type: StorageFill + contents: + - id: ADTClothingUniformOktoberfestWhite + amount: 2 + - id: ADTClothingUniformOktoberfestBlueCheckered + amount: 2 + - id: ADTClothingUniformOktoberfestGreenVest + amount: 2 + - id: ADTClothingUniformOktoberfestRedCheckered + amount: 2 + - id: ADTClothingUniformOktoberfestGreenCheckered + amount: 2 + - id: ADTClothingUniformOktoberfestBlueVest + amount: 2 + - id: ADTClothingUniformOktoberfestRedVest + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlShort + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlShortGreen + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlShortRed + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlShortBlue + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlBlue + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlRed + amount: 2 + - id: ADTClothingUniformOktoberfestDirndlGreen + amount: 2 + - id: ADTClothingHeadHatsBavarianHat + amount: 2 + - id: ADTClothingHeadHatsBavarianHatBlueBorder + amount: 2 + - id: ADTClothingHeadHatsBavarianHatRedBorder + amount: 2 + - id: ADTClothingHeadHatsBavarianHatGreenBorder + amount: 2 + - id: ADTClothingHeadHatsBavarianHatBlue + amount: 2 + - id: ADTClothingHeadHatsBavarianHatGreen + amount: 2 + - id: ADTClothingHeadHatsBavarianHatRed + amount: 2 + +- type: entity + id: ADTCrateOktoberfestMug + parent: CratePlastic + name: oktoberfest mug crate + description: oktoberfest mug crate + suffix: Oktoberfest + components: + - type: StorageFill + contents: + - id: ADTGoldenAleMug + amount: 4 + - id: ADTTechnoBeerMug + amount: 2 + - id: ADTClassicPaulanerBeerMug + amount: 2 + - id: ADTLivseyBeerMug + amount: 2 + - id: ADTLuckyJonnyMug + amount: 2 + - id: ADTSecUnfilteredMug + amount: 2 + - id: ADTGlyphidStoutBeerMug + amount: 2 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/halloween.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/halloween.yml deleted file mode 100644 index f7c379ec89f..00000000000 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/halloween.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: entity - id: ADTCrateHalloweenFood - parent: CratePlastic - name: halloween candy crate - description: halloween candy crate - suffix: Halloween - components: - - type: StorageFill - contents: - - id: ADTBoxHalloweenCandy - amount: 4 - - id: ADTHalloweenCandyBowl - - id: ADTHalloweenSmileCandyBowl - - id: ADTHalloweenNTCandyBowl - - id: ADTHalloweenSyndieCandyBowl - - id: ADTHalloweenZombieCandyBowl - - id: ADTHalloweenSealCandyBowl - -- type: entity - id: ADTCrateHalloweenCloth - parent: CratePlastic - name: halloween clothing crate - description: halloween clothing crate - suffix: Halloween - components: - - type: StorageFill - contents: - - id: ADTBoxHalloweenCandy - amount: 4 - - id: ADTBoxNightmareClown - - id: ADTBoxCrueltySquad - - id: ADTBoxJason - - id: ADTBoxVyazov - - id: ADTBoxHotlineMiami - - id: ADTBoxKilla - - id: ADTBoxServantOfEvil - - id: ADTBoxDude - - id: ADTBoxSquidPlayers - - id: ADTBoxSquidOrganizer - - id: ADTBoxTagilla - - id: ADTBoxNevadaClown - - id: ADTBoxTransilvania - - id: ADTBoxVergile - - id: ADTXenoBox - - id: ADTSuperstarPoliceBox - - id: ADTSuperstarPoliceWingmanBox - - id: ADTBunnyDancerBox - - id: ADTPayDayBox - - id: ADTChainSawManBox diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/oktoberfest.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/oktoberfest.yml deleted file mode 100644 index fcb903630a4..00000000000 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/oktoberfest.yml +++ /dev/null @@ -1,99 +0,0 @@ -- type: entity - id: ADTCrateOktoberfestCloth - parent: CratePlastic - name: oktoberfest clothing crate - description: oktoberfest clothing crate - suffix: Oktoberfest - components: - - type: StorageFill - contents: - - id: ADTClothingUniformOktoberfestWhite - amount: 2 - - id: ADTClothingUniformOktoberfestBlueCheckered - amount: 2 - - id: ADTClothingUniformOktoberfestGreenVest - amount: 2 - - id: ADTClothingUniformOktoberfestRedCheckered - amount: 2 - - id: ADTClothingUniformOktoberfestGreenCheckered - amount: 2 - - id: ADTClothingUniformOktoberfestBlueVest - amount: 2 - - id: ADTClothingUniformOktoberfestRedVest - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlShort - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlShortGreen - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlShortRed - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlShortBlue - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlBlue - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlRed - amount: 2 - - id: ADTClothingUniformOktoberfestDirndlGreen - amount: 2 - - id: ADTClothingHeadHatsBavarianHat - amount: 2 - - id: ADTClothingHeadHatsBavarianHatBlueBorder - amount: 2 - - id: ADTClothingHeadHatsBavarianHatRedBorder - amount: 2 - - id: ADTClothingHeadHatsBavarianHatGreenBorder - amount: 2 - - id: ADTClothingHeadHatsBavarianHatBlue - amount: 2 - - id: ADTClothingHeadHatsBavarianHatGreen - amount: 2 - - id: ADTClothingHeadHatsBavarianHatRed - amount: 2 - -- type: entity - id: ADTCrateOktoberfestMug - parent: CratePlastic - name: oktoberfest mug crate - description: oktoberfest mug crate - suffix: Oktoberfest - components: - - type: StorageFill - contents: - - id: ADTGoldenAleMug - amount: 4 - - id: ADTTechnoBeerMug - amount: 2 - - id: ADTClassicPaulanerBeerMug - amount: 2 - - id: ADTLivseyBeerMug - amount: 2 - - id: ADTLuckyJonnyMug - amount: 2 - - id: ADTSecUnfilteredMug - amount: 2 - - id: ADTGlyphidStoutBeerMug - amount: 2 - -- type: entity - id: ADTCrateOktoberfestSnack - parent: CratePlastic - name: oktoberfest snack crate - description: oktoberfest snack crate - suffix: Oktoberfest - components: - - type: StorageFill - contents: - - id: ADTFoodWeissWurst - amount: 6 - - id: ADTFoodBratWurst - amount: 6 - - id: ADTFoodBreadBrezel - amount: 4 - - id: ADTFoodBreadBrezelPoppySeeds - amount: 4 - - id: ADTFoodBreadBrezelSalt - amount: 4 - - id: ADTFoodBreadBrezelChocolate - amount: 4 - - id: ADTFoodBreadBrezelVanilla - amount: 4 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml new file mode 100644 index 00000000000..c8c40786c48 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml @@ -0,0 +1,232 @@ +- type: entity + name: RandomTraderProduct + id: RandomTraderProduct + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - type: ConditionalSpawner + prototypes: + - AirCanister + - OxygenCanister + - LiquidOxygenCanister + - NitrogenCanister + - LiquidNitrogenCanister + - CarbonDioxideCanister + - LiquidCarbonDioxideCanister + - StorageCanister + - PlasmaCanister + - CrateHydroponicsSeedsExotic + - CrateHydroponicsSeedsMedicinal + - CrateHydroponicsTools + - CrateHydroponicsSeeds + - CratePlantBGone + - OreBox + - CrateCargoLuxuryHardsuit + - ADTCargoUtilisatorComplectCrate + - CrateCrewMonitoringBoards + - CrateEmergencyExplosive + - CrateEmergencyFire + - CrateEmergencyInternals + - CrateEmergencyInternalsLarge + - CrateEmergencyRadiation + - CrateEmergencyInflatablewall + - CrateSlimepersonLifeSupport + - CrateGenericBiosuit + - CrateEngineeringCableLV + - CrateEngineeringCableMV + - CrateEngineeringCableHV + - CrateEngineeringCableBulk + - CrateEngineeringElectricalSupplies + - CrateEngineeringStationBeaconBundle + - CrateEngineeringJetpack + - CrateEngineeringMiniJetpack + - CrateAirlockKit + - CrateEvaKit + - CrateRCDAmmo + - CrateRCD + - CrateParticleDecelerators + - CrateEngineeringVoidJetpack + - CrateEngineeringAMEJar + - CrateEngineeringSingularityGenerator + - CrateEngineeringSingularityContainment + - CrateEngineeringSingularityCollector + - CrateEngineeringParticleAccelerator + - CrateEngineeringSolar + - CrateEngineeringTeslaGenerator + - CrateEngineeringTeslaCoil + - CrateEngineeringTeslaGroundingRod + - CrateFoodPizza + - CrateFoodPizzaLarge + - CrateFoodMRE + - CrateFoodCooking + - CrateFoodDinnerware + - CrateFoodBarSupply + - CrateFoodSoftdrinks + - CrateFoodSoftdrinksLarge + - CrateFunInstrumentsVariety + - CrateFunInstrumentsBrass + - CrateFunInstrumentsString + - CrateFunInstrumentsWoodwind + - CrateFunInstrumentsKeyedPercussion + - CrateFunInstrumentsSpecial + - CrateFunArtSupplies + - CrateFunParty + - CrateFunWaterGuns + - CrateFunPlushie + - CrateFunLizardPlushieBulk + - CrateFunLightImplants + - CrateFunSadTromboneImplants + - CrateFunBoxing + - CrateFunPirate + - CrateFunToyBox + - CrateFunBikeHornImplants + - CrateFunMysteryFigurines + - CrateFunDartsSet + - CrateNPCBee + - CrateNPCButterflies + - CrateNPCCat + - CrateNPCChicken + - CrateNPCCrab + - CrateNPCDuck + - CrateNPCPuppyCorgi + - CrateNPCCow + - CrateNPCGoat + - CrateNPCGoose + - CrateNPCGorilla + - CrateNPCMonkeyCube + - CrateNPCKoboldCube + - CrateNPCMouse + - CrateNPCParrot + - CrateNPCPenguin + - CrateNPCPig + - CrateNPCSnake + - CrateNPCHamster + - CrateNPCLizard + - CrateNPCKangaroo + - CrateNPCMothroach + - CrateNPCCorgi + - CrateMaterialGlass + - CrateMaterialSteel + - CrateMaterialPlastic + - CrateMaterialPlasteel + - CrateMaterialTextiles + - CrateMaterialPlasma + - CrateMaterialCardboard + - CrateMaterialPaper + - WeldingFuelTankFull + - WaterTankFull + - CrateMedicalSupplies + - CrateChemistrySupplies + - CrateChemistryVials + - CrateEmergencyBurnKit + - CrateEmergencyToxinKit + - CrateEmergencyO2Kit + - CrateEmergencyBruteKit + - CrateEmergencyAdvancedKit + - CrateEmergencyRadiationKit + - CrateBodyBags + - CrateVirologyBiosuit + - CrateMindShieldImplants + - CrateChemistryP + - CrateChemistryS + - CrateChemistryD + - CrateArtifactContainer + - RandomArtifactSpawner + - CrateScienceBiosuit + - Thruster + - Gyroscope + - CrateServiceJanitorialSupplies + - CrateServiceReplacementLights + - CrateMousetrapBoxes + - CrateServiceTheatre + - CrateServiceSmokeables + - CrateServiceCustomSmokable + - CrateServiceBureaucracy + - CrateServicePersonnel + - CrateServiceBooks + - CrateServiceGuidebooks + - CrateServiceSodaDispenser + - CrateServiceBoozeDispenser + - CrateServiceBox + - CrateJanitorBiosuit + - FoodCartHot + - FoodCartCold + - PetCarrier + - CrateJanitorExplosive + +- type: entity + name: RandomTraderRareProduct + id: RandomTraderRareProduct + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - type: ConditionalSpawner + prototypes: + - WelderExperimental + - JawsOfLife + - RPED + - RCDEmpty + - RCDAmmo + - ClothingShoesBootsSpeed + - ClothingShoesBootsMagSci + - WeaponGauntletGorilla + - WeaponPistolCHIMP + - DeviceQuantumSpinInverter + - WeaponProtoKineticAccelerator + - WeaponTetherGun + - WeaponGrapplingGun + - WeaponForceGun + - MiningDrill + - PowerCellMicroreactor + - CrateCargoGambling + +- type: entity + name: RandomTraderArmory + id: RandomTraderArmory + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - type: ConditionalSpawner + prototypes: + - CrateArmorySMG + - CrateArmoryShotgun + - CrateTrackingImplants + - CrateTrainingBombs + - CrateArmoryLaser + - CrateArmoryPistols + - CrateSecurityArmor + - CrateSecurityHelmet + - CrateSecurityNonlethal + - CrateSecurityRiot + - CrateSecuritySupplies + - CrateRestraints + - CrateSecurityBiosuit + - CrateSecurityHardsuit + - CrateSecurityUSSPjuggernaut + +- type: entity + name: RandomTraderLoot + id: RandomTraderLoot + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - type: ConditionalSpawner + prototypes: + - ADTTallRobotFMekaCargo + - ADTTallRobotFMekaEng + - ADTTallRobotFMekaJani + - ADTTallRobotFMekaMed + - ADTTallRobotFMekaServe + - ADTTallRobotMekaCargo + - ADTTallRobotMekaEng + - ADTTallRobotMekaJani + - ADTTallRobotMekaMed + - ADTTallRobotMekaServe \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml index b34f4921068..16b97cc229b 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml @@ -12,4 +12,141 @@ - id: Bloodpack amount: 1 - id: Gauze - - id: EmergencyMedipen \ No newline at end of file + - id: EmergencyMedipen + +#ERT +#RPSS +- type: entity + id: ADTClothingBeltMilitaryWebbingRPSSL + parent: ClothingBeltMilitaryWebbing + name: ERT security belt + description: Part of ERT security's gear + components: + + - type: StorageFill + contents: + - id: EmergencyMedipen + amount: 2 + - id: MagazineMagnum + - id: WeaponPistolN1984 + - id: MedicatedSuture + +- type: entity + id: ADTClothingBeltMilitaryWebbingRPSSL_Rev + parent: ClothingBeltMilitaryWebbing + name: ERT security belt + description: Part of ERT security's gear + suffix: Anti-REV + components: + + - type: StorageFill + contents: + - id: EmergencyMedipen # Size 2 + amount: 2 + - id: ADTtelescopicBaton #Size 2 + - id: Stunbaton #Size 2 + - id: Flash #Size 2 + - id: Handcuffs #Size 2 + amount: 3 + +#RPSL +- type: entity + id: ADTClothingBeltMilitaryWebbingRPSL + parent: ClothingBeltMilitaryWebbing + name: ERT Leader belt + description: Part of ERT leader's gear + components: + - type: StorageFill + contents: + - id: EmergencyMedipen + amount: 2 + - id: MagazineMagnum + - id: WeaponPistolN1984 + - id: MedicatedSuture + - id: ADTAdvancedHoloprojectorField + +- type: entity + id: ADTClothingBeltMilitaryWebbingRPSL_Rev + parent: ClothingBeltMilitaryWebbing + name: ERT Leader belt + description: Part of ERT leader's gear + suffix: Anti-REV + components: + - type: StorageFill + contents: + - id: EmergencyMedipen + amount: 2 + - id: ADTtelescopicBaton + - id: Stunbaton + - id: Flash + - id: Handcuffs + amount: 3 + +#RPSM +- type: entity + id: ADTClothingBeltMilitaryWebbingRPSML + parent: ClothingBeltMilitaryWebbing + name: ERT medical belt + description: Part of ERT medical's gear + components: + - type: StorageFill + contents: + - id: EmergencyMedipen + - id: EmergencyMedipen + - id: MedicatedSuture + - id: MedicatedSuture + - id: EpinephrineChemistryBottle + - id: EphedrineChemistryBottle + - id: ADTObjectsSpecificBicaridineChemistryBottle + - id: ADTObjectsSpecificDexalinPlusChemistryBottle + - id: RegenerativeMesh + +#кобура следователя СБ + +- type: entity + id: ADTClothingBeltInvestigatorHolster + parent: ClothingBeltHolster + suffix: Filled + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58Nonlethal + - id: MagazinePistol + +#кобура аудитора СБ + +- type: entity + id: ADTClothingBeltSecAuditorHolster + parent: ClothingBeltHolster + suffix: Filled + components: + - type: StorageFill + contents: + - id: ADTWeaponPistolPMM + - id: ADTMagazinePistolPMM + - type: Sprite + sprite: ADT/Clothing/Belt/sec_auditor_holster.rsi + - type: Clothing + sprite: ADT/Clothing/Belt/sec_auditor_holster.rsi + quickEquip: true + +- type: entity + parent: ClothingBeltStorageBase + id: ADTClothingBeltAssault + name: assault belt + description: A tactical assault belt. + components: + - type: Sprite + sprite: Clothing/Belt/assault.rsi + - type: Clothing + sprite: Clothing/Belt/assault.rsi + - type: Appearance + - type: StorageFill + contents: + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Wirecutter + - id: Welder + - id: Multitool + - id: GasAnalyzer \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml index 306c474555e..41671494466 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/briefcases.yml @@ -47,4 +47,31 @@ Blunt: 12 soundHit: path: "/Audio/Weapons/smash.ogg" -#у меня почему-то не хочет добавляться чемодан ЦК. \ No newline at end of file +#у меня почему-то не хочет добавляться чемодан ЦК. + +- type: entity + id: ADTBriefcaseBrownSchrodinger + name: Schrodinger`s briefcase + parent: ADTBriefcaseCentcomm + suffix: Filled + components: + - type: Storage + grid: + - 0,0,6,5 + #- type: Storage + # maxItemSize: Ginormous + # maxTotalWeight: 0 + # maxSlots: 50 #By this ignore maxTotalWeight + - type: StorageFill + contents: + - id: ClothingShoesBootsLaceup + - id: ClothingHandsGlovesCombat + - id: ClothingEyesGlassesSunglasses + - id: ClothingMaskGasCentcom + - id: ClothingUniformJumpsuitCentcomAgent + - id: ADTWeaponRevolverDeckardGold + - id: CentcomPDA + - id: ADTClothingNeckMantleCentComm + - id: ClothingHeadsetAltCentCom + - id: ADTClothingOuterCoatSchroCoat + - id: ADTClothingNeckNanoTrasenPinSchrodinger \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/syndicate.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/syndicate.yml new file mode 100644 index 00000000000..5ae46c7bce4 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/syndicate.yml @@ -0,0 +1,44 @@ +- type: entity + id: BartenderToxinsPack + suffix: Filled + parent: MedkitCombat + components: + - type: StorageFill + contents: + - id: MuteToxinChemistryBottle + - id: ADTAmatoxinChemistryBottle + - id: ADTLicoxideChemistryBottle + - id: ADTLexorinChemistryBottle + - id: ADTLexorinChemistryBottle + +- type: entity + parent: ToolboxSyndicate + id: ADTToolboxSyndicateFilledThief # 10 TC + name: Thieving bundle + description: Everything you need to become a better thief version. + components: + - type: StorageFill + contents: + - id: StorageImplanter + - id: ThievingGloves + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Welder + - id: Wirecutter + - id: Multitool + - id: ClothingHandsGlovesCombat + - id: ClothingMaskGasSyndicate + + +- type: entity + parent: BoxCardboard + id: ADTBoxSyndicateFilledEscapist # 15 TC + name: Escapist bundle + description: For those who already got in or afraid of troubles. + components: + - type: StorageFill + contents: + - id: EmpImplanter + - id: FreedomImplanter + - id: DnaScramblerImplanter \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Syndicate.yml b/Resources/Prototypes/ADT/Catalog/Fills/Syndicate.yml index 5b31af9e4fe..e69de29bb2d 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Syndicate.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Syndicate.yml @@ -1,142 +0,0 @@ -- type: entity - id: ADTAmatoxinChemistryBottle - name: amatoxin bottle - parent: BaseChemistryBottleFilled - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Amatoxin - Quantity: 30 - -- type: entity - id: ADTLicoxideChemistryBottle - name: licoxide bottle - parent: BaseChemistryBottleFilled - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Licoxide - Quantity: 30 - -- type: entity - id: ADTLexorinChemistryBottle - name: licoxide bottle - parent: BaseChemistryBottleFilled - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Lexorin - Quantity: 30 - -- type: entity - id: BartenderToxinsPack - suffix: Filled - parent: MedkitCombat - components: - - type: StorageFill - contents: - - id: MuteToxinChemistryBottle - - id: ADTAmatoxinChemistryBottle - - id: ADTLicoxideChemistryBottle - - id: ADTLexorinChemistryBottle - - id: ADTLexorinChemistryBottle - -- type: entity - parent: ToolboxSyndicate - id: ADTToolboxSyndicateFilledThief # 10 TC - name: Thieving bundle - description: Everything you need to become a better thief version. - components: - - type: StorageFill - contents: - - id: StorageImplanter - - id: ThievingGloves - - id: Crowbar - - id: Wrench - - id: Screwdriver - - id: Welder - - id: Wirecutter - - id: Multitool - - id: ClothingHandsGlovesCombat - - id: ClothingMaskGasSyndicate - - -- type: entity - parent: BoxCardboard - id: ADTBoxSyndicateFilledEscapist # 15 TC - name: Escapist bundle - description: For those who already got in or afraid of troubles. - components: - - type: StorageFill - contents: - - id: EmpImplanter - - id: FreedomImplanter - - id: DnaScramblerImplanter - -- type: entity - parent: ClothingBackpackDuffelSyndicateBundle - id: ADTClothingBackpackDuffelSyndicateFilledMaid # 20 TC - name: Maid bundle - description: Good syndie. - components: - - type: StorageFill - contents: - - id: ClothingHeadHatCatEars - - id: ClothingUniformJumpskirtJanimaidmini - - id: ClothingUnderSocksCoder - - id: SirenaChokerWithHeart - -- type: entity - parent: ClothingBackpackDuffelSyndicateBundle - id: ADTClothingBackpackDuffelSyndicateFilledStealth # 12 TC - name: Stealth bundle - description: I'm tired of creating descs - components: - - type: StorageFill - contents: - - id: WeaponPistolCobra - - id: Fulton - - id: FultonBeacon - - id: ADTStealthBoxBox - -- type: entity - parent: ClothingBackpackDuffelSyndicateBundle - id: ADTClothingBackpackDuffelSyndicateFilledIntruder # 20 TC - name: Intruder bundle - description: I'm tired of creating descs - components: - - type: StorageFill - contents: - - id: Emag - - id: SyndicateJawsOfLife - - id: C4 - - id: C4 - - id: Flash - - id: ClothingEyesGlassesSunglasses - - id: AgentIDCard - - id: RadioJammer - -- type: entity - parent: ClothingBackpackDuffelSyndicateBundle - id: ADTClothingBackpackDuffelSyndicateFilledBlackmail # 15 TC - name: Blackmail bundle - description: I'm tired of creating descs - components: - - type: StorageFill - contents: - - id: ClothingMaskGasVoiceChameleon - - id: RemoteSignaller - - id: RemoteSignaller - - id: C4 - - id: C4 - - id: C4 - - id: AgentIDCard diff --git a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml index fa8d49aa76b..57e2843a7e0 100644 --- a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml +++ b/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml @@ -16,4 +16,42 @@ - type: loadout id: GoldStanerLoadout entity: WeaponDisablerIdan + sponsorOnly: true + +- type: loadout + id: OktyabrinaLoadout + entity: ADTClothingHeadHatOktyabrinaOrientalEars + sponsorOnly: true + +#Chu-See + +- type: loadout + id: TrueDetectiveCoat + entity: ADTClothingOuterCoatTrueDetectivesCoat + sponsorOnly: true + whitelistJobs: [Detective] + +- type: loadout + id: TrueDetectiveJumpskirt + entity: ADTClothingUniformTrueDetectiveJumpskirt + sponsorOnly: true + whitelistJobs: [Detective] + +- type: loadout + id: TrueDetectiveHat + entity: ADTClothingHeadHatsTrueDetectiveHat + sponsorOnly: true + whitelistJobs: [Detective] + + +#Nova + +- type: loadout + id: NovaGloves + entity: ADTClothingHandsNovaGloves + sponsorOnly: true + +- type: loadout + id: AstraKnifeLoadout + entity: ADTAstraKnife sponsorOnly: true \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/RadioChannels/LawyerChannel.yml b/Resources/Prototypes/ADT/Catalog/RadioChannels/LawyerChannel.yml deleted file mode 100644 index dc33a7f08eb..00000000000 --- a/Resources/Prototypes/ADT/Catalog/RadioChannels/LawyerChannel.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: radioChannel - id: ADTLawyerChannel - name: Юридический - keycode: 'ю' - frequency: 1305 - color: "#c6d2f5" - longRange: true diff --git a/Resources/Prototypes/ADT/Catalog/RadioChannels/MercChannel.yml b/Resources/Prototypes/ADT/Catalog/RadioChannels/MercChannel.yml deleted file mode 100644 index 323cc95b19c..00000000000 --- a/Resources/Prototypes/ADT/Catalog/RadioChannels/MercChannel.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: radioChannel - id: ADTMercChannel - name: Наёмнический - keycode: 'ч' - frequency: 1306 - color: "#ff144b" - longRange: true diff --git a/Resources/Prototypes/ADT/Catalog/RadioChannels/SpecChannel.yml b/Resources/Prototypes/ADT/Catalog/RadioChannels/SpecChannel.yml deleted file mode 100644 index cfc16e91ae6..00000000000 --- a/Resources/Prototypes/ADT/Catalog/RadioChannels/SpecChannel.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: radioChannel - id: ADTSpecChannel - name: Спецназовский - keycode: 'е' - frequency: 1307 - color: "#00fa9a" - longRange: true - -- type: radioChannel - id: ADTUSSPChannel - name: СССП - keycode: 'я' - frequency: 1304 - color: "#7ecc8e" - longRange: true - -- type: radioChannel - id: ADTTransSolar19482Channel - name: ТСФ 1948.2 - keycode: '2' - frequency: 1947 - color: "#75c1ff" - longRange: true - -- type: radioChannel - id: ADTTransSolar19487Channel - name: ТСФ 1948.7 - keycode: '7' - frequency: 1948 - color: "#75c1ff" - longRange: true - -- type: radioChannel - id: ADTTransSolar19489Channel - name: ТСФ 1948.9 - keycode: '9' - frequency: 1949 - color: "#75c1ff" - longRange: true diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index 9408299ee8c..6d281a0cbcf 100644 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -109,3 +109,17 @@ 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 + diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/name_dataset.yml b/Resources/Prototypes/ADT/Datasets/Names/securitycybrog.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/name_dataset.yml rename to Resources/Prototypes/ADT/Datasets/Names/securitycybrog.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 20ce61b1eb0..99b1031c12c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -81,91 +81,6 @@ - type: Sprite sprite: ADT/Clothing/Back/heart_backpack.rsi -#рюкзак следователя - -- type: entity - #noSpawn: true - parent: ClothingBackpackSecurity - id: ADTClothingBackpackInvestigatorFilled - components: - #- type: Storage - # maxItemSize: Huge - # maxTotalWeight: 0 - # maxSlots: 50 #By this ignore maxTotalWeight - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: Pen - amount: 2 - #- id: PaperOffice - # amount: 20 - - id: ADTInvestigatorBoxFolderBase - amount: 1 - - id: ADTInvestigatorBoxFolderRed - amount: 2 - - id: ADTInvestigatorBoxFolderBlue - amount: 1 - - id: ADTBookInvestigator - - id: ADTRubberStampinvestigator - - id: SpaceCash500 - -- type: entity - #noSpawn: true - parent: ClothingBackpackDuffelSecurity - id: ADTClothingBackpackDuffelInvestigatorFilled - components: - #- type: Storage - # maxItemSize: Huge - # maxTotalWeight: 0 - # maxSlots: 50 #By this ignore maxTotalWeight - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: Pen - amount: 2 - #- id: PaperOffice - # amount: 20 - - id: ADTInvestigatorBoxFolderBase - amount: 1 - - id: ADTInvestigatorBoxFolderRed - amount: 2 - - id: ADTInvestigatorBoxFolderBlue - amount: 1 - - id: ADTBookInvestigator - - id: ADTRubberStampinvestigator - - id: SpaceCash500 - -- type: entity - #noSpawn: true - parent: ClothingBackpackSatchelSecurity - id: ADTClothingBackpackSatchelInvestigatorFilled - components: - #- type: Storage - # maxItemSize: Huge - # maxTotalWeight: 0 - # maxSlots: 50 #By this ignore maxTotalWeight - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: Pen - amount: 2 - #- id: PaperOffice - # amount: 20 - #- id: MaterialCardboard1 - # amount: 2 - - id: ADTInvestigatorBoxFolderBase - amount: 1 - - id: ADTInvestigatorBoxFolderRed - amount: 2 - - id: ADTInvestigatorBoxFolderBlue - amount: 1 - - id: ADTBookInvestigator - - id: ADTRubberStampinvestigator - - id: SpaceCash500 - # Приколы Патологоанатома - type: entity parent: ClothingBackpackMedical @@ -188,42 +103,6 @@ - type: Sprite sprite: ADT/Clothing/Back/pathologist_duffel.rsi -- type: entity - noSpawn: true - parent: ADTClothingBackpackPathologist - id: ADTClothingBackpackPathologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: BodyBag_Folded - - id: ADTFootTag - - id: SpaceCash500 - -- type: entity - noSpawn: true - parent: ADTClothingBackpackSatchelPathologist - id: ADTClothingBackpackSatchelPathologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: BodyBag_Folded - - id: ADTFootTag - - id: SpaceCash500 - -- type: entity - noSpawn: true - parent: ADTClothingBackpackDuffelPathologist - id: ADTClothingBackpackDuffelPathologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: BodyBag_Folded - - id: ADTFootTag - - id: SpaceCash500 - # медицинские штучки-брючки - type: entity parent: ClothingBackpack @@ -262,21 +141,7 @@ - type: Sprite sprite: ADT/Clothing/Back/leatherlady_satchel.rsi -- type: entity - parent: ClothingBackpackSatchelSecurity - id: ADTClothingBackpackSatchelLapkee - name: lapkee satchel - description: lapkee satchel - suffix: Personal, Lapkee - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: MagazinePistol - - id: ADTSpaceLaw - - type: Sprite - sprite: ADT/Clothing/Back/lapkee_satchel.rsi + - type: entity parent: ClothingBackpack @@ -350,168 +215,30 @@ maxItemSize: Huge - type: entity - parent: ClothingBackpackERTSecurity - id: ClothingBackpackADTBlueShieldOfficerFilled - components: - - type: Storage - maxItemSize: Huge - grid: - - 0,0,9,5 - - type: StorageFill - contents: - - id: Zipties - amount: 3 - - id: ADTPowerCellLasgunRevolver - amount: 2 - - id: WeaponDisabler - - id: Stunbaton - - id: BoxSurvivalSecurity - - id: BlueShieldsuit - - id: SpaceCash1000 - - id: OxygenTankFilled - - type: Sprite - sprite: ADT/Clothing/Back/blueshield_backpack.rsi - -#СССП штуки -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR40L - id: ADTClothingBackpackOR40L_OBS5Gear - components: - - type: StorageFill - contents: - - id: ADTWeaponRifleAK55 - - id: MedkitCombatFilled - - id: OxygenTankFilled - - id: Zipties - amount: 2 - - id: ADTMagazineUSSPAK74 - amount: 4 - - id: MagazineBoxRifleRubber - -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR80L - id: ADTClothingBackpackOR80L_OBS7Gear - components: - - type: StorageFill - contents: - - id: ADTWeaponSMGBizon - - id: MedkitCombatFilled - - id: JawsOfLife - - id: CombatMedipen - - id: DoubleEmergencyOxygenTankFilled - - id: Zipties - amount: 2 - - id: ADTMagazineBizon - amount: 4 - - id: MagazineBoxPistolRubber - -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR40L - id: ADTClothingBackpackOR40L_PilotGear - components: - - type: StorageFill - contents: - - id: MedkitCombatFilled - - id: JawsOfLife - - id: CombatMedipen - - id: DoubleEmergencyOxygenTankFilled - - id: ADTMagazineSR2M - amount: 3 - - id: MagazineBoxPistolRubber - -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR80L - id: ADTClothingBackpackOR80L_SpetsnazGear - components: - - type: StorageFill - contents: - - id: ADTWeaponSMGSR3M - - id: MedkitCombatFilled - - id: JawsOfLife - - id: CombatMedipen - amount: 3 - - id: OmnizineChemistryBottle - amount: 2 - - id: EphedrineChemistryBottle - amount: 2 - - id: ADTCombatHypo - - id: DoubleEmergencyOxygenTankFilled - - id: Zipties - amount: 3 - - id: ADTMagazineSR3M - amount: 4 - - id: MagazineBoxLightRifleRubber - -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR80L - id: ADTClothingBackpackOR80L_SpetsnazLMGGear + parent: ClothingBackpackSatchel + id: ADTClothingBackpackKivchikSatchel + suffix: Kivchik + name: satchel of retribution + description: A beautiful black bag with a gold clasp and red stripes. components: - - type: StorageFill - contents: - - id: ADTWeaponLightMachineGunPKP60 - - id: MedkitCombatFilled - - id: JawsOfLife - - id: CombatMedipen - amount: 2 - - id: OmnizineChemistryBottle - amount: 2 - - id: EphedrineChemistryBottle - amount: 2 - - id: ADTCombatHypo - - id: DoubleEmergencyOxygenTankFilled - - id: Zipties - amount: 3 - - id: ADTMagazineUSSPLMG - amount: 2 - - -- type: entity - noSpawn: true - parent: ADTClothingBackpackOR40L - id: ADTClothingBackpackOR40L_MedicGear - components: - - type: StorageFill - contents: - - id: ADTWeaponPistolPMM - - id: MedkitCombatFilled - amount: 2 - - id: MedkitAdvancedFilled - - id: OxygenTankFilled - - id: ADTMagazinePistolPMM - amount: 2 - - id: SyndiHypo - - id: OmnizineChemistryBottle - amount: 4 + - type: Sprite + sprite: ADT/Clothing/Back/kivchikset_satchel.rsi -# Не совсем уверен что это,но пока это полежит тут - type: entity - id: ADTWardrobeKBSFilled - parent: WardrobeSecurity - name: USSP Wardrobe - description: "Cross the thin red line." - suffix: USSP + id: ADTRadioHandheldTSFBackpack + name: TSF backpack radio + description: A handy bacpack radio + parent: ADTRadioHandheldTSF components: - - type: StorageFill - contents: - - id: ADTClothingRPSUSSP - - id: ADTClothingBackpackOR40L - - id: ADTClothingOuterHardsuitOBS5USSP - - id: MedkitCombatFilled - - id: ADTClothingMaskGasUSSP - - id: OxygenTankFilled - - id: NitrogenTankFilled - - id: ADTWeaponRifleAK55 - prob: 0.5 - orGroup: USSPInfantryWeapon - - id: ADTWeaponLightMachineGunPRK - prob: 0.25 - orGroup: USSPInfantryWeapon - - id: ADTWeaponSMGBizon - prob: 0.25 - orGroup: USSPInfantryWeapon - + - type: Clothing + sprite: ADT/Objects/Device/tsf_radio_backpack.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Item + size: Ginormous + - type: Sprite + sprite: ADT/Objects/Device/tsf_radio_backpack.rsi + layers: + - state: icon \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml index b3b95f69534..48b7b57bab9 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffels.yml @@ -36,4 +36,4 @@ description: A large duffel bag to hold paramedical equipment components: - type: Sprite - sprite: ADT/Clothing/Back/paramedic_duffel.rsi + sprite: ADT/Clothing/Back/paramedic_duffel.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml index 01574494026..38dff057584 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchels.yml @@ -9,20 +9,6 @@ - type: Storage maxItemSize: Huge -- type: entity - parent: ADTClothingBackpackSatchelninja - id: ADTClothingBackpackSatchelninjaTools - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Crowbar - - id: Wrench - - id: Screwdriver - - id: Wirecutter - - id: Welder - - id: Multitool - - type: entity parent: ClothingBackpackSatchel id: ADTClothingBackpackSatchelMedical @@ -40,30 +26,3 @@ components: - type: Sprite sprite: ADT/Clothing/Back/paramedic_satchel.rsi - -- type: entity - parent: ClothingBackpackMilitarySatchel - id: ADTClothingBackpackMilitarySatchelFleetPilot - name: paramedical satchel - description: A satchel to store some paramedical equipment. - components: - - type: StorageFill - contents: - - id: SpaceMedipen - amount: 2 - - id: OxygenTankFilled - - id: BoxSurvivalSecurity - - id: SheetPlasma - -- type: entity - parent: ClothingBackpackMilitarySatchel - id: ClothingBackpackMilitarySatchelEngineer - name: paramedical satchel - description: A satchel to store some paramedical equipment. - components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: RCD - - id: RCDAmmo - amount: 6 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml index 4facfbb2d2a..3c82bb7f6a4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml @@ -47,93 +47,6 @@ - SupremeSabre - type: Appearance -#ERT -#RPSS -- type: entity - id: ADTClothingBeltMilitaryWebbingRPSSL - parent: ClothingBeltMilitaryWebbing - name: ERT security belt - description: Part of ERT security's gear - components: - - - type: StorageFill - contents: - - id: EmergencyMedipen - amount: 2 - - id: MagazineMagnum - - id: WeaponPistolN1984 - - id: MedicatedSuture - -- type: entity - id: ADTClothingBeltMilitaryWebbingRPSSL_Rev - parent: ClothingBeltMilitaryWebbing - name: ERT security belt - description: Part of ERT security's gear - suffix: Anti-REV - components: - - - type: StorageFill - contents: - - id: EmergencyMedipen # Size 2 - amount: 2 - - id: ADTtelescopicBaton #Size 2 - - id: Stunbaton #Size 2 - - id: Flash #Size 2 - - id: Handcuffs #Size 2 - amount: 3 - -#RPSL -- type: entity - id: ADTClothingBeltMilitaryWebbingRPSL - parent: ClothingBeltMilitaryWebbing - name: ERT Leader belt - description: Part of ERT leader's gear - components: - - type: StorageFill - contents: - - id: EmergencyMedipen - amount: 2 - - id: MagazineMagnum - - id: WeaponPistolN1984 - - id: MedicatedSuture - - id: ADTAdvancedHoloprojectorField - -- type: entity - id: ADTClothingBeltMilitaryWebbingRPSL_Rev - parent: ClothingBeltMilitaryWebbing - name: ERT Leader belt - description: Part of ERT leader's gear - suffix: Anti-REV - components: - - type: StorageFill - contents: - - id: EmergencyMedipen - amount: 2 - - id: ADTtelescopicBaton - - id: Stunbaton - - id: Flash - - id: Handcuffs - amount: 3 - -#RPSM -- type: entity - id: ADTClothingBeltMilitaryWebbingRPSML - parent: ClothingBeltMilitaryWebbing - name: ERT medical belt - description: Part of ERT medical's gear - components: - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: EmergencyMedipen - - id: MedicatedSuture - - id: MedicatedSuture - - id: EpinephrineChemistryBottle - - id: EphedrineChemistryBottle - - id: ADTObjectsSpecificBicaridineChemistryBottle - - id: ADTObjectsSpecificDexalinPlusChemistryBottle - - id: RegenerativeMesh - #Pyotr - type: entity @@ -170,18 +83,6 @@ - ADTPyotrSabre - type: Appearance -#кобура следователя СБ - -- type: entity - id: ADTClothingBeltInvestigatorHolster - parent: ClothingBeltHolster - suffix: Filled - components: - - type: StorageFill - contents: - - id: WeaponPistolMk58Nonlethal - - id: MagazinePistol - - type: entity parent: ClothingBeltStorageBase id: ADTClothingBeltMedicalBag @@ -254,23 +155,6 @@ sprite: ADT/Clothing/Belt/leather_suspenders.rsi #спрайты от prazat911 quickEquip: true -#кобура аудитора СБ - -- type: entity - id: ADTClothingBeltSecAuditorHolster - parent: ClothingBeltHolster - suffix: Filled - components: - - type: StorageFill - contents: - - id: ADTWeaponPistolPMM - - id: ADTMagazinePistolPMM - - type: Sprite - sprite: ADT/Clothing/Belt/sec_auditor_holster.rsi - - type: Clothing - sprite: ADT/Clothing/Belt/sec_auditor_holster.rsi - quickEquip: true - #офицерский ремень с кобурой - type: entity @@ -445,24 +329,3 @@ sprite: ADT/Clothing/Belt/criminalist_webbing.rsi #Space Battles - -- type: entity - parent: ClothingBeltStorageBase - id: ADTClothingBeltAssault - name: assault belt - description: A tactical assault belt. - components: - - type: Sprite - sprite: Clothing/Belt/assault.rsi - - type: Clothing - sprite: Clothing/Belt/assault.rsi - - type: Appearance - - type: StorageFill - contents: - - id: Crowbar - - id: Wrench - - id: Screwdriver - - id: Wirecutter - - id: Welder - - id: Multitool - - id: GasAnalyzer diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml index b4237771ca8..4856af87585 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Ears/headsets.yml @@ -25,3 +25,134 @@ - EncryptionKeyCentCom - type: Sprite sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetLawyer + name: lawyer headset + description: A headset for lawyer. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyLawyer + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/servicesecurity.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetTrader + name: trader headset + description: A headset used by trader. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyTrader + - EncryptionKeyCommon + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/trader.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/trader.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetMerc + name: Merc headset + description: A headset for mercenary. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyMerc + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetSpec + name: Special forces headset + description: A headset for special forces. + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeySpec + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetUSSP + name: USSP forces headset + description: A headset for USSP forces. + suffix: USSP + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyUSSP + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetUSSPSpetznaz + name: USSP special forces headset + description: A headset for USSP special forces. + suffix: USSP + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyUSSP + - ADTEncryptionKeySpec + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + +- type: entity + parent: ClothingHeadset + id: ADTClothingHeadsetTSF + name: TSF forces headset + description: A headset for TSF forces. + suffix: TSF + components: + - type: ContainerFill + containers: + key_slots: + - ADTEncryptionKeyTSF + - type: Sprite + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: Clothing + sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi + - type: RadioSpeaker + channels: + - ADTTransSolar19482Channel + - ADTTransSolar19487Channel + - ADTTransSolar19489Channel + +- type: entity + parent: ClothingHeadset + id: ADTWiretappingClothingHeadset + name: cargo headset + description: A headset used by supply employees. + components: + - type: ContainerFill + containers: + key_slots: + - ADTWiretappingEncryptionKey + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + state: icon_alt + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/SupremeCommanderGlass.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/SupremeCommanderGlass.yml deleted file mode 100644 index 1a49402ebfe..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/SupremeCommanderGlass.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: ClothingEyesBase - id: ADTClothingEyesSupremeCommanderGlass - name: supreme comannder's ultra giga man glasses - description: The probability of completing the mission was a zero percent. But it seems now the calculations have lost all meaning. - components: - - type: Sprite - sprite: ADT/Clothing/Eyes/Glasses/supreme-commander-glasses.rsi - state: icon - - type: Clothing - sprite: ADT/Clothing/Eyes/Glasses/supreme-commander-glasses.rsi - - type: MeleeWeapon - damage: - types: - Blunt: 10 - - type: PointLight - color: cyan diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index c6f77aad137..6a937a61348 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -7,4 +7,48 @@ - type: Sprite sprite: ADT/Clothing/Eyes/Glasses/pink_glasses.rsi - type: Clothing - sprite: ADT/Clothing/Eyes/Glasses/pink_glasses.rsi #спрайты от dion_clawed \ No newline at end of file + sprite: ADT/Clothing/Eyes/Glasses/pink_glasses.rsi #спрайты от dion_clawed + +- type: entity + parent: ClothingEyesBase + id: ADTClothingEyesSupremeCommanderGlass + name: supreme comannder's ultra giga man glasses + description: The probability of completing the mission was a zero percent. But it seems now the calculations have lost all meaning. + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/supreme-commander-glasses.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/supreme-commander-glasses.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: PointLight + color: cyan + +- type: entity + parent: ClothingEyesBase + id: ADTNeonTacticalGlasses + name: neon tactical glasses + description: Ordinary tactical glasses made of acid-green polycarbonate. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi + +- type: entity + parent: ClothingEyesBase + id: ADTServantOfEvilGlasses + name: welding glasses + description: welding glasses + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/halloween.yml deleted file mode 100644 index 1158c5c894e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/halloween.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - parent: ClothingEyesBase - id: ADTNeonTacticalGlasses - name: neon tactical glasses - description: Ordinary tactical glasses made of acid-green polycarbonate. - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi - state: icon - - type: Clothing - sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi - -- type: entity - parent: ClothingEyesBase - id: ADTServantOfEvilGlasses - name: welding glasses - description: welding glasses - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi - state: icon - - type: Clothing - sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/eyepatch_tretyakova.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/misc.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/Eyes/eyepatch_tretyakova.yml rename to Resources/Prototypes/ADT/Entities/Clothing/Eyes/misc.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml b/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml deleted file mode 100644 index 5080095b85e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/FriskisSet/raven.yml +++ /dev/null @@ -1,106 +0,0 @@ -- type: entity - parent: ClothingMaskGasSecurity - id: ADTClothingMaskGasDarkRavenFriskis - suffix: Only Friskis - name: raven gas mask - description: raven gas mask - components: - - type: Sprite - sprite: ADT/Clothing/Mask/raven.rsi - - type: Clothing - sprite: ADT/Clothing/Mask/raven.rsi - clothingVisuals: - mask: - - state: equipped-MASK - - state: equipped-MASK-unshaded - shader: unshaded - - type: BreathMask - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsRavenHatFriskis - suffix: Only Friskis - name: Security raven hat - description: No English - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/raven_hat.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/raven_hat.rsi - clothingVisuals: - head: - - state: equipped-HELMET - - state: equipped-HELMET-unshaded - shader: unshaded - -- type: entity - parent: ClothingHandsGlovesCombat - id: ADTClothingHandsGlovesRavenFriskis - suffix: Only Friskis - name: Raven gloves - description: No English - components: - - type: Sprite - sprite: ADT/Clothing/Hands/Gloves/raven_groves.rsi - - type: Clothing - sprite: ADT/Clothing/Hands/Gloves/raven_groves.rsi - clothingVisuals: - gloves: - - state: equipped-HAND - - state: equipped-HAND-unshaded - shader: unshaded - -- type: entity - parent: ClothingShoesBootsCombat - id: ADTClothingShoesBootsRavenFriskis - suffix: Only Friskis - name: raven boots - description: No English - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/raven_shoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/raven_shoes.rsi - clothingVisuals: - shoes: - - state: equipped-FEET - - state: equipped-FEET-unshaded - shader: unshaded - - type: NoSlip - -- type: entity - parent: ClothingUniformJumpsuitSec - id: ADTClothingUniformJumpsuitRavenFriskis - suffix: Only Friskis - name: security raven jumpsuit - description: A jumpsuit made of strong material, providing robust protection. - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/raven_suit.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/raven_suit.rsi - clothingVisuals: - jumpsuit: - - state: equipped-INNERCLOTHING - - state: equipped-INNERCLOTHING-unshaded - shader: unshaded - -- type: entity - parent: ClothingOuterCoatSecurityOvercoat - id: ADTClothingOuterCoatRavenOvercoatFriskis - suffix: Only Friskis - name: security raven overcoat - description: Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/raven_overcoat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/raven_overcoat.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - - state: equipped-OUTERCLOTHING-unshaded - shader: unshaded diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/SupremeCommanderGloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/SupremeCommanderGloves.yml deleted file mode 100644 index cc17131df5d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/SupremeCommanderGloves.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - parent: ClothingHandsBase - id: ADTClothingHandsSupremeCommanderGloves - name: supreme commander's gloves - description: These gloves decorated bluespace sewing cost as much as 10 similar station. These gloves are one of a kind. - components: - - type: Sprite - sprite: ADT/Clothing/Hands/Gloves/supreme-commander-gloves.rsi - - type: Clothing - sprite: ADT/Clothing/Hands/Gloves/supreme-commander-gloves.rsi - - type: Fiber - fiberMaterial: fibers-nanomachines - - type: FingerprintMask diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml deleted file mode 100644 index b574dd48d62..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - parent: ClothingHandsBase - id: ADTClothingHandsRingUrog - name: wedding ring of Urog-Djah - description: the ring is engraved with "Yuna" - components: - - type: Sprite - sprite: ADT/Clothing/Hands/ring_urog.rsi - - type: Clothing - sprite: ADT/Clothing/Hands/ring_urog.rsi - - type: Item - size: Tiny - - type: StaticPrice - price: 1000 - -- type: entity - parent: ClothingHandsBase - id: ADTClothingHandsRingYuna - name: wedding ring of Yuna-Djah - description: the ring is engraved with "Urog" - components: - - type: Sprite - sprite: ADT/Clothing/Hands/ring_yuna.rsi - - type: Clothing - sprite: ADT/Clothing/Hands/ring_yuna.rsi - - type: Item - size: Tiny - - type: StaticPrice - price: 1000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml index d9ac4afd255..ceaab1666a5 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -404,3 +404,79 @@ size: Tiny - type: StaticPrice price: 1000 + + +- type: entity + parent: ClothingHandsGlovesCombat + id: ADTClothingHandsGlovesRavenFriskis + suffix: Only Friskis + name: Raven gloves + description: No English + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/raven_groves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/raven_groves.rsi + clothingVisuals: + gloves: + - state: equipped-HAND + - state: equipped-HAND-unshaded + shader: unshaded + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsSupremeCommanderGloves + name: supreme commander's gloves + description: These gloves decorated bluespace sewing cost as much as 10 similar station. These gloves are one of a kind. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/supreme-commander-gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/supreme-commander-gloves.rsi + - type: Fiber + fiberMaterial: fibers-nanomachines + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsRingUrog + name: wedding ring of Urog-Djah + description: the ring is engraved with "Yuna" + components: + - type: Sprite + sprite: ADT/Clothing/Hands/ring_urog.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/ring_urog.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsRingYuna + name: wedding ring of Yuna-Djah + description: the ring is engraved with "Urog" + components: + - type: Sprite + sprite: ADT/Clothing/Hands/ring_yuna.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/ring_yuna.rsi + - type: Item + size: Tiny + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsKivchikGloves + suffix: Kivchik + name: black gloves of retribution + description: 'Beautiful black gloves with a gold stripe and red inscription: "ALMD"' + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi + - type: Fiber + fiberColor: fibers-black \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml deleted file mode 100644 index 547d1af2c5e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/JayBeret.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBeretJay - name: jay's beret - description: The best beret in the world. - components: - - type: Sprite - sprite: ADT/KD/jayberet.rsi - - type: Clothing - sprite: ADT/KD/jayberet.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/MogesNanoScale.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/MogesNanoScale.yml deleted file mode 100644 index 2f3d4e8dd36..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/MogesNanoScale.yml +++ /dev/null @@ -1,43 +0,0 @@ -#nano scale -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingClothingHeadHelmetHardsuitNanoScale - noSpawn: true - name: Nano scale armor helmet - description: Reptiles are not as primitive as you thought. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_hardsuithead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_hardsuithead.rsi - - type: PointLight - color: red - - type: PressureProtection - highPressureMultiplier: 0.08 - lowPressureMultiplier: 1000 - - type: TemperatureProtection - coefficient: 0.005 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.2 - Radiation: 0.5 - -#nano scale chameleon -- type: entity - parent: ClothingHeadEVAHelmetBase - id: ADTClothingClothingHeadHelmetNanoScaleChameleon - name: Nano scale chameleon helmet - description: Very secretive and smells very sugary - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_chameleon_head.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_chameleon_head.rsi - - type: Tag - tags: - - HidesHair - - type: IdentityBlocker diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/blueshield_beret.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/blueshield_beret.yml deleted file mode 100644 index f15bb42e4d0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/blueshield_beret.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBeretBlueshield - name: blueshield officer's beret - description: A corporate blue beret with a blueshield officer's rank emblem. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml deleted file mode 100644 index 41453475718..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTRobotEars - name: Robot ears - description: Edited by one businessman. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/robot_ears.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/robot_ears.rsi - - type: DamageOtherOnHit - damage: - types: - Piercing: 15 - - type: Item - size: Normal diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/flower_crown_blue.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/flower_crown_blue.yml deleted file mode 100644 index 3b2e1dfc373..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/flower_crown_blue.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTFlowerCrownBlue - name: flower wreath - description: A neat wreath of luxurious flowers in turquoise, blue and blue shades, exuding a pleasant, soothing fragrance. It perfectly complements the elegant hair of a similar color. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/flower_crown_blue.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/flower_crown_blue.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml deleted file mode 100644 index b432548204d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/halloween.yml +++ /dev/null @@ -1,81 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadVyasovHat - name: shabby fedora - description: It looks very shabby brown in color, it smells like a nightmare straight from Vyazova Street - suffix: Halloween - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Halloween/vyazovhat.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Halloween/vyazovhat.rsi - -- type: entity - parent: ADTClothingHeadUSSPjuggernautHelmetArmored - id: ADTClothingHeadKillaHelmet - name: Killa helmet - description: Killa helmet - suffix: Halloween - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi - - type: Armor - modifiers: - coefficients: - Piercing: 0.95 - Heat: 0.95 - - type: ExplosionResistance - damageCoefficient: 0.95 - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadSquidGame - name: squid game head - description: squid game head - suffix: Halloween - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Halloween/squidgame.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Halloween/squidgame.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadXenomorph - name: Xenomorph head - description: Xenomorph head - suffix: Halloween - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Halloween/xeno_head.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Halloween/xeno_head.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadZombie - name: zombie head - description: zombie head - suffix: Halloween - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ilisuim.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ilisuim.yml deleted file mode 100644 index 4208b8a3aea..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ilisuim.yml +++ /dev/null @@ -1,115 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHuraskaIlisium - name: Huraska - description: Ilisium - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/hurashka.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/hurashka.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHelmetSolderIlisium - name: Helmet - description: Ilisium - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/helmetSolder.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/helmetSolder.rsi - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetIlisium - noSpawn: true - name: helmet - description: Ilisium - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/helmet.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/helmet.rsi - - type: PointLight - color: red - - type: PressureProtection - highPressureMultiplier: 0.08 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.65 - Heat: 0.80 - Radiation: 0.95 - -- type: entity - parent: ClothingMaskGas - id: ADTClothingMaskGasIlisium - name: gas mask - description: A close-fitting tactical mask that can be connected to an air supply. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitIlisium - name: hardsuit ilisium - description: hardsuit ilisium - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.65 - Slash: 0.65 - Heat: 0.35 - Radiation: 0.85 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetIlisium - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatIlisium - name: Raincoat Ilisium - description: Ilisium - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/plash_ili.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/plash_ili.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.75 - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformIlisium - name: Suit Ilisiom - description: Suit Ilisiom - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml deleted file mode 100644 index d62f1f80c68..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBlackOrientalEars - name: oriental ears - description: "NYAH!" - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/orientalears.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/orientalears.rsi - - type: AddAccentClothing - accent: NyaAccent - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatOktyabrinaOrientalEars - name: gift for October - description: "On the inside is scrawled 'For the one whose hair is the color of lilac'. This smells like a joy and happy" - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/orientalears.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/orientalears.rsi - - -- type: loadout - id: OktyabrinaLoadout - entity: ADTClothingHeadHatOktyabrinaOrientalEars - sponsorOnly: true - - - diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/pink_hat.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/pink_hat.yml deleted file mode 100644 index 0cec7e6e3d9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/pink_hat.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadPinkHat - name: pink hat - description: where my martini shot? - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/pink_hat.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/pink_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml deleted file mode 100644 index e2ead49e74b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsBlackVeil - name: Black veil - description: Gothic, nice. For those who destroy traditions but not much - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/black_veil.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/black_veil.rsi - - type: DamageOtherOnHit - damage: - types: - Piercing: 15 - - type: Item - size: Tiny - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsWhiteVeil - name: White veil - description: For those who follow tradition - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/white_veil.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/white_veil.rsi - - type: DamageOtherOnHit - damage: - types: - Piercing: 15 - - type: Item - size: Small diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/wedding_hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/wedding_hats.yml deleted file mode 100644 index c45e598dbce..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/wedding_hats.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatWeddingPriestHat - name: Priest hat - description: "to do" - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/priest_weddind_hat.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/priest_weddind_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml deleted file mode 100644 index 6091ab1fa38..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTZepelli - name: zepelli hat - description: Edited by one businessman. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/zepelli.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/zepelli.rsi - - type: DamageOtherOnHit - damage: - types: - Piercing: 15 - - type: Item - size: Huge diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml index f3c0ff22cca..218fa6443ec 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml @@ -234,13 +234,477 @@ - type: ExplosionResistance damageCoefficient: 0.7 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetIlisium + noSpawn: true + name: helmet + description: Ilisium + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/helmet.rsi + - type: PointLight + color: red + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.65 + Heat: 0.80 + Radiation: 0.95 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadSecurityModern + name: security hardsuit helmet + description: Armored hardsuit helmet for security needs. + components: + - type: BreathMask + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern.rsi + #sprite: ADT/Clothing/Head/Hardsuits/hos_hardsuithead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern.rsi + #sprite: ADT/Clothing/Head/Hardsuits/hos_hardsuithead.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 - # - type: LightBulb - # color: "#0000FF" - # lightEnergy: 6 - # lightRadius: 15 - # lightSoftness: 0.9 - # BurningTemperature: 1000 - # PowerUse: 12 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadSecurityModernBlue + name: security hardsuit helmet + description: Armored hardsuit helmet for security needs. + components: + - type: BreathMask + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_b.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_b.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadSecurityModernGreen + name: security hardsuit helmet + description: Armored hardsuit helmet for security needs. + components: + - type: BreathMask + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_g.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_g.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadSecurityModernPurple + name: security hardsuit helmet + description: Armored hardsuit helmet for security needs. + components: + - type: BreathMask + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_p.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_p.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +#nano scale +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingClothingHeadHelmetHardsuitNanoScale + noSpawn: true + name: Nano scale armor helmet + description: Reptiles are not as primitive as you thought. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_hardsuithead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_hardsuithead.rsi + - type: PointLight + color: red + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.005 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.2 + Radiation: 0.5 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitOBS7USSP + name: helmet of the USSP OBS-7 Konrad armor suit + description: helmet of the USSP OBS-7 Konrad armor suit + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/OBS7_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/OBS7_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitOBS5USSPP + name: helmet of the USSP OBS-5 Konrad Armor Suit + description: helmet of the USSP OBS-5 Konrad armor suit + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/OBS5_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/OBS5_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitDBS40KUSSPP + name: the armor helmet of the exocosuit + description: An enhanced version of the OBS-7 helmet. What at first glance looks like cutouts for the eyes, in fact, these are external sensors and measuring systems that work like a rangefinder. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/DBS40K_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/DBS40K_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitCamouflageColors + name: the armor helmet of the exocosuit + description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/camouflagecolors_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/camouflagecolors_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitDesertedColors + name: the armor helmet of the exocosuit + description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/deserted_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/deserted_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitTacticalColors + name: the armor helmet of the exocosuit + description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/tactical_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/tactical_USSP.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTClothingHeadHelmetHardsuitMonolithReserch + name: MONOLITh helmet + description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. + components: + - type: BreathMask + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi + - type: PointLight + color: "#d6adff" + - type: PressureProtection + highPressureMultiplier: 0.60 + lowPressureMultiplier: 1000 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTVeteranSecHardsuitHelm + noSpawn: true + name: veteran security hardsuit helmet + description: Safety helmet with the latest top-secret NT-HUD software. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/veteransechardsuithead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/veteransechardsuithead.rsi + - type: PointLight + color: "#ffadad" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase # Corvax-Resprite + id: ADTClothingHeadHelmetHardsuitERTHeavy + noSpawn: true + name: ERT heavy helmet + description: ERT heavy helmet + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/heavyERT.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/heavyERT.rsi + - type: PointLight # Corvax-Resprite + color: blue + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTInquisitoryHead + noSpawn: false + name: inquisitor hardsuit helmet + description: You have been given power over destinies. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi + - type: PointLight + color: white + radius: 7 + energy: 3 + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + +- type: entity + parent: ClothingHeadBase + id: ADTKirasHead + noSpawn: true + name: Kirava Hoodsec + description: The steering wheel is imprinted in the visor of this helmet. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/kirava_hoodsec.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/kirava_hoodsec.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTSpaceMarinneHead + noSpawn: true + name: berserker hardsuit helmet + description: You have been given power over destinies. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/marinnehead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/marinnehead.rsi + - type: PointLight + color: red + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.7 + Heat: 0.7 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTPilotSuitHelm + noSpawn: true + name: Pilot Suit Helm + description: The steering wheel is imprinted in the visor of this helmet. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelm.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelm.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ADTPilotSuitHelmSEC + noSpawn: true + name: Pilot Suit Helm Security + description: Looks like something that inspires order. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelmsec.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelmsec.rsi + - type: PointLight + color: red + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + + +- type: entity + parent: ClothingHeadHelmetHardsuitSyndieCommander + id: ADTClothingHeadHelmetHardsuitPioneerAgent + noSpawn: true + name: agent "Pioneer" hardsuit helmet + description: agent "Pioneer" hardsuit helmet + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi + - type: PointLight # Corvax-Resprite + color: cyan + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml similarity index 69% rename from Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml rename to Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index a6b2f88d877..cefec509944 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -726,4 +726,341 @@ tags: - ClothMade - HamsterWearable - - WhitelistChameleon \ No newline at end of file + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsRavenHatFriskis + suffix: Only Friskis + name: Security raven hat + description: No English + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/raven_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/raven_hat.rsi + clothingVisuals: + head: + - state: equipped-HELMET + - state: equipped-HELMET-unshaded + shader: unshaded + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretBlueshield + name: blueshield officer's beret + description: A corporate blue beret with a blueshield officer's rank emblem. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHuraskaIlisium + name: Huraska + description: Ilisium + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/hurashka.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/hurashka.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretJay + name: jay's beret + description: The best beret in the world. + components: + - type: Sprite + sprite: ADT/KD/jayberet.rsi + - type: Clothing + sprite: ADT/KD/jayberet.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadPinkHat + name: pink hat + description: where my martini shot? + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/pink_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/pink_hat.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTZepelli + name: zepelli hat + description: Edited by one businessman. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/zepelli.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/zepelli.rsi + - type: DamageOtherOnHit + damage: + types: + Piercing: 15 + - type: Item + size: Huge + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatKivchikBerete + suffix: Kivchik + name: blue beret of retribution + description: A beautiful black beret. He smells like berries. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretParatrooperUSSP + name: paratrooper's beret + description: The famous crimson beret of the USSP Space Marines. This beret is worn only by those who deserve to prove themselves in battle, it is the most honorable award for paratroopers along with a gold medal. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/paratrooper_beret_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/paratrooper_beret_USSP.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretOfTheArmedForcesoftheUSSP + name: beret of the armed forces of the USSP + description: An olive beret with the symbols of the Armed Forces of the USSP. This beret is a very honorable award for military personnel, a sign of professionalism and long service. They are often worn by commanders. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_of_the_armed_forces_of_the_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_of_the_armed_forces_of_the_USSP.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBeretSpecialForcesUSSP + name: beret Special Forces USSP + description: A black beret with the symbols of the security forces of the Ministry of Internal Affairs of the USSP, which is awarded to elite troops and special forces, including special forces + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/beret_Special_Forces_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/beret_Special_Forces_USSP.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsAdmiralUSSPCap + name: the cap of the Admiral of the USSP fleet + description: A terribly clean and well-groomed cap. The obtrusive headdress of admirals in the space Fleet. + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/admiral_USSP_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/admiral_USSP_cap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsCaptainUSSPCap + name: the cap of the captain of the SSS fleet + description: The obtrusive headdress of captains in the space Fleet. + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/captain_USSP_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/captain_USSP_cap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsOfficerUSSPCap + name: the cap of an officer of the USSP Space Fleet + description: An obligatory part of the uniform of a field and staff officer of the Space Fleet of the USSP. The cap has the emblem of the Space Forces of the USSP. + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/officer_USSP_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/officer_USSP_cap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBMF + name: hat bmf + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/bmf.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/bmf.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadMusical + name: hat mus + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/musical.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/musical.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadKVD + name: hat KVD + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/kvdhead.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/kvdhead.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadMVD + name: hat mvd + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/mvd.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/mvd.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadMSH + name: hat msh + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/msh.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/msh.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadSea + name: hat sea + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/sea.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/sea.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadMil + name: hat millitary + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/millitary.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/millitary.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadBorder + name: hat border + description: + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Nine/border.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Nine/border.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBMF + name: UniformBMF + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/bmf.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/bmf.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformMusical + name: Uniform Mus + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/musical.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/musical.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformKVD + name: UniformKVD + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/kvd.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/kvd.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformSea + name: UniformSea + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/sea.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/sea.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformCommon + name: UniformCommon + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/commonnine.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/commonnine.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformMillitary + name: UniformMillitary + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/millitary.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/millitary.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformBorder + name: UniformBorder + description: Pepe + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Nine/border.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Nine/border.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/head_helmet_security_modern.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/head_helmet_security_modern.yml deleted file mode 100644 index 8b5a1033d9b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/head_helmet_security_modern.yml +++ /dev/null @@ -1,97 +0,0 @@ -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadSecurityModern - name: security hardsuit helmet - description: Armored hardsuit helmet for security needs. - components: - - type: BreathMask - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern.rsi - #sprite: ADT/Clothing/Head/Hardsuits/hos_hardsuithead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern.rsi - #sprite: ADT/Clothing/Head/Hardsuits/hos_hardsuithead.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadSecurityModernBlue - name: security hardsuit helmet - description: Armored hardsuit helmet for security needs. - components: - - type: BreathMask - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_b.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_b.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadSecurityModernGreen - name: security hardsuit helmet - description: Armored hardsuit helmet for security needs. - components: - - type: BreathMask - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_g.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_g.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadSecurityModernPurple - name: security hardsuit helmet - description: Armored hardsuit helmet for security needs. - components: - - type: BreathMask - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_p.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/head_helmet_security_modern_p.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.525 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml new file mode 100644 index 00000000000..ddb98905045 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml @@ -0,0 +1,46 @@ +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHelmetSolderIlisium + name: Helmet + description: Ilisium + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/helmetSolder.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/helmetSolder.rsi + +- type: entity + parent: ClothingHeadEVAHelmetBase + id: ADTClothingHeadHelmetHardsuitSL5USSPP + name: the helmet of the Pilot's Spacesuit Model 5 + description: A protective helmet to protect the head from the external environment of space, this helmet is equipped with an air supply system through a balloon, so that you can breathe without wearing masks. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/SL5_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/SL5_USSP.rsi + +#head hat armored +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadUSSPjuggernautHelmetArmored + name: USSP Armored jugger hard helmet + description: An armored hard hat. Provides the best of both worlds in both protection & utility - perfect for the engineer on the frontlines. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Armor #Copied from the sec helmet, as it's hard to give these sane values without locational damage existing. + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.70 + - type: GroupExamine \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml index f4dab425e4e..6435ac48e6e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/misc.yml @@ -73,3 +73,174 @@ sprite: ADT/Clothing/Head/Misc/ded_morozhat.rsi - type: Clothing sprite: ADT/Clothing/Head/Misc/ded_morozhat.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTFlowerCrownBlue + name: flower wreath + description: A neat wreath of luxurious flowers in turquoise, blue and blue shades, exuding a pleasant, soothing fragrance. It perfectly complements the elegant hair of a similar color. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/flower_crown_blue.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/flower_crown_blue.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadVyasovHat + name: shabby fedora + description: It looks very shabby brown in color, it smells like a nightmare straight from Vyazova Street + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Halloween/vyazovhat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Halloween/vyazovhat.rsi + +- type: entity + parent: ADTClothingHeadUSSPjuggernautHelmetArmored + id: ADTClothingHeadKillaHelmet + name: Killa helmet + description: Killa helmet + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Halloween/killahelmet.rsi + - type: Armor + modifiers: + coefficients: + Piercing: 0.95 + Heat: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.95 + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadSquidGame + name: squid game head + description: squid game head + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Halloween/squidgame.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Halloween/squidgame.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadXenomorph + name: Xenomorph head + description: Xenomorph head + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Halloween/xeno_head.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Halloween/xeno_head.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadZombie + name: zombie head + description: zombie head + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/Halloween/zombie_head.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatBlackOrientalEars + name: oriental ears + description: "NYAH!" + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/orientalears.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/orientalears.rsi + - type: AddAccentClothing + accent: NyaAccent + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatOktyabrinaOrientalEars + name: gift for October + description: "On the inside is scrawled 'For the one whose hair is the color of lilac'. This smells like a joy and happy" + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/orientalears.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/orientalears.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBlackVeil + name: Black veil + description: Gothic, nice. For those who destroy traditions but not much + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/black_veil.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/black_veil.rsi + - type: DamageOtherOnHit + damage: + types: + Piercing: 15 + - type: Item + size: Tiny + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsWhiteVeil + name: White veil + description: For those who follow tradition + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/white_veil.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/white_veil.rsi + - type: DamageOtherOnHit + damage: + types: + Piercing: 15 + - type: Item + size: Small + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatWeddingPriestHat + name: Priest hat + description: "to do" + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/priest_weddind_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/priest_weddind_hat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/specific.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/specific.yml new file mode 100644 index 00000000000..51038798e1a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/specific.yml @@ -0,0 +1,32 @@ +- type: entity + parent: ClothingHeadBase + id: ADTRobotEars + name: Robot ears + description: Edited by one businessman. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/robot_ears.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/robot_ears.rsi + - type: DamageOtherOnHit + damage: + types: + Piercing: 15 + - type: Item + size: Normal + +#nano scale chameleon +- type: entity + parent: ClothingHeadEVAHelmetBase + id: ADTClothingClothingHeadHelmetNanoScaleChameleon + name: Nano scale chameleon helmet + description: Very secretive and smells very sugary + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_chameleon_head.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/nano_scale_armor_chameleon_head.rsi + - type: Tag + tags: + - HidesHair + - type: IdentityBlocker \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/KivchikSet/kivchikset.yml b/Resources/Prototypes/ADT/Entities/Clothing/KivchikSet/kivchikset.yml deleted file mode 100644 index 4da1b577063..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/KivchikSet/kivchikset.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckKivchikCloak - suffix: Kivchik - name: black cloak of retribution - description: A neat black raincoat with golden stripes and clasps. - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi - - type: StealTarget - stealGroup: HeadCloak - -- type: entity - parent: ClothingUniformSkirtBase - id: ADTClothingUniformKivchikJumpskirt - suffix: Kivchik - name: black jumpsuit of retribution - description: Black jumpsuit with golden stripes and red bandage. - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatKivchikBerete - suffix: Kivchik - name: blue beret of retribution - description: A beautiful black beret. He smells like berries. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/kivchikset_beret.rsi - - type: Tag - tags: - - ClothMade - - HamsterWearable - -- type: entity - parent: ClothingHandsBase - id: ADTClothingHandsKivchikGloves - suffix: Kivchik - name: black gloves of retribution - description: 'Beautiful black gloves with a gold stripe and red inscription: "ALMD"' - components: - - type: Sprite - sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi - - type: Clothing - sprite: ADT/Clothing/Hands/Gloves/kivchikset_gloves.rsi - - type: Fiber - fiberColor: fibers-black - -- type: entity - parent: ClothingShoesMilitaryBase - id: ADTClothingShoesKivchikBoots - suffix: Kivchik - name: boots of retribution - description: Black boots with metal inserts. Look reliable. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi - - type: Matchbox - -- type: entity - parent: ClothingBackpackSatchel - id: ADTClothingBackpackKivchikSatchel - suffix: Kivchik - name: satchel of retribution - description: A beautiful black bag with a gold clasp and red stripes. - components: - - type: Sprite - sprite: ADT/Clothing/Back/kivchikset_satchel.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 37226458b86..c062b8892ae 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -229,3 +229,35 @@ tags: - HidesHair - type: ShowSecurityIcons + +- type: entity + parent: ClothingMaskGasSecurity + id: ADTClothingMaskGasDarkRavenFriskis + suffix: Only Friskis + name: raven gas mask + description: raven gas mask + components: + - type: Sprite + sprite: ADT/Clothing/Mask/raven.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/raven.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - state: equipped-MASK-unshaded + shader: unshaded + - type: BreathMask + +- type: entity + parent: ClothingMaskGas + id: ADTClothingMaskGasIlisium + name: gas mask + description: A close-fitting tactical mask that can be connected to an air supply. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/gasmask_ili.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Chokers.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Chokers.yml deleted file mode 100644 index e5a6c89bcad..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Chokers.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: SirenaChokerWithSpike - name: Choker Spike - description: If you turn it back and forth, then it will be a weapon of torture - - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Chokers/choker_with_spike.rsi - -- type: entity - parent: ClothingNeckBase - id: SirenaChokerWithHeart - name: Choker Heart - description: For good crew members - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Chokers/choker_with_heart.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml index 3dd480fc723..ef6386ba8b5 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml @@ -92,3 +92,93 @@ components: - type: Sprite sprite: ADT/Clothing/Neck/Cloaks/lapkeeset_cloack.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckKivchikCloak + suffix: Kivchik + name: black cloak of retribution + description: A neat black raincoat with golden stripes and clasps. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/kivchikset_cloak.rsi + - type: StealTarget + stealGroup: HeadCloak + +- type: entity + parent: ClothingNeckBase + id: ADTVampireCloak + name: vampire cloak + description: vampire cloak + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Halloween/vampire_cloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckKirasCloakn + name: Kiras cloakns + description: cloakn Kiras + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/kiras_cloakns.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.9 + - type: ClothingSpeedModifier + walkModifier: 1.2 + sprintModifier: 1.2 + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckNecklaceWithEmerald + name: Necklace with emerald + description: This stone is so mesmerizing.. it's just like your green eyes + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/necklace_with_emerald.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckNecklaceWithPlasma + name: Necklace with plasma + description: Necklace with plasma is it safe? + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/necklace_with_plasma.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckNecklaceWithSapphire + name: Necklace with sapphire + description: THis necklace is missng rubies + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/necklace_with_sapphire.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckRaincoatForAShortDress + name: Raincoat for a short dress + description: Cloak with gold plating. Blindingly + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/raincoat_for_a_short_dress.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTVergileCloak + name: Vergile cloak + description: Vergile cloak + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/vergile_cloak.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/vergile_cloak.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/KirravaCloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/KirravaCloaks.yml deleted file mode 100644 index 41befcd731e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/KirravaCloaks.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckKirasCloakn - name: Kiras cloakns - description: cloakn Kiras - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/kiras_cloakns.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - Radiation: 0.9 - - type: ClothingSpeedModifier - walkModifier: 1.2 - sprintModifier: 1.2 - -# - type: ClothingSpeedModifier -# walkModifier: 0.7 -# sprintModifier: 0.7 -# - type: ExplosionResistance diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/NecklaceWith.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/NecklaceWith.yml deleted file mode 100644 index f070777d1d5..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/NecklaceWith.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckNecklaceWithEmerald - name: Necklace with emerald - description: This stone is so mesmerizing.. it's just like your green eyes - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/necklace_with_emerald.rsi - -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckNecklaceWithPlasma - name: Necklace with plasma - description: Necklace with plasma is it safe? - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/necklace_with_plasma.rsi - -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckNecklaceWithSapphire - name: Necklace with sapphire - description: THis necklace is missng rubies - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/necklace_with_sapphire.rsi - -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckRaincoatForAShortDress - name: Raincoat for a short dress - description: Cloak with gold plating. Blindingly - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/raincoat_for_a_short_dress.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/halloween.yml deleted file mode 100644 index ff3b99767dc..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/halloween.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClownCollarCaterpillar - name: clown collar-caterpillar - description: A once-extinct attribute of a Buffoon and a Clown - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Halloween/clowncollar.rsi - -- type: entity - parent: ClothingNeckBase - id: ADTVampireCloak - name: vampire cloak - description: vampire cloak - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Halloween/vampire_cloak.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml new file mode 100644 index 00000000000..d094ab9aef4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml @@ -0,0 +1,35 @@ +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckMantiesChaplain + name: MantiesChaplain + description: + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi + +- type: entity + parent: ClothingNeckMantleHOSShoulder + id: ADTClothingNeckMantleHOSShoulderSecurityCyb + name: Mantle cyborg + description: desc + components: + - type: Sprite + sprite: ADT/Clothing/Neck/mantles/cybmantle_shoulder.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/mantles/cybmantle_shoulder.rsi + clothingVisuals: + neck: + - state: equipped-NECK + - state: equipped-NECK-unshaded + shader: unshaded + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckMantleCentComm + name: head of security's shoulder mantle + description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml deleted file mode 100644 index 2388feed595..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties_chaplain.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckMantiesChaplain - name: MantiesChaplain - description: - components: - - type: Sprite - sprite: ADT/Clothing/Neck/Cloaks/manties_chaplain.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml index fc10252a4d0..66d4488b153 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml @@ -9,22 +9,38 @@ - type: Clothing sprite: ADT/Clothing/Neck/gold_chain.rsi #спрайты от prazat911 -#Нагрудная камера + - type: entity parent: ClothingNeckBase - id: ADTClothingNeckSecCam - name: security chest camera - description: security chest camera + id: ADTClownCollarCaterpillar + name: clown collar-caterpillar + description: A once-extinct attribute of a Buffoon and a Clown + suffix: Halloween components: - type: Sprite - sprite: ADT/Clothing/Neck/sec_camera.rsi - - type: Clothing - sprite: ADT/Clothing/Neck/sec_camera.rsi - - type: DeviceNetwork - deviceNetId: Wired - receiveFrequencyId: SurveillanceCameraSecurity - transmitFrequencyId: SurveillanceCamera - - type: SurveillanceCamera - networkSet: true - - type: Eye - - type: WiredNetworkConnection + sprite: ADT/Clothing/Neck/Halloween/clowncollar.rsi + +- type: entity + parent: ClothingNeckBase + id: SirenaChokerWithSpike + name: Choker Spike + description: If you turn it back and forth, then it will be a weapon of torture + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Chokers/choker_with_spike.rsi + +- type: entity + parent: ClothingNeckBase + id: SirenaChokerWithHeart + name: Choker Heart + description: For good crew members + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Chokers/choker_with_heart.rsi + +- type: entity + id: ADTClothingNeckNanoTrasenPinSchrodinger + parent: ClothingNeckNanoTrasenPin + components: + - type: TypingIndicatorClothing + proto: lawyer #lawyer robot alien moth \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml index 0e692c5ed37..a8188723a4f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/scarfs.yml @@ -52,3 +52,15 @@ sprite: ADT/Clothing/Neck/chefpovarfio.rsi - type: Clothing sprite: ADT/Clothing/Neck/chefpovarfio.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckScarfUnrobust + name: unrobust scarf + description: A scarf confirming that its wearer is worthy of the title of the chief unrobust in the galaxy, who has not won a single battle. The scarf is a stigma that its wearer will always be doomed to failure and ridicule from others. However, he will wear it with pride and dignity, ready for the next failure. + components: + - type: Sprite + sprite: ADT/Clothing/Neck/unrobust_scarf.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/unrobust_scarf.rsi + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/armyjeton.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml similarity index 59% rename from Resources/Prototypes/ADT/Entities/Clothing/Neck/armyjeton.yml rename to Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml index ef7276b160d..3a1f1701833 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/armyjeton.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml @@ -39,3 +39,23 @@ components: - type: Sprite sprite: ADT/Clothing/Neck/tsf_patch.rsi + +#Нагрудная камера +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckSecCam + name: security chest camera + description: security chest camera + components: + - type: Sprite + sprite: ADT/Clothing/Neck/sec_camera.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/sec_camera.rsi + - type: DeviceNetwork + deviceNetId: Wired + receiveFrequencyId: SurveillanceCameraSecurity + transmitFrequencyId: SurveillanceCamera + - type: SurveillanceCamera + networkSet: true + - type: Eye + - type: WiredNetworkConnection \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/unrobust_scarf.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/unrobust_scarf.yml deleted file mode 100644 index cf80453f600..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/unrobust_scarf.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckScarfUnrobust - name: unrobust scarf - description: A scarf confirming that its wearer is worthy of the title of the chief unrobust in the galaxy, who has not won a single battle. The scarf is a stigma that its wearer will always be doomed to failure and ridicule from others. However, he will wear it with pride and dignity, ready for the next failure. - components: - - type: Sprite - sprite: ADT/Clothing/Neck/unrobust_scarf.rsi - - type: Clothing - sprite: ADT/Clothing/Neck/unrobust_scarf.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml deleted file mode 100644 index fee26cad25a..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/FunOuterClothing.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterSuitRacoon - name: racoon suit - description: Snort snort snort! - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/racoon.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/racoon.rsi - -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterSuitFox - name: fox suit - description: Snort snort snort! - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi - -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterSuitChefPovar - name: fox suit - description: Snort snort snort! - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi - -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterDedMoroz - suffix: New Year - name: Ded Moroz suit - description: Suit clothing ded moroz - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi - diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml deleted file mode 100644 index f50ace71627..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitCybersunBodyGuard - name: cybersun bodyguard hardsuit - description: An upgraded version of the blood red hardsuit that features enhanced fireproofing, pressure resist, and superior armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersunbodyguard.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersunbodyguard.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.4 - Heat: 0.2 - Radiation: 0.20 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitCybersunBodyGuard - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitCybersunCrysis - name: cybersun supersoldier's hardsuit - description: CyberSun's most advanced, secret security technology. It seems this development is leading to the creation of super soldiers. It smells of plastitan and dishonorable fight - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersun_crysis_hardsuit.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersun_crysis_hardsuit.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 0.55 - sprintModifier: 0.55 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.1 - Slash: 0.1 - Piercing: 0.1 - Heat: 0.1 - Radiation: 0 - - type: ExplosionResistance - damageCoefficient: 0.1 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitCybersunCrysis - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatCyberSun - name: лабораторный халат Киберсан - description: Лабораторный халат Киберсан, предоставляющий минимальную защиту от вредного воздействия - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/labcyber.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/labcyber.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.75 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml deleted file mode 100644 index 5c1a8400a54..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml +++ /dev/null @@ -1,70 +0,0 @@ -# Nano-Scale -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitNanoScale - name: Nano scale armor - description: Reptiles are not as primitive as you thought. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.3 - sprintModifier: 1.3 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.3 - Slash: 0.5 - Piercing: 0.4 - Heat: 0.2 - Radiation: 0.20 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: ToggleableClothing - clothingPrototype: ADTClothingClothingHeadHelmetHardsuitNanoScale - - # Nano-Scale-Chameleon -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterHardsuitNanoScaleChameleon - name: Nano scale armor chameleon - description: Very secretive and smells very sugary - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor_chameleon.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor_chameleon.rsi - - type: PressureProtection - highPressureMultiplier: 0.6 - lowPressureMultiplier: 1000 - - type: TemperatureProtection - coefficient: 0.01 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.6 - - type: PowerCellSlot - cellSlotId: cell_slot - # throwing in a recharger would bypass glove charging mechanic - fitsInCharger: false - - type: ContainerContainer - containers: - cell_slot: !type:ContainerSlot - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - startingItem: PowerCellAntiqueProto - # delay for when attacked while cloaked - - type: UseDelay - delay: 5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/USSP.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/USSP.yml deleted file mode 100644 index dcf1b9b5673..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/USSP.yml +++ /dev/null @@ -1,417 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitOBS7USSP - name: USSP OBS-7 Konrad armor suit - description: OBS-7 "Konrad", stands for, Combined-Arms Armor-Suit Model 7, is a single combined-arms armor suit of the Konrad series, designed to provide high protection and mobility. This armor suit surpasses its predecessor in terms of mobility and protection from laser weapons, although it is significantly inferior in armor protection from small arms and explosions. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS7USSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS7USSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.4 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.45 - Heat: 0.6 - Radiation: 0.8 - Caustic: 0.75 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitOBS7USSP - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitOBS7USSP - name: helmet of the USSP OBS-7 Konrad armor suit - description: helmet of the USSP OBS-7 Konrad armor suit - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/OBS7_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/OBS7_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitOBS5USSP - name: USSP OBS-5 Konrad armor suit - description: OBS-5 "Konrad", also known as the Combined-Arms Armor Suit Model 5, is a morally intimidating model of a single combined-arms armor suit of the Konrad series. This spacesuit was designed with high protection against small arms and explosions in mind. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS5USSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS5USSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.45 - Heat: 0.6 - Radiation: 0.8 - Caustic: 0.75 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitOBS5USSPP - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitOBS5USSPP - name: helmet of the USSP OBS-5 Konrad Armor Suit - description: helmet of the USSP OBS-5 Konrad armor suit - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/OBS5_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/OBS5_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSL5USSP - name: USSP SL-5 "Pilot" spacesuit - description: Pilot's Spacesuit Model 5, a special kit consisting of an outer jumpsuit, shock absorbers and armor plates designed to protect and isolate the pilot of a space shuttle from the external environment of boundless space. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/SL5USSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/SL5USSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.45 - Heat: 0.8 - Radiation: 0.8 - Caustic: 0.8 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.95 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitSL5USSPP - -- type: entity - parent: ClothingHeadEVAHelmetBase - id: ADTClothingHeadHelmetHardsuitSL5USSPP - name: the helmet of the Pilot's Spacesuit Model 5 - description: A protective helmet to protect the head from the external environment of space, this helmet is equipped with an air supply system through a balloon, so that you can breathe without wearing masks. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/SL5_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/SL5_USSP.rsi - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitDBS40KUSSP - name: Power armor of the cosmo-paratrooper SSSP "DBS-40k" - description: An experimental model of a military armored suit, specially designed for the needs of the Space Landing forces of the USSP. This is a weighted and modified version of the OBS-7. During the modifications of the armor suit, the armor plates were replaced with a stronger analog, and additional armor was installed, which made it more massive. However, the protective characteristics have been significantly improved, providing the carrier with high protection from enemy factors in outer space and on the surface of planets. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/DBS40KUSSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/DBS40KUSSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.45 - Heat: 0.6 - Radiation: 0.8 - Caustic: 0.75 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitDBS40KUSSPP - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitDBS40KUSSPP - name: the armor helmet of the exocosuit - description: An enhanced version of the OBS-7 helmet. What at first glance looks like cutouts for the eyes, in fact, these are external sensors and measuring systems that work like a rangefinder. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/DBS40K_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/DBS40K_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitCamouflageColorsExocosuit - name: the exocosuit of the SSSP special forces "S.A.M." in camouflage colors - description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Camouflage" color scheme - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/camouflagecolors_exocosuitUSSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/camouflagecolors_exocosuitUSSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.45 - Heat: 0.6 - Radiation: 0.8 - Caustic: 0.75 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitCamouflageColors - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitCamouflageColors - name: the armor helmet of the exocosuit - description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/camouflagecolors_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/camouflagecolors_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitDesertedExocosuit - name: the exocosuit of the SSSP special forces "S.A.M." in deserted colors - description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Deserted" color scheme - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/deserted_exocosuitUSSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/deserted_exocosuitUSSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.55 - Slash: 0.55 - Piercing: 0.45 - Heat: 0.5 - Radiation: 0.6 - Caustic: 0.65 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitDesertedColors - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitDesertedColors - name: the armor helmet of the exocosuit - description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/deserted_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/deserted_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitTacticalExocosuit - name: the exocosuit of the SSSP special forces "S.A.M." in the tactical scheme - description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Tactical" color scheme - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/tactical_exocosuitUSSP.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/tactical_exocosuitUSSP.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.45 - Heat: 0.6 - Radiation: 0.8 - Caustic: 0.75 - Stun: 0.6 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitTacticalColors - - type: StealthClothing - visibility: 0.3 - toggleAction: ActionTogglePhaseCloak - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitTacticalColors - name: the armor helmet of the exocosuit - description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/tactical_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/tactical_USSP.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitMonolithReserch - name: MoNILIth exocosuit of the SSSP - description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Tactical" color scheme - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.8 - Piercing: 0.9 - Heat: 0.3 - Radiation: 0.1 - Caustic: 0.2 - Stun: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.1 - - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 - - type: HeldSpeedModifier - - type: Item - size: Normal - - type: Tag - tags: - - WhitelistChameleon - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitMonolithReserch - - type: StaticPrice - price: 750 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTClothingHeadHelmetHardsuitMonolithReserch - name: MONOLITh helmet - description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head. - components: - - type: BreathMask - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi - - type: PointLight - color: "#d6adff" - - type: PressureProtection - highPressureMultiplier: 0.60 - lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml deleted file mode 100644 index b2793f730b1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitCerber - name: cerber hardsuit - description: A specialized black spacesuit used in 19th century Asian countries by the central police. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/cerber.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/cerber.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 10000 - - type: ClothingSpeedModifier - walkModifier: 0.65 - sprintModifier: 0.65 - - type: Armor - modifiers: - coefficients: - Blunt: 0.1 - Slash: 0.4 - Piercing: 0.3 - Heat: 0.1 - Radiation: 0.35 - Caustic: 0.7 - - type: TemperatureProtection - coefficient: 0.001 - - type: ExplosionResistance - damageCoefficient: 0.2 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitCerber diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml deleted file mode 100644 index bcd1da9ab8b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml +++ /dev/null @@ -1,91 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterFemHardsuitSyndieCommander - name: женский командирский скафандр синдиката - description: Кроваво-красный женский скафандр, специально разработан для командиров синдиката. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndiecommander_fem.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndiecommander_fem.rsi - - type: PressureProtection - highPressureMultiplier: 0.05 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: Armor - modifiers: - coefficients: - Blunt: 0.4 - Slash: 0.4 - Piercing: 0.3 - Heat: 0.3 - Radiation: 0.20 - Caustic: 0.4 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadFemHelmetHardsuitSyndieCommander - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterFemHardsuitSyndieElite - name: женский элитный скафандр синдиката - description: Усовершенствованная версия женского кроваво-красного скафандра, отличающаяся повышенной огнеупорностью, устойчивостью к давлению и превосходной броней. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndieelite_fem.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndieelite_fem.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.4 - Heat: 0.2 - Radiation: 0.20 - Caustic: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: ToggleableClothing - clothingPrototype: ADTClothingFemHeadHelmetHardsuitSyndieElite - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterFemHardsuitSyndie - name: женский кроваво-красный скафандр - description: Женский тяжелобронированный и мобильный скафандр, предназначенный для специальных операций. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndi_fem.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/syndi_fem.rsi - - type: PressureProtection - highPressureMultiplier: 0.05 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: Armor - modifiers: - coefficients: - Blunt: 0.65 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.4 - Radiation: 0.20 - Caustic: 0.75 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: ToggleableClothing - clothingPrototype: ADTClothingFemHeadHelmetHardsuitSyndie diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/heavy_ERT.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/heavy_ERT.yml deleted file mode 100644 index 61707bc01e0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/heavy_ERT.yml +++ /dev/null @@ -1,53 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitERTHeavy - name: ERT heavy suit - description: ERT heavy suit - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/heavyERT.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/heavyERT.rsi - - type: PressureProtection - highPressureMultiplier: 0.2 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Blunt: 0.2 - Slash: 0.2 - Piercing: 0.15 - Heat: 0.2 - Radiation: 0 - Caustic: 0.1 - Stun: 0.05 - - type: ClothingSpeedModifier - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitERTHeavy - -- type: entity - parent: ClothingHeadHardsuitWithLightBase # Corvax-Resprite - id: ADTClothingHeadHelmetHardsuitERTHeavy - noSpawn: true - name: ERT heavy helmet - description: ERT heavy helmet - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/heavyERT.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/heavyERT.rsi - - type: PointLight # Corvax-Resprite - color: blue - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml deleted file mode 100644 index c722674569d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml +++ /dev/null @@ -1,52 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterParamedicVoidHardsuit - name: paramedic hardsuit - description: A modern means of protection for paramedics. It is a high-tech kit designed to ensure the safety and effective work of specialists in extreme space conditions. The spacesuit provides reliable protection against external factors such as radiation, chemicals and biological threats. It is made of durable and stable materials. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Slash: 0.95 - Heat: 0.90 - Radiation: 0.75 - Caustic: 0.5 - #- type: Appearance - - type: GroupExamine - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetParamedicVoid - #- type: ItemSlots #слот для ПИИ - # slots: - # place: - # name: PersonalAI - # startingItem: PersonalAI - # priority: 1 - # whitelist: - # tags: - # - ADTPAIEqepped - #- type: ItemMapper - #mapLayers: - # equipped-OUTERCLOTHING-PAI: - # whitelist: - # tags: - # - ADTPAIEqepped - #sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi - #- type: ContainerContainer - # containers: - # place: !type:ContainerSlot - #ents: [ ] - - - diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml deleted file mode 100644 index 1d391b16cb0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitSyndieCommander - id: ADTClothingOuterHardsuitPioneerAgent - name: agent "Pioneer" hardsuit - description: agent "Pioneer" hardsuit - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitPioneerAgent - -- type: entity - parent: ClothingHeadHelmetHardsuitSyndieCommander - id: ADTClothingHeadHelmetHardsuitPioneerAgent - noSpawn: true - name: agent "Pioneer" hardsuit helmet - description: agent "Pioneer" hardsuit helmet - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi - - type: PointLight # Corvax-Resprite - color: cyan - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml deleted file mode 100644 index c5b663914f4..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSaibaSain - name: Saiba Sain elite hardsuit - description: Produced from plasmatic fibers, nanomachines and silicon. Smells like cherry blossom - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/saiba_sain_hardsuit.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/saiba_sain_hardsuit.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 0.55 - sprintModifier: 0.55 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.1 - Slash: 0.1 - Piercing: 0.1 - Heat: 0.1 - Radiation: 0 - - type: ExplosionResistance - damageCoefficient: 0.1 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitSaibaSain diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/security_modern.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/security_modern.yml deleted file mode 100644 index 8e79de9ad94..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/security_modern.yml +++ /dev/null @@ -1,127 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSecurityModern - name: It looks like a spacesuit. - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.7 - Radiation: 0.8 - Caustic: 0.85 - Stun: 0.6 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadSecurityModern - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSecurityModernBlue - name: It looks like a spacesuit. - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_b.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_b.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.7 - Radiation: 0.8 - Caustic: 0.85 - Stun: 0.6 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadSecurityModernBlue - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSecurityModernGreen - name: It looks like a spacesuit. - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_g.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_g.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.7 - Radiation: 0.8 - Caustic: 0.85 - Stun: 0.6 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadSecurityModernGreen - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTClothingOuterHardsuitSecurityModernPur - name: It looks like a spacesuit. - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_p.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_p.rsi - - type: PressureProtection - highPressureMultiplier: 0.5 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.5 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.5 - Heat: 0.7 - Radiation: 0.8 - Caustic: 0.85 - Stun: 0.6 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadSecurityModernPurple diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml deleted file mode 100644 index 8532564a34f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitSecurity - id: ADTVeteranSecHardsuit - name: veteran security hardsuit - description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/veteransechardsuit.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/veteransechardsuit.rsi - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 10000 - - type: ClothingSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.75 - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.8 - Radiation: 0.25 - - type: ExplosionResistance - damageCoefficient: 0.6 - - type: ToggleableClothing - clothingPrototype: ADTVeteranSecHardsuitHelm - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTVeteranSecHardsuitHelm - noSpawn: true - name: veteran security hardsuit helmet - description: Safety helmet with the latest top-secret NT-HUD software. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/veteransechardsuithead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/veteransechardsuithead.rsi - - type: PointLight - color: "#ffadad" - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 10000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/KirravaCloak.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/KirravaCloak.yml deleted file mode 100644 index 58d51b1aabf..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/KirravaCloak.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTKirasCloakn - name: Kiras cloakn - description: beautiful kapeshon u Kirava. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/kiras_cloakn.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/kiras_cloakn.rsi - - type: ClothingSpeedModifier - walkModifier: 1.2 - sprintModifier: 1.2 - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 - - type: TemperatureProtection - coefficient: 0.2 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - Radiation: 0.9 - - type: ToggleableClothing - clothingPrototype: ADTClothingHeadHelmetHardsuitKiravaHoodsec - -- type: entity - parent: ClothingHeadBase - id: ADTKirasHead - noSpawn: true - name: Kirava Hoodsec - description: The steering wheel is imprinted in the visor of this helmet. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/kirava_hoodsec.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/kirava_hoodsec.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml deleted file mode 100644 index b3c79a1e625..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SindiPoncho.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ClothingOuterPonchoSindi - name: Sindi poncho - description: Sindicat poncho. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi - - type: AddAccentClothing - accent: SpanishAccent \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SupremeCommanderArmor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SupremeCommanderArmor.yml deleted file mode 100644 index 94838daf57e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/SupremeCommanderArmor.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: entity - parent: ClothingOuterBaseLarge - id: ADTClothingOuterClothingSupreneCommanderArmor - name: "Supreme commander's carapace" - description: "This thing is impossible to create, but we could. Fully covered bluespace plates. When you wear it, you feel like the emperor of mankind" - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/supreme-commander-armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/supreme-commander-armor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.01 #true best armor in the game - Slash: 0.01 - Piercing: 0.01 - Heat: 0.01 - Radiation: 0.01 - - type: ExplosionResistance - damageCoefficient: 0.01 - - type: GroupExamine - - type: ClothingSpeedModifier - walkModifier: 1.1 - sprintModifier: 1.1 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/USSPjuggernaut.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/USSPjuggernaut.yml deleted file mode 100644 index 117b3b8ab03..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/USSPjuggernaut.yml +++ /dev/null @@ -1,73 +0,0 @@ -#head hat armored -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadUSSPjuggernautHelmetArmored - name: USSP Armored jugger hard helmet - description: An armored hard hat. Provides the best of both worlds in both protection & utility - perfect for the engineer on the frontlines. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi - - type: FlashImmunity - - type: EyeProtection - protectionTime: 5 - - type: Armor #Copied from the sec helmet, as it's hard to give these sane values without locational damage existing. - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.8 - - type: ExplosionResistance - damageCoefficient: 0.70 - - type: GroupExamine - -#armored juggernaut -- type: entity - parent: ClothingOuterBaseLarge - id: ClothingOuterArmorUSSPjuggernaut - name: USSP Armored juggernaut - description: Inflates the changeling's body into an all-consuming chitinous mass of armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/usspjuggernaut.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/usspjuggernaut.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.25 - Slash: 0.3 - Heat: 0.6 - Piercing: 0.2 - Caustic: 0.2 - - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: GroupExamine - -#КЗС-1 - -- type: entity - parent: ClothingOuterArmorBasic - id: ADTClothingOuterVestUSSPKZS1 - name: KZS-1 vest - description: A synthetic armor vest. This one has added webbing and ballistic plates. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/ussp_kzs1.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/ussp_kzs1.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.7 - - type: ExplosionResistance - damageCoefficient: 0.7 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml deleted file mode 100644 index 5d838224de6..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/aprons.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterApronBar - name: bartender apron - description: An apron-jacket used by a bartender. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterApronPathologist - name: pathologist's apron - description: An apron used by pathologists. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml index 75c3f92be77..390445e015a 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -1,4 +1,3 @@ - - type: entity parent: ClothingOuterStorageBase id: ADTClothingOuterVestWebL @@ -40,3 +39,190 @@ Stun: 0.5 - type: ExplosionResistance damageCoefficient: 0.75 + +- type: entity + parent: ClothingOuterBaseLarge + id: ADTClothingOuterClothingSupreneCommanderArmor + name: "Supreme commander's carapace" + description: "This thing is impossible to create, but we could. Fully covered bluespace plates. When you wear it, you feel like the emperor of mankind" + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/supreme-commander-armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/supreme-commander-armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.01 #true best armor in the game + Slash: 0.01 + Piercing: 0.01 + Heat: 0.01 + Radiation: 0.01 + - type: ExplosionResistance + damageCoefficient: 0.01 + - type: GroupExamine + - type: ClothingSpeedModifier + walkModifier: 1.1 + sprintModifier: 1.1 + +#armored juggernaut +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorUSSPjuggernaut + name: USSP Armored juggernaut + description: Inflates the changeling's body into an all-consuming chitinous mass of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/usspjuggernaut.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/usspjuggernaut.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.25 + Slash: 0.3 + Heat: 0.6 + Piercing: 0.2 + Caustic: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: GroupExamine + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingBlueshieldArmor + name: blueshield bulletproof vest + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.4 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.80 + # - type: Item + # size: Large + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTTagillaArmor + name: Tagilla bulletproof vest + description: Tagilla bulletproof vest + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/tagilla_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/tagilla_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.90 + #- type: Storage + # capacity: 12 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTKillaArmor + name: Killa armor vest + description: Killa armor vest + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/killa_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/killa_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTCSIJArmor + name: CSIJ bulletproof vest + description: No one knows what this bulletproof vest is made of, and it's better not to know... On the back there are the initials CS - 'Cruelty Squad'. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/CSIJ_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/CSIJ_armor.rsi + - type: ExplosionResistance + damageCoefficient: 0.9 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingHungerGamesArmorCapitols + name: ArmorCapitols + description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.88 + #- type: Matchbox + - type: Storage + maxItemSize: Small + grid: + - 0,0,3,3 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + # to prevent bag open/honk spam + - type: UseDelay + delay: 0.5 +- type: entity + parent: ClothingOuterBase + id: ADTImpmonk + name: inquisitor's robe + description: Crafted from the most technologically advanced fabric. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/impmonk.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/impmonk.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.6 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barjacket.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barjacket.yml deleted file mode 100644 index 91d0689a4ab..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/barjacket.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterJacketBartender - name: Bar jacket - description: stylish jacket for bear holding. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/barjacket.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/barjacket.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/blueshield_armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/blueshield_armor.yml deleted file mode 100644 index 151c96265e7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/blueshield_armor.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: entity - parent: ClothingOuterArmorBasic - id: ADTClothingBlueshieldArmor - name: blueshield bulletproof vest - description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.4 - Heat: 0.8 - - type: ExplosionResistance - damageCoefficient: 0.80 - # - type: Item - # size: Large diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 7791b939769..8a87a4e6997 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -128,3 +128,355 @@ Slash: 0.95 Heat: 0.90 +- type: entity + parent: ClothingOuterCoatSecurityOvercoat + id: ADTClothingOuterCoatRavenOvercoatFriskis + suffix: Only Friskis + name: security raven overcoat + description: Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Nanotrasen Security. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/raven_overcoat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/raven_overcoat.rsi + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING + - state: equipped-OUTERCLOTHING-unshaded + shader: unshaded + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatIlisium + name: Raincoat Ilisium + description: Ilisium + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/plash_ili.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/plash_ili.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatPyotrCoat + name: Pyotr`s Coat + description: This dark coat is heavier than look + components: + - type: Storage + grid: + - 0,0,3,1 + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/pyotr_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/pyotr_coat.rsi + - type: StorageFill + contents: + - id: CigarGoldCase + - id: Lighter + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatOctyabrinaCoat + name: Octyabrina`s Coat + description: This red coat is heavier than look + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/oktyabrina_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/oktyabrina_coat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatJohanCoat + name: Johans`s Coat + description: White coat with blue strips? YOS. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/johan_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/johan_coat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatXCoat + name: X`s Coat + description: X`s Coat + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/x_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/x_coat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 + +- type: entity + parent: ADTClothingOuterCoatPyotrCoat + id: ADTClothingOuterCoatSecAuditor + name: sec auditor coat + description: sec auditor coat + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/sec_auditor_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/sec_auditor_coat.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatCyberSun + name: лабораторный халат Киберсан + description: Лабораторный халат Киберсан, предоставляющий минимальную защиту от вредного воздействия + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/labcyber.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/labcyber.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterBrownFurCoat + name: brown fur coat + description: This brown fur coat made from elite skin of brown bear + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/brown_furcoat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/brown_furcoat.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterBlackFurCoat + name: black fur coat + description: This black fur coat made from skin of black bear + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/black_furcoat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/black_furcoat.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTJasonBomber + name: maniac bomber + description: maniac bomber + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/jason.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/jason.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTStudentBomber + name: student bomber + description: student bomber + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/hotline_student.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/Halloween/hotline_student.rsi + +- type: entity + parent: ClothingOuterBaseLarge + id: ADTClothingSyndicateJacket + name: Syndicate jacket + description: An upgraded version of the blood red hardsuit that features enhanced fireproofing, pressure resist, and superior armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/Syndicate_jacket.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/Syndicate_jacket.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.4 + Heat: 0.2 + Radiation: 0.20 + - type: ExplosionResistance + damageCoefficient: 0.3 + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatSportJacket + name: sport bomber jacket + description: A thick, stylish bomber jacket for cold temperature. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/sport_jacket.rsi #спрайты от @prazat911 + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/sport_jacket.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatSportStepHoodie + name: STEP hoodie + description: This hoodie is like a cocoon, that places it's owner into another universe, where water, wind, mud and fire is no match for him. Mucho texto, really. But looks good. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/sport_step_hoodie.rsi #спрайты от @prazat911 + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/sport_step_hoodie.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatSportZetaBlouse + name: Zeta green blouse + description: A green blouse from series "Zeta". + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/sport_zeta_blouse.rsi #спрайты от @prazat911 + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/sport_zeta_blouse.rsi + +#День Святого Валентина + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterRedCardigan + name: red cardigan + description: red cardigan + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/red_cardigan.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/red_cardigan.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterBlackCardigan + name: black cardigan + description: black cardigan + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/black_cardigan.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/black_cardigan.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTJayBomber + name: jaybomber + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/jaybomber.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/jaybomber.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatLabSec + name: lab coat (sec) + description: A suit that protects against minor chemical spills. Has an red stripe on the shoulder. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi + +- type: entity + parent: ClothingOuterCoatLab + id: ADTClothingOuterCoatLabParamedic + name: paramedic's lab coat + description: A suit that protects against minor chemical spills. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi + +- type: entity + parent: ClothingOuterCoatLab + id: ADTClothingOuterCoatHikeLabcoatCmo + name: chief medical officer's hiking lab coat + description: Partially open labcoat. Does not hinder movement. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi + +- type: entity + parent: ClothingOuterCoatLab + id: ADTClothingOuterCoatLabPathologist + name: pathologist's lab coat + description: A suit that protects against minor chemical spills. But still a bit too white for blood stains. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterCoatSchroCoat + name: Schrodinger`s Coat + description: This dark coat is heavier than look + components: + - type: Storage + grid: + - 0,0,4,2 + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/schrodinger_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/schrodinger_coat.rsi + - type: StorageFill + contents: + - id: ADTCigarSchrodingerCase + - id: FlippoSchrodingerLighter + - id: SpeedLoaderMagnum + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.7 + Heat: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/furcoat.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/furcoat.yml deleted file mode 100644 index 2a0d9bbe170..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/furcoat.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterBrownFurCoat - name: brown fur coat - description: This brown fur coat made from elite skin of brown bear - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/brown_furcoat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/brown_furcoat.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterBlackFurCoat - name: black fur coat - description: This black fur coat made from skin of black bear - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/black_furcoat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/black_furcoat.rsi - -#толстовки-топки от Празата -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterGraySweatshirtTop - name: gray sweatshirt-top - description: gray sweatshirt-top - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterBlackSweatshirtTop - name: black sweatshirt-top - description: black sweatshirt-top - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml deleted file mode 100644 index c25a971c59c..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/halloween.yml +++ /dev/null @@ -1,96 +0,0 @@ -- type: entity - parent: ClothingOuterArmorBasic - id: ADTCSIJArmor - name: CSIJ bulletproof vest - description: No one knows what this bulletproof vest is made of, and it's better not to know... On the back there are the initials CS - 'Cruelty Squad'. - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/CSIJ_armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/CSIJ_armor.rsi - - type: ExplosionResistance - damageCoefficient: 0.9 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTJasonBomber - name: maniac bomber - description: maniac bomber - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/jason.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/jason.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTStudentBomber - name: student bomber - description: student bomber - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/hotline_student.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/hotline_student.rsi - -- type: entity - parent: ClothingOuterArmorBasic - id: ADTKillaArmor - name: Killa armor vest - description: Killa armor vest - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/killa_armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/killa_armor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.85 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 - -- type: entity - parent: ClothingOuterArmorBasic - id: ADTTagillaArmor - name: Tagilla bulletproof vest - description: Tagilla bulletproof vest - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/tagilla_armor.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/tagilla_armor.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.85 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.90 - #- type: Storage - # capacity: 12 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTVergileCloak - name: Vergile cloak - description: Vergile cloak - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/vergile_cloak.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/Halloween/vergile_cloak.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 00000000000..cdca4370b54 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,967 @@ +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitIlisium + name: hardsuit ilisium + description: hardsuit ilisium + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/hardsuit_ili.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Heat: 0.35 + Radiation: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetIlisium + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSaibaSain + name: Saiba Sain elite hardsuit + description: Produced from plasmatic fibers, nanomachines and silicon. Smells like cherry blossom + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/saiba_sain_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/saiba_sain_hardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.55 + sprintModifier: 0.55 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + Heat: 0.1 + Radiation: 0 + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitSaibaSain + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSecurityModern + name: It looks like a spacesuit. + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 + Radiation: 0.8 + Caustic: 0.85 + Stun: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadSecurityModern + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSecurityModernBlue + name: It looks like a spacesuit. + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_b.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_b.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 + Radiation: 0.8 + Caustic: 0.85 + Stun: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadSecurityModernBlue + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSecurityModernGreen + name: It looks like a spacesuit. + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_g.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_g.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 + Radiation: 0.8 + Caustic: 0.85 + Stun: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadSecurityModernGreen + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSecurityModernPur + name: It looks like a spacesuit. + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_p.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/security_modern_p.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.7 + Radiation: 0.8 + Caustic: 0.85 + Stun: 0.6 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadSecurityModernPurple + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitOBS7USSP + name: USSP OBS-7 Konrad armor suit + description: OBS-7 "Konrad", stands for, Combined-Arms Armor-Suit Model 7, is a single combined-arms armor suit of the Konrad series, designed to provide high protection and mobility. This armor suit surpasses its predecessor in terms of mobility and protection from laser weapons, although it is significantly inferior in armor protection from small arms and explosions. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS7USSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS7USSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.6 + Radiation: 0.8 + Caustic: 0.75 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitOBS7USSP + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitOBS5USSP + name: USSP OBS-5 Konrad armor suit + description: OBS-5 "Konrad", also known as the Combined-Arms Armor Suit Model 5, is a morally intimidating model of a single combined-arms armor suit of the Konrad series. This spacesuit was designed with high protection against small arms and explosions in mind. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS5USSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/OBS5USSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.6 + Radiation: 0.8 + Caustic: 0.75 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitOBS5USSPP + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitSL5USSP + name: USSP SL-5 "Pilot" spacesuit + description: Pilot's Spacesuit Model 5, a special kit consisting of an outer jumpsuit, shock absorbers and armor plates designed to protect and isolate the pilot of a space shuttle from the external environment of boundless space. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/SL5USSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/SL5USSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.45 + Heat: 0.8 + Radiation: 0.8 + Caustic: 0.8 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.95 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitSL5USSPP + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitDBS40KUSSP + name: Power armor of the cosmo-paratrooper SSSP "DBS-40k" + description: An experimental model of a military armored suit, specially designed for the needs of the Space Landing forces of the USSP. This is a weighted and modified version of the OBS-7. During the modifications of the armor suit, the armor plates were replaced with a stronger analog, and additional armor was installed, which made it more massive. However, the protective characteristics have been significantly improved, providing the carrier with high protection from enemy factors in outer space and on the surface of planets. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/DBS40KUSSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/DBS40KUSSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.6 + Radiation: 0.8 + Caustic: 0.75 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitDBS40KUSSPP + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitCamouflageColorsExocosuit + name: the exocosuit of the SSSP special forces "S.A.M." in camouflage colors + description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Camouflage" color scheme + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/camouflagecolors_exocosuitUSSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/camouflagecolors_exocosuitUSSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.6 + Radiation: 0.8 + Caustic: 0.75 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitCamouflageColors + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitDesertedExocosuit + name: the exocosuit of the SSSP special forces "S.A.M." in deserted colors + description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Deserted" color scheme + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/deserted_exocosuitUSSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/deserted_exocosuitUSSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.45 + Heat: 0.5 + Radiation: 0.6 + Caustic: 0.65 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitDesertedColors + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitTacticalExocosuit + name: the exocosuit of the SSSP special forces "S.A.M." in the tactical scheme + description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Tactical" color scheme + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/tactical_exocosuitUSSP.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/tactical_exocosuitUSSP.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.45 + Heat: 0.6 + Radiation: 0.8 + Caustic: 0.75 + Stun: 0.6 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitTacticalColors + - type: StealthClothing + visibility: 0.3 + toggleAction: ActionTogglePhaseCloak + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitMonolithReserch + name: MoNILIth exocosuit of the SSSP + description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Tactical" color scheme + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.8 + Piercing: 0.9 + Heat: 0.3 + Radiation: 0.1 + Caustic: 0.2 + Stun: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: HeldSpeedModifier + - type: Item + size: Normal + - type: Tag + tags: + - WhitelistChameleon + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitMonolithReserch + - type: StaticPrice + price: 750 + +- type: entity + parent: ClothingOuterHardsuitSecurity + id: ADTVeteranSecHardsuit + name: veteran security hardsuit + description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/veteransechardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/veteransechardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.75 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + Radiation: 0.25 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ADTVeteranSecHardsuitHelm + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitCerber + name: cerber hardsuit + description: A specialized black spacesuit used in 19th century Asian countries by the central police. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/cerber.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/cerber.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.65 + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.1 + Radiation: 0.35 + Caustic: 0.7 + - type: TemperatureProtection + coefficient: 0.001 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitCerber + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitCybersunBodyGuard + name: cybersun bodyguard hardsuit + description: An upgraded version of the blood red hardsuit that features enhanced fireproofing, pressure resist, and superior armor. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersunbodyguard.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersunbodyguard.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.4 + Heat: 0.2 + Radiation: 0.20 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitCybersunBodyGuard + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitCybersunCrysis + name: cybersun supersoldier's hardsuit + description: CyberSun's most advanced, secret security technology. It seems this development is leading to the creation of super soldiers. It smells of plastitan and dishonorable fight + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersun_crysis_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/cybersun_crysis_hardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.55 + sprintModifier: 0.55 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.1 + Slash: 0.1 + Piercing: 0.1 + Heat: 0.1 + Radiation: 0 + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitCybersunCrysis + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterFemHardsuitSyndieCommander + name: женский командирский скафандр синдиката + description: Кроваво-красный женский скафандр, специально разработан для командиров синдиката. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndiecommander_fem.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndiecommander_fem.rsi + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.4 + Slash: 0.4 + Piercing: 0.3 + Heat: 0.3 + Radiation: 0.20 + Caustic: 0.4 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadFemHelmetHardsuitSyndieCommander + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterFemHardsuitSyndieElite + name: женский элитный скафандр синдиката + description: Усовершенствованная версия женского кроваво-красного скафандра, отличающаяся повышенной огнеупорностью, устойчивостью к давлению и превосходной броней. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndieelite_fem.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndieelite_fem.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.4 + Heat: 0.2 + Radiation: 0.20 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: ToggleableClothing + clothingPrototype: ADTClothingFemHeadHelmetHardsuitSyndieElite + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterFemHardsuitSyndie + name: женский кроваво-красный скафандр + description: Женский тяжелобронированный и мобильный скафандр, предназначенный для специальных операций. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndi_fem.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/syndi_fem.rsi + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.4 + Radiation: 0.20 + Caustic: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.5 + - type: ToggleableClothing + clothingPrototype: ADTClothingFemHeadHelmetHardsuitSyndie + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitERTHeavy + name: ERT heavy suit + description: ERT heavy suit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/heavyERT.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/heavyERT.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.15 + Heat: 0.2 + Radiation: 0 + Caustic: 0.1 + Stun: 0.05 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitERTHeavy + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTinquisitory + name: inquisitory hardsuit + description: Repent of your sins. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: ToggleableClothing + clothingPrototype: ADTInquisitoryHead + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTKirasCloakn + name: Kiras cloakn + description: beautiful kapeshon u Kirava. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/kiras_cloakn.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/kiras_cloakn.rsi + - type: ClothingSpeedModifier + walkModifier: 1.2 + sprintModifier: 1.2 + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + - type: TemperatureProtection + coefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.9 + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitKiravaHoodsec + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTSpaceMarinne + name: berserker hardsuit + description: Technology from the dark age. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/marinne.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/marinne.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.5 + Radiation: 0.5 + Stun: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: ToggleableClothing + clothingPrototype: ADTSpaceMarinneHead + +# Nano-Scale +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterHardsuitNanoScale + name: Nano scale armor + description: Reptiles are not as primitive as you thought. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.3 + sprintModifier: 1.3 + - type: TemperatureProtection + coefficient: 0.001 + - type: Armor + modifiers: + coefficients: + Blunt: 0.3 + Slash: 0.5 + Piercing: 0.4 + Heat: 0.2 + Radiation: 0.20 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: ToggleableClothing + clothingPrototype: ADTClothingClothingHeadHelmetHardsuitNanoScale + + # Nano-Scale-Chameleon + # Не знаю точно ли это hardsuit так как отсутствует шлем +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterHardsuitNanoScaleChameleon + name: Nano scale armor chameleon + description: Very secretive and smells very sugary + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor_chameleon.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/nano_scale_armor_chameleon.rsi + - type: PressureProtection + highPressureMultiplier: 0.6 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.01 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.6 + - type: PowerCellSlot + cellSlotId: cell_slot + # throwing in a recharger would bypass glove charging mechanic + fitsInCharger: false + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellAntiqueProto + # delay for when attacked while cloaked + - type: UseDelay + delay: 5 + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTClothingOuterParamedicVoidHardsuit + name: paramedic hardsuit + description: A modern means of protection for paramedics. It is a high-tech kit designed to ensure the safety and effective work of specialists in extreme space conditions. The spacesuit provides reliable protection against external factors such as radiation, chemicals and biological threats. It is made of durable and stable materials. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.95 + Heat: 0.90 + Radiation: 0.75 + Caustic: 0.5 + #- type: Appearance + - type: GroupExamine + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetParamedicVoid + #- type: ItemSlots #слот для ПИИ + # slots: + # place: + # name: PersonalAI + # startingItem: PersonalAI + # priority: 1 + # whitelist: + # tags: + # - ADTPAIEqepped + #- type: ItemMapper + #mapLayers: + # equipped-OUTERCLOTHING-PAI: + # whitelist: + # tags: + # - ADTPAIEqepped + #sprite: ADT/Clothing/OuterClothing/Hardsuits/paramedic_hardsuit.rsi + #- type: ContainerContainer + # containers: + # place: !type:ContainerSlot + #ents: [ ] + + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTPilotSuit + name: Pilot Suit + description: The second skin of those who love speed and stars. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuit.rsi + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + - type: TemperatureProtection + coefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.75 + Piercing: 0.6 + Heat: 0.4 + Radiation: 0.2 + - type: ToggleableClothing + clothingPrototype: ADTPilotSuitHelm + +- type: entity + parent: ClothingOuterHardsuitBase + id: ADTPilotSuitSEC + name: Pilot Suit Security + description: For keepers of order among the stars. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuitsec.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuitsec.rsi + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 10000 + - type: TemperatureProtection + coefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.75 + Piercing: 0.6 + Heat: 0.4 + Radiation: 0.2 + - type: ToggleableClothing + clothingPrototype: ADTPilotSuitHelmSEC + +- type: entity + parent: ClothingOuterHardsuitSyndieCommander + id: ADTClothingOuterHardsuitPioneerAgent + name: agent "Pioneer" hardsuit + description: agent "Pioneer" hardsuit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitPioneerAgent \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml deleted file mode 100644 index 78c2e680332..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hunger_games.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - parent: ClothingOuterArmorBasic - id: ADTClothingHungerGamesArmorCapitols - name: ArmorCapitols - description: A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/armor_capitols.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.8 - - type: ExplosionResistance - damageCoefficient: 0.88 - #- type: Matchbox - - type: Storage - maxItemSize: Small - grid: - - 0,0,3,3 - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface - # to prevent bag open/honk spam - - type: UseDelay - delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/impmonk.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/impmonk.yml deleted file mode 100644 index 97a7968507e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/impmonk.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ADTImpmonk - name: inquisitor's robe - description: Crafted from the most technologically advanced fabric. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Armor/impmonk.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Armor/impmonk.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.6 - Slash: 0.6 - Piercing: 0.6 - Heat: 0.6 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/inquisitory.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/inquisitory.yml deleted file mode 100644 index 70e2fb1a7e7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/inquisitory.yml +++ /dev/null @@ -1,54 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTinquisitory - name: inquisitory hardsuit - description: Repent of your sins. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/inquisitory.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.5 - Heat: 0.5 - Radiation: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.8 - - type: ToggleableClothing - clothingPrototype: ADTInquisitoryHead - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTInquisitoryHead - noSpawn: false - name: inquisitor hardsuit helmet - description: You have been given power over destinies. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/inquisitoryhead.rsi - - type: PointLight - color: white - radius: 7 - energy: 3 - - type: PressureProtection - highPressureMultiplier: 0.08 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jacket.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jacket.yml deleted file mode 100644 index 42b3f3c53c7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jacket.yml +++ /dev/null @@ -1,99 +0,0 @@ -- type: entity - parent: ClothingOuterBaseLarge - id: ADTClothingSyndicateJacket - name: Syndicate jacket - description: An upgraded version of the blood red hardsuit that features enhanced fireproofing, pressure resist, and superior armor. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/Syndicate_jacket.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/Syndicate_jacket.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: TemperatureProtection - coefficient: 0.001 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.4 - Heat: 0.2 - Radiation: 0.20 - - type: ExplosionResistance - damageCoefficient: 0.3 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatSportJacket - name: sport bomber jacket - description: A thick, stylish bomber jacket for cold temperature. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/sport_jacket.rsi #спрайты от @prazat911 - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/sport_jacket.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatSportStepHoodie - name: STEP hoodie - description: This hoodie is like a cocoon, that places it's owner into another universe, where water, wind, mud and fire is no match for him. Mucho texto, really. But looks good. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/sport_step_hoodie.rsi #спрайты от @prazat911 - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/sport_step_hoodie.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatSportZetaBlouse - name: Zeta green blouse - description: A green blouse from series "Zeta". - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/sport_zeta_blouse.rsi #спрайты от @prazat911 - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/sport_zeta_blouse.rsi - -#День Святого Валентина - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterRedCardigan - name: red cardigan - description: red cardigan - suffix: Valentine Day - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/red_cardigan.rsi #спрайты от @lunalita - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/red_cardigan.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterBlackCardigan - name: black cardigan - description: black cardigan - suffix: Valentine Day - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/black_cardigan.rsi #спрайты от @lunalita - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/black_cardigan.rsi - -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterCupidonWings - name: cupidon wings - description: cupidon wings - suffix: Valentine Day - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Jackets/cupidon_wings.rsi #спрайты от @lunalita - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Jackets/cupidon_wings.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jaybomber.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jaybomber.yml deleted file mode 100644 index 740c15e50bb..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/jaybomber.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ADTJayBomber - name: jaybomber - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/jaybomber.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/jaybomber.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml deleted file mode 100644 index 8c4758f43ee..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/labcoats.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatLabSec - name: lab coat (sec) - description: A suit that protects against minor chemical spills. Has an red stripe on the shoulder. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_sec.rsi - -- type: entity - parent: ClothingOuterCoatLab - id: ADTClothingOuterCoatLabParamedic - name: paramedic's lab coat - description: A suit that protects against minor chemical spills. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_paramedic.rsi - -- type: entity - parent: ClothingOuterCoatLab - id: ADTClothingOuterCoatHikeLabcoatCmo - name: chief medical officer's hiking lab coat - description: Partially open labcoat. Does not hinder movement. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/hike_labcoat_cmo.rsi - -- type: entity - parent: ClothingOuterCoatLab - id: ADTClothingOuterCoatLabPathologist - name: pathologist's lab coat - description: A suit that protects against minor chemical spills. But still a bit too white for blood stains. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/labcoat_pathologist.rsi - diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml deleted file mode 100644 index 56ed1946968..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml +++ /dev/null @@ -1,53 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTSpaceMarinne - name: berserker hardsuit - description: Technology from the dark age. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/marinne.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/marinne.rsi - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ClothingSpeedModifier - walkModifier: 1.0 - sprintModifier: 1.0 - - type: Armor - modifiers: - coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.5 - Heat: 0.5 - Radiation: 0.5 - Stun: 0.7 - - type: ExplosionResistance - damageCoefficient: 0.3 - - type: ToggleableClothing - clothingPrototype: ADTSpaceMarinneHead - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTSpaceMarinneHead - noSpawn: true - name: berserker hardsuit helmet - description: You have been given power over destinies. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/marinnehead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/marinnehead.rsi - - type: PointLight - color: red - - type: PressureProtection - highPressureMultiplier: 0.08 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 - Heat: 0.7 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml new file mode 100644 index 00000000000..8c71080d282 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml @@ -0,0 +1,135 @@ +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterBaseChaplainRasy + name: OuterBaseChaplain + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterPonchoSindi + name: Sindi poncho + description: Sindicat poncho. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/poncho_sindi.rsi + - type: AddAccentClothing + accent: SpanishAccent + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterApronBar + name: bartender apron + description: An apron-jacket used by a bartender. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/apronbar.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterApronPathologist + name: pathologist's apron + description: An apron used by pathologists. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterJacketBartender + name: Bar jacket + description: stylish jacket for bear holding. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/barjacket.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/barjacket.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterSuitRacoon + name: racoon suit + description: Snort snort snort! + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/racoon.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/racoon.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterSuitFox + name: fox suit + description: Snort snort snort! + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/fox.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterSuitChefPovar + name: fox suit + description: Snort snort snort! + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Suits/chefpovar_outer.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterDedMoroz + suffix: New Year + name: Ded Moroz suit + description: Suit clothing ded moroz + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi + +#толстовки-топки от Празата +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterGraySweatshirtTop + name: gray sweatshirt-top + description: gray sweatshirt-top + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/gray_sweatshirttop.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterBlackSweatshirtTop + name: black sweatshirt-top + description: black sweatshirt-top + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/black_sweatshirttop.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterCupidonWings + name: cupidon wings + description: cupidon wings + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Jackets/cupidon_wings.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Jackets/cupidon_wings.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pilots.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pilots.yml deleted file mode 100644 index 2453874d551..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pilots.yml +++ /dev/null @@ -1,91 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTPilotSuit - name: Pilot Suit - description: The second skin of those who love speed and stars. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuit.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuit.rsi - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 - - type: TemperatureProtection - coefficient: 0.2 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.75 - Piercing: 0.6 - Heat: 0.4 - Radiation: 0.2 - - type: ToggleableClothing - clothingPrototype: ADTPilotSuitHelm - -- type: entity - parent: ClothingOuterHardsuitBase - id: ADTPilotSuitSEC - name: Pilot Suit Security - description: For keepers of order among the stars. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuitsec.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Hardsuits/pilotsuitsec.rsi - - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 - - type: TemperatureProtection - coefficient: 0.2 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.75 - Piercing: 0.6 - Heat: 0.4 - Radiation: 0.2 - - type: ToggleableClothing - clothingPrototype: ADTPilotSuitHelmSEC - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTPilotSuitHelm - noSpawn: true - name: Pilot Suit Helm - description: The steering wheel is imprinted in the visor of this helmet. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelm.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelm.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ADTPilotSuitHelmSEC - noSpawn: true - name: Pilot Suit Helm Security - description: Looks like something that inspires order. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelmsec.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hardsuits/pilotsuithelmsec.rsi - - type: PointLight - color: red - - type: PressureProtection - highPressureMultiplier: 0.3 - lowPressureMultiplier: 10000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pyotr_coat.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pyotr_coat.yml deleted file mode 100644 index d2fb3f3f017..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/pyotr_coat.yml +++ /dev/null @@ -1,90 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatPyotrCoat - name: Pyotr`s Coat - description: This dark coat is heavier than look - components: - - type: Storage - grid: - - 0,0,3,1 - maxItemSize: Normal - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/pyotr_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/pyotr_coat.rsi - - type: StorageFill - contents: - - id: CigarGoldCase - - id: Lighter - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatOctyabrinaCoat - name: Octyabrina`s Coat - description: This red coat is heavier than look - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/oktyabrina_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/oktyabrina_coat.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatJohanCoat - name: Johans`s Coat - description: White coat with blue strips? YOS. - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/johan_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/johan_coat.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatXCoat - name: X`s Coat - description: X`s Coat - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/x_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/x_coat.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 - -- type: entity - parent: ADTClothingOuterCoatPyotrCoat - id: ADTClothingOuterCoatSecAuditor - name: sec auditor coat - description: sec auditor coat - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/sec_auditor_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/sec_auditor_coat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml deleted file mode 100644 index 3b137ec7d5f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/rasy_chaplain.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ADTClothingOuterBaseChaplainRasy - name: OuterBaseChaplain - components: - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Suits/rasy_chaplain.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/clothing_shahid.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/tsf_armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/vests.yml similarity index 52% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/tsf_armor.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/vests.yml index 80cf065313b..3b869f30f74 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/tsf_armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/vests.yml @@ -1,3 +1,26 @@ +#КЗС-1 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTClothingOuterVestUSSPKZS1 + name: KZS-1 vest + description: A synthetic armor vest. This one has added webbing and ballistic plates. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/ussp_kzs1.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/ussp_kzs1.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: entity parent: ClothingOuterArmorBasic id: ADTClothingTSFArmor diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml index 7f7e55c88b5..9d4cbe9f014 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml @@ -13,30 +13,6 @@ walkModifier: 1.7 sprintModifier: 1.7 -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingHandsWhiteHeels - name: White heels - description: Specially for your dress! - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/white_heels.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/white_heels.rsi - - type: NoSlip - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingHandsGoldHeels - name: Gold heels - description: Gold plated heels. How much does it cost? - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/gold_heels.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/gold_heels.rsi - - type: NoSlip - #nope_ingeneer - type: entity parent: ClothingShoesBaseButcherable @@ -49,49 +25,6 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/redji_shoes.rsi -- type: entity - id: ActionToggleADTMagboots - parent: ActionBaseToggleMagboots - noSpawn: true - components: - - type: InstantAction - icon: { sprite: ADT/Clothing/Shoes/Boots/advanced.rsi, state: icon } - iconOn: ADT/Clothing/Shoes/Boots/advanced.rsi/icon-on.png - #itemIconStyle: NoItem - #event: !type:ToggleActionEvent - -- type: entity - id: ActionToggleADTGasTank - name: action-name-internals-toggle - description: action-description-internals-toggle - noSpawn: true - components: - - type: InstantAction - icon: - sprite: Interface/Alerts/internals.rsi - state: internal2 - iconOn: - sprite: Interface/Alerts/internals.rsi - state: internal1 - event: !type:ToggleActionEvent - useDelay: 1 - -- type: entity - id: ActionToggleADTJetpack - name: action-name-jetpack-toggle - description: action-description-jetpack-toggle - noSpawn: true - components: - - type: InstantAction - icon: - sprite: Objects/Tanks/Jetpacks/blue.rsi - state: icon - iconOn: - sprite: Objects/Tanks/Jetpacks/blue.rsi - state: icon-on - #useDelay: 1.0 - event: !type:ToggleJetpackEvent - - type: entity parent: ClothingShoesBootsMagSyndie id: ADTClothingShoesBootsMagAdvSynd @@ -146,19 +79,6 @@ # item: # - CombatKnife -#Pyotr - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingSandals - name: Sandals - description: pair of sandals - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/sandals.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/sandals.rsi - - type: entity parent: ClothingShoesBootsMag id: ADTClothingShoesBootsMagERT @@ -187,125 +107,6 @@ # item: # - CombatKnife -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsWhite - name: white footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/white_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/white_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsBlack - name: black footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/black_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/black_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsHighBlack - name: high black footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsHighWhite - name: high white footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsBrown - name: brown footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWrapsHighBrown - name: brown white footwraps - description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka - state: icon - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingAidanShoes - name: Aidan shoes - description: Aidan shoes - suffix: Personal - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/aidan_shoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/aidan_shoes.rsi - -#туфли и не только от Празата - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootGoldenHeels - name: golden heels - description: Specially for your dress! - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/golden_heels.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/golden_heels.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootLightShoes - name: light shoes - description: Elegant shoes on a high heels. Made by company "Modeling Agency Dar-Vaxed". - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootWhiteSandals - name: white sandals - description: White sandals. #кто бы мог подумать. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi #спрайты от dion_clawed - - type: entity parent: ClothingShoesBaseButcherable id: ADTClothingFootBlackBoots @@ -346,77 +147,6 @@ - type: Clothing sprite: ADT/Clothing/Shoes/Boots/newmekka.rsi #спрайты от prazat911 -#New Year -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootElfBoots - name: elf boots - description: Warm boots to work in a house on north. - suffix: New Year - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/elf_boots.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/elf_boots.rsi #спрайты от dion_clawed - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootBootsSnowMaiden - name: snow maiden's boots - description: Warm boots of Snow Maiden. - suffix: New Year - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/snow_maiden.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/snow_maiden.rsi #спрайты от prazat911 - -#Вот это да, спортивные ботинки от @prazat911 - -- type: entity - parent: ClothingShoesBase - id: ADTClothingFootSportBoots - name: sport high boots - description: A boots to sport in cold seasons. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/sport_boots.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/sport_boots.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootSportRoseShoes - name: sport rose shoes - description: A pink sport shoes. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/sport_rose_shoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/sport_rose_shoes.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootSportStepSneakers - name: STEP sneakers "Ultra" - description: Mucho texto. #извините, час ночи, всё равно всё перепишется ftl файлом. - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/sport_step_sneakers.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/sport_step_sneakers.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClothingFootSportZetaCrocs #я полагаю, что это кроксы. - name: sport Zeta crocs - description: A green crocs by clothing series "Zeta" - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Boots/sport_zeta_crocs.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Boots/sport_zeta_crocs.rsi - #берцы СССП - type: entity @@ -484,3 +214,34 @@ enum.ToggleVisuals.Layer: True: {state: icon-on} False: {state: icon} + +- type: entity + parent: ClothingShoesBootsCombat + id: ADTClothingShoesBootsRavenFriskis + suffix: Only Friskis + name: raven boots + description: No English + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/raven_shoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/raven_shoes.rsi + clothingVisuals: + shoes: + - state: equipped-FEET + - state: equipped-FEET-unshaded + shader: unshaded + - type: NoSlip + +- type: entity + parent: ClothingShoesMilitaryBase + id: ADTClothingShoesKivchikBoots + suffix: Kivchik + name: boots of retribution + description: Black boots with metal inserts. Look reliable. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/kivchikset_boots.rsi + - type: Matchbox \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/halloween.yml deleted file mode 100644 index db2582e0d11..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/halloween.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTClownNightmareShoes - name: clown nightmare shoes - description: No way. - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Halloween/clownnightmareshoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Halloween/clownnightmareshoes.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ADTGreyClownPsyhoShoes - name: grey clown psyho shoes - description: grey clown psyho shoes - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Shoes/Halloween/greyclownshoes.rsi - - type: Clothing - sprite: ADT/Clothing/Shoes/Halloween/greyclownshoes.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml new file mode 100644 index 00000000000..4b125ba70a9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml @@ -0,0 +1,252 @@ +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingHandsWhiteHeels + name: White heels + description: Specially for your dress! + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/white_heels.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/white_heels.rsi + - type: NoSlip + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingHandsGoldHeels + name: Gold heels + description: Gold plated heels. How much does it cost? + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/gold_heels.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/gold_heels.rsi + - type: NoSlip + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClownNightmareShoes + name: clown nightmare shoes + description: No way. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Halloween/clownnightmareshoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Halloween/clownnightmareshoes.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTGreyClownPsyhoShoes + name: grey clown psyho shoes + description: grey clown psyho shoes + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Halloween/greyclownshoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Halloween/greyclownshoes.rsi + +#Pyotr + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingSandals + name: Sandals + description: pair of sandals + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/sandals.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/sandals.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsWhite + name: white footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/white_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/white_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsBlack + name: black footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/black_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/black_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsHighBlack + name: high black footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/blackhigh_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsHighWhite + name: high white footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/whitehigh_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsBrown + name: brown footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/brown_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWrapsHighBrown + name: brown white footwraps + description: Pair of pieces of clothing for those who are uncomfortable with ordinary shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka + state: icon + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/brownhigh_footwraps.rsi #спрайты от floppo4ka + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingAidanShoes + name: Aidan shoes + description: Aidan shoes + suffix: Personal + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/aidan_shoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/aidan_shoes.rsi + +#туфли и не только от Празата + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootGoldenHeels + name: golden heels + description: Specially for your dress! + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/golden_heels.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/golden_heels.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootLightShoes + name: light shoes + description: Elegant shoes on a high heels. Made by company "Modeling Agency Dar-Vaxed". + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/light_shoes.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootWhiteSandals + name: white sandals + description: White sandals. #кто бы мог подумать. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/white_sandals.rsi #спрайты от dion_clawed + +#Вот это да, спортивные ботинки от @prazat911 + +- type: entity + parent: ClothingShoesBase + id: ADTClothingFootSportBoots + name: sport high boots + description: A boots to sport in cold seasons. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/sport_boots.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/sport_boots.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootSportRoseShoes + name: sport rose shoes + description: A pink sport shoes. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/sport_rose_shoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/sport_rose_shoes.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootSportStepSneakers + name: STEP sneakers "Ultra" + description: Mucho texto. #извините, час ночи, всё равно всё перепишется ftl файлом. + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/sport_step_sneakers.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/sport_step_sneakers.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootSportZetaCrocs #я полагаю, что это кроксы. + name: sport Zeta crocs + description: A green crocs by clothing series "Zeta" + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/sport_zeta_crocs.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/sport_zeta_crocs.rsi + +#New Year +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootElfBoots + name: elf boots + description: Warm boots to work in a house on north. + suffix: New Year + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/elf_boots.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/elf_boots.rsi #спрайты от dion_clawed + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootBootsSnowMaiden + name: snow maiden's boots + description: Warm boots of Snow Maiden. + suffix: New Year + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Boots/snow_maiden.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Boots/snow_maiden.rsi #спрайты от prazat911 + + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml index 7ab96177bbd..519030a280d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml @@ -216,4 +216,77 @@ suffix: New Year components: - type: Sprite - sprite: ADT/Clothing/Underwear/panties_christmas.rsi #спрайты от prazat911 \ No newline at end of file + sprite: ADT/Clothing/Underwear/panties_christmas.rsi #спрайты от prazat911 + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearBottomPantiesMunsBlue + name: bluedshield boxers + description: Standard Nanotrasen underwear for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/muns_panties_blue.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearBottomPantiesMunsRed + name: bluedshield boxers + description: Standard Nanotrasen underwear for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/muns_panties_red.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearRedLacePanties + name: red lace panties + description: Red, lacy and, probably, very expensive. + components: + - type: Sprite + sprite: ADT/Clothing/Under/red_panties.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearBlackLacePanties + name: black lace panties + description: Black, lacy and, probably, very expensive. + components: + - type: Sprite + sprite: ADT/Clothing/Under/black_panties.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearWhiteComfyPanties + name: white comfy panties + description: White, very comfortable and with a pink bow. + components: + - type: Sprite + sprite: ADT/Clothing/Under/whitecomfy_panties.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTTelnyachkaUSSPUniform + name: t-shirt vest + description: A T-shirt with alternating horizontal white stripes and blue stripes + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/Top/telnyachka.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearBottomBoxersBlueshield + name: bluedshield boxers + description: Standard Nanotrasen underwear for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/blueshield_boxers.rsi + +- type: entity + parent: ClothingUnderwearBottomBase + id: ADTClothingUnderwearBottomPantiesBlueshield + name: bluedshield panties + description: Standard Nanotrasen underwear for female Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/blueshield_panties.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml index ada6e55a50f..2c684c8544e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml @@ -224,3 +224,41 @@ components: - type: Sprite sprite: ADT/Clothing/Underwear/Socks/stockings_heart.rsi #Спрайты от lunalita + +#Stockings + +- type: entity + parent: ClothingUnderwearSocksBase + id: ADTClothingUnderwearRedStockings + name: red stockings + description: Red lace stockings. Not for a standart shift + components: + - type: Sprite + sprite: ADT/Clothing/Under/red_stockings.rsi + +- type: entity + parent: ClothingUnderwearSocksBase + id: ADTClothingUnderwearBlackStockings + name: black stockings + description: Black lace stockings. Not for a standart shift + components: + - type: Sprite + sprite: ADT/Clothing/Under/black_stockings.rsi + +- type: entity + parent: ClothingUnderwearSocksBase + id: ADTClothingUnderwearWhiteStockings + name: white stockings + description: White lace stockings. With a pink bow + components: + - type: Sprite + sprite: ADT/Clothing/Under/white_stockings.rsi + +- type: entity + parent: ClothingUnderwearSocksBase + id: ADTClothingUnderSocksLiExEr + name: socks of LiExEr + description: Socks for programmers with a cutout for the sharp claws of the Vulpkanin! They smell like tangerines. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/Socks/socks_liexer.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml index aca9d96c257..10a2fa7e69e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml @@ -170,3 +170,58 @@ components: - type: Sprite sprite: ADT/Clothing/Underwear/Top/lace_bra.rsi + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopBraMunsBlue + name: blueshield bra + description: Standard Nanotrasen bra for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/muns_bra_blue.rsi + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopBraMunsRed + name: blueshield bra + description: Standard Nanotrasen bra for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/muns_bra_red.rsi + + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopLaceBraRed + name: red lace bra + description: Red, lacy and, probably, very expensive. + components: + - type: Sprite + sprite: ADT/Clothing/Under/red_bra.rsi + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopLaceBraBlack + name: black lace bra + description: Black, lacy and, probably, very expensive. + components: + - type: Sprite + sprite: ADT/Clothing/Under/black_bra.rsi + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopComfyWhiteBra + name: comfy white bra + description: White, very comfortable and with a pink bow + components: + - type: Sprite + sprite: ADT/Clothing/Under/whitecomfy_bra.rsi + +- type: entity + parent: ClothingUnderwearTopBase + id: ADTClothingUnderwearTopBraBlueshield + name: blueshield bra + description: Standard Nanotrasen bra for Blue Shield Officer. + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/blueshield_bra.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/USSP.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/USSP.yml deleted file mode 100644 index 85dc5ab5cec..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/USSP.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTTelnyachkaUSSPUniform - name: t-shirt vest - description: A T-shirt with alternating horizontal white stripes and blue stripes - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/Top/telnyachka.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/blueshield_underwear.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/blueshield_underwear.yml deleted file mode 100644 index a05136bd021..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/blueshield_underwear.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearBottomBoxersBlueshield - name: bluedshield boxers - description: Standard Nanotrasen underwear for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/blueshield_boxers.rsi - -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearBottomPantiesBlueshield - name: bluedshield panties - description: Standard Nanotrasen underwear for female Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/blueshield_panties.rsi - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopBraBlueshield - name: blueshield bra - description: Standard Nanotrasen bra for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/blueshield_bra.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/clothingmuns.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/clothingmuns.yml deleted file mode 100644 index 7e1fac7848d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/clothingmuns.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearBottomPantiesMunsBlue - name: bluedshield boxers - description: Standard Nanotrasen underwear for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/muns_panties_blue.rsi - -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearBottomPantiesMunsRed - name: bluedshield boxers - description: Standard Nanotrasen underwear for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/muns_panties_red.rsi - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopBraMunsBlue - name: blueshield bra - description: Standard Nanotrasen bra for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/muns_bra_blue.rsi - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopBraMunsRed - name: blueshield bra - description: Standard Nanotrasen bra for Blue Shield Officer. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/muns_bra_red.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/lace_underwear.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/lace_underwear.yml deleted file mode 100644 index 99aa3039e64..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/lace_underwear.yml +++ /dev/null @@ -1,86 +0,0 @@ -#Bottom - -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearRedLacePanties - name: red lace panties - description: Red, lacy and, probably, very expensive. - components: - - type: Sprite - sprite: ADT/Clothing/Under/red_panties.rsi - -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearBlackLacePanties - name: black lace panties - description: Black, lacy and, probably, very expensive. - components: - - type: Sprite - sprite: ADT/Clothing/Under/black_panties.rsi - -- type: entity - parent: ClothingUnderwearBottomBase - id: ADTClothingUnderwearWhiteComfyPanties - name: white comfy panties - description: White, very comfortable and with a pink bow. - components: - - type: Sprite - sprite: ADT/Clothing/Under/whitecomfy_panties.rsi - -#Top - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopLaceBraRed - name: red lace bra - description: Red, lacy and, probably, very expensive. - components: - - type: Sprite - sprite: ADT/Clothing/Under/red_bra.rsi - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopLaceBraBlack - name: black lace bra - description: Black, lacy and, probably, very expensive. - components: - - type: Sprite - sprite: ADT/Clothing/Under/black_bra.rsi - -- type: entity - parent: ClothingUnderwearTopBase - id: ADTClothingUnderwearTopComfyWhiteBra - name: comfy white bra - description: White, very comfortable and with a pink bow - components: - - type: Sprite - sprite: ADT/Clothing/Under/whitecomfy_bra.rsi - -#Stockings - -- type: entity - parent: ClothingUnderwearSocksBase - id: ADTClothingUnderwearRedStockings - name: red stockings - description: Red lace stockings. Not for a standart shift - components: - - type: Sprite - sprite: ADT/Clothing/Under/red_stockings.rsi - -- type: entity - parent: ClothingUnderwearSocksBase - id: ADTClothingUnderwearBlackStockings - name: black stockings - description: Black lace stockings. Not for a standart shift - components: - - type: Sprite - sprite: ADT/Clothing/Under/black_stockings.rsi - -- type: entity - parent: ClothingUnderwearSocksBase - id: ADTClothingUnderwearWhiteStockings - name: white stockings - description: White lace stockings. With a pink bow - components: - - type: Sprite - sprite: ADT/Clothing/Under/white_stockings.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/socks_liexer.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/socks_liexer.yml deleted file mode 100644 index 5326788f71a..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/socks_liexer.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - parent: ClothingUnderwearSocksBase - id: ADTClothingUnderSocksLiExEr - name: socks of LiExEr - description: Socks for programmers with a cutout for the sharp claws of the Vulpkanin! They smell like tangerines. - components: - - type: Sprite - sprite: ADT/Clothing/Underwear/Socks/socks_liexer.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/GorkaClothingset.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/GorkaClothingset.yml deleted file mode 100644 index 2160faa8937..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/GorkaClothingset.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: ADTClothingGorkaset - name: Gorkaset - description: "" - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Gorka_Clothing_set.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Gorka_Clothing_set.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.9 - Piercing: 0.85 - Heat: 0.8 - - type: GroupExamine diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index 75fe035ba3e..21739d3414f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -1304,4 +1304,338 @@ #map: [ "unfoldedLayer" ] #- state: icon_vest #map: ["foldedLayer"] - #visible: false \ No newline at end of file + #visible: false + +- type: entity + parent: ClothingUniformJumpsuitSec + id: ADTClothingUniformJumpsuitRavenFriskis + suffix: Only Friskis + name: security raven jumpsuit + description: A jumpsuit made of strong material, providing robust protection. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/raven_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/raven_suit.rsi + clothingVisuals: + jumpsuit: + - state: equipped-INNERCLOTHING + - state: equipped-INNERCLOTHING-unshaded + shader: unshaded + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformIlisium + name: Suit Ilisiom + description: Suit Ilisiom + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/uniform_ili.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformKivchikJumpskirt + suffix: Kivchik + name: black jumpsuit of retribution + description: Black jumpsuit with golden stripes and red bandage. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/kivchikset_skirt.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingGorkaset + name: Gorkaset + description: "" + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Gorka_Clothing_set.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Gorka_Clothing_set.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.8 + - type: GroupExamine + +- type: entity + parent: ClothingUniformBase + id: ADTCapitanUSSPUniform + name: the uniform of the captain of the SSS fleet + description: The standard casual uniform of a captain of the USSP Space Fleet. YOU'RE IN CHARGE HERE! unless, of course, there are people with a rank higher than you nearby... + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/capitan_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/capitan_USSP.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTAdmiralUSSPUniform + name: the uniform of the admiral of the SSS fleet + description: The standard casual uniform of a admiral of the USSP Space Fleet. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/admiral_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/admiral_USSP.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTFlotUSSPUniform + name: uniform of an officer of the SSS Fleet + description: The standard uniform of a field and staff officer of the Space Fleet of the USSP + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/flot_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/flot_USSP.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTPilotUSSPUniform + name: USSP pilot's uniform + description: Personal protective equipment for the pilot to counteract low pressure in case of cabin depressurization. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/pilot_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/pilot_USSP.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.9 + +- type: entity + parent: ClothingUniformBase + id: ADTSeniorUSSPUniform + name: the uniform of the petty officer of the USSP fleet + description: The standard daily uniform of senior officers of the USSP space Fleet, they mostly do not take part in combat operations, most often sit in headquarters and command junior officers. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/senior_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/senior_USSP.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTParatrooperUSSPUniform + name: the uniform of the USSP paratrooper + description: A set of clothes for Space Marines of the USSP + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/paratrooper_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/paratrooper_USSP.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTInfantrymanTUSSPUniform + name: the uniform of the SSP infantryman + description: A set of clothes for a Space marine USSP + suffix: USSP + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/infantryman_USSP.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/infantryman_USSP.rsi + +#halloween + +- type: entity + parent: ClothingUniformBase + id: ADTOtherworldClownCostume + name: otherworldly clown costume + description: A costume of an ancient being who came from another dimension to frighten people and feed on their fears... sounds like the work of a clown! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/otherworld_clown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/otherworld_clown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTBioMercUniform + name: bio-mercenary uniform + description: Congratulations, you were born in this world where the value of life is zero. In this world, everything is already rotten, and everything is in eternal stagnation, and there is no need to hurry and make the world better or worse. You can only exist in this world, saturated with hatred for everything. You are just a biomass among other biomass. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/bio_merc.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/bio_merc.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTJasonCostume + name: maniac costume + description: Wear a hockey player mask and kill the victims with a machete. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/jason.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/jason.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVyasovCostume + name: Vyasov costume + description: A nightmate on the Vyasov station! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vyasov.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vyasov.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHotlineMiamiUniform + name: student uniform + description: A legend told, that this uniform wear a Miami killer + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/hotlinemiami.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/hotlinemiami.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTServantOfEvilUniform + name: suit of the servant of evil + description: suit of the servant of evil + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/servant_evil.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/servant_evil.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTDudeShirt + name: dude's t-shirt + description: dude's t-shirt + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/dude_shirt.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/dude_shirt.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTSquidGameOrganizerSuit + name: squid game organizer suit + description: squid game organizer suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_org.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_org.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTSquidGamePlayerSuit + name: squid game player suit + description: squid game player suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_player.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_player.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTTagillaSuit + name: Tagilla pants + description: Tagilla pants + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/tagilla_pants.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/tagilla_pants.rsi + #- type: Storage + # capacity: 5 + +- type: entity + parent: ClothingUniformBase + id: ADTDJClownSuit + name: DJ clown suit + description: DJ clown suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/djclown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/djclown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVampireSuit + name: vampire suit + description: vampire suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vampire_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vampire_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVergileSuit + name: Vergile suit + description: Vergile suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vergile_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vergile_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTXenomorphSuit + name: xenomorph suit + description: xenomorph suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenMichaelMyersSuit + name: Michael Myers suit + description: Michael Myers suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/USSP.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/USSP.yml deleted file mode 100644 index 5f08fa09422..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/USSP.yml +++ /dev/null @@ -1,165 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: ADTCapitanUSSPUniform - name: the uniform of the captain of the SSS fleet - description: The standard casual uniform of a captain of the USSP Space Fleet. YOU'RE IN CHARGE HERE! unless, of course, there are people with a rank higher than you nearby... - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/capitan_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/capitan_USSP.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTAdmiralUSSPUniform - name: the uniform of the admiral of the SSS fleet - description: The standard casual uniform of a admiral of the USSP Space Fleet. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/admiral_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/admiral_USSP.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTFlotUSSPUniform - name: uniform of an officer of the SSS Fleet - description: The standard uniform of a field and staff officer of the Space Fleet of the USSP - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/flot_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/flot_USSP.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTPilotUSSPUniform - name: USSP pilot's uniform - description: Personal protective equipment for the pilot to counteract low pressure in case of cabin depressurization. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/pilot_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/pilot_USSP.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.9 - -- type: entity - parent: ClothingUniformBase - id: ADTSeniorUSSPUniform - name: the uniform of the petty officer of the USSP fleet - description: The standard daily uniform of senior officers of the USSP space Fleet, they mostly do not take part in combat operations, most often sit in headquarters and command junior officers. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/senior_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/senior_USSP.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTParatrooperUSSPUniform - name: the uniform of the USSP paratrooper - description: A set of clothes for Space Marines of the USSP - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/paratrooper_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/paratrooper_USSP.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBeretParatrooperUSSP - name: paratrooper's beret - description: The famous crimson beret of the USSP Space Marines. This beret is worn only by those who deserve to prove themselves in battle, it is the most honorable award for paratroopers along with a gold medal. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/paratrooper_beret_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/paratrooper_beret_USSP.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBeretOfTheArmedForcesoftheUSSP - name: beret of the armed forces of the USSP - description: An olive beret with the symbols of the Armed Forces of the USSP. This beret is a very honorable award for military personnel, a sign of professionalism and long service. They are often worn by commanders. - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/beret_of_the_armed_forces_of_the_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/beret_of_the_armed_forces_of_the_USSP.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBeretSpecialForcesUSSP - name: beret Special Forces USSP - description: A black beret with the symbols of the security forces of the Ministry of Internal Affairs of the USSP, which is awarded to elite troops and special forces, including special forces - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/beret_Special_Forces_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/beret_Special_Forces_USSP.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsAdmiralUSSPCap - name: the cap of the Admiral of the USSP fleet - description: A terribly clean and well-groomed cap. The obtrusive headdress of admirals in the space Fleet. - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/admiral_USSP_cap.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/admiral_USSP_cap.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsCaptainUSSPCap - name: the cap of the captain of the SSS fleet - description: The obtrusive headdress of captains in the space Fleet. - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/captain_USSP_cap.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/captain_USSP_cap.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatsOfficerUSSPCap - name: the cap of an officer of the USSP Space Fleet - description: An obligatory part of the uniform of a field and staff officer of the Space Fleet of the USSP. The cap has the emblem of the Space Forces of the USSP. - components: - - type: Tag - tags: # ignore "WhitelistChameleon" tag - - WhitelistChameleon - - type: Sprite - sprite: ADT/Clothing/Head/Hats/officer_USSP_cap.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/officer_USSP_cap.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTInfantrymanTUSSPUniform - name: the uniform of the SSP infantryman - description: A set of clothes for a Space marine USSP - suffix: USSP - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/infantryman_USSP.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/USSP/infantryman_USSP.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml deleted file mode 100644 index 72311e77825..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/halloween.yml +++ /dev/null @@ -1,181 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: ADTOtherworldClownCostume - name: otherworldly clown costume - description: A costume of an ancient being who came from another dimension to frighten people and feed on their fears... sounds like the work of a clown! - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/otherworld_clown.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/otherworld_clown.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTBioMercUniform - name: bio-mercenary uniform - description: Congratulations, you were born in this world where the value of life is zero. In this world, everything is already rotten, and everything is in eternal stagnation, and there is no need to hurry and make the world better or worse. You can only exist in this world, saturated with hatred for everything. You are just a biomass among other biomass. - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/bio_merc.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/bio_merc.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTJasonCostume - name: maniac costume - description: Wear a hockey player mask and kill the victims with a machete. - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/jason.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/jason.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTVyasovCostume - name: Vyasov costume - description: A nightmate on the Vyasov station! - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vyasov.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vyasov.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTHotlineMiamiUniform - name: student uniform - description: A legend told, that this uniform wear a Miami killer - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/hotlinemiami.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/hotlinemiami.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTServantOfEvilUniform - name: suit of the servant of evil - description: suit of the servant of evil - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/servant_evil.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/servant_evil.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTDudeShirt - name: dude's t-shirt - description: dude's t-shirt - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/dude_shirt.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/dude_shirt.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTSquidGameOrganizerSuit - name: squid game organizer suit - description: squid game organizer suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_org.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_org.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTSquidGamePlayerSuit - name: squid game player suit - description: squid game player suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_player.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/squid_player.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTTagillaSuit - name: Tagilla pants - description: Tagilla pants - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/tagilla_pants.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/tagilla_pants.rsi - #- type: Storage - # capacity: 5 - -- type: entity - parent: ClothingUniformBase - id: ADTDJClownSuit - name: DJ clown suit - description: DJ clown suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/djclown.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/djclown.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTVampireSuit - name: vampire suit - description: vampire suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vampire_suit.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vampire_suit.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTVergileSuit - name: Vergile suit - description: Vergile suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vergile_suit.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/vergile_suit.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTXenomorphSuit - name: xenomorph suit - description: xenomorph suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/xenomorph_suit.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTHalloweenMichaelMyersSuit - name: Michael Myers suit - description: Michael Myers suit - suffix: Halloween - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/michael_suit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml b/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml deleted file mode 100644 index b78557c45d6..00000000000 --- a/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml +++ /dev/null @@ -1,27 +0,0 @@ -#Chu-See - -- type: loadout - id: TrueDetectiveCoat - entity: ADTClothingOuterCoatTrueDetectivesCoat - sponsorOnly: true - whitelistJobs: [Detective] - -- type: loadout - id: TrueDetectiveJumpskirt - entity: ADTClothingUniformTrueDetectiveJumpskirt - sponsorOnly: true - whitelistJobs: [Detective] - -- type: loadout - id: TrueDetectiveHat - entity: ADTClothingHeadHatsTrueDetectiveHat - sponsorOnly: true - whitelistJobs: [Detective] - - -#Nova - -- type: loadout - id: NovaGloves - entity: ADTClothingHandsNovaGloves - sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml new file mode 100644 index 00000000000..49ecc4b20a5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -0,0 +1,23 @@ +- type: entity + parent: MarkerBase + id: ADTRandomNewYearDrinkSpawner + name: random new year drink spawner + suffix: New Year + components: + - type: Sprite + layers: + - state: green + - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon + - type: RandomSpawner + offset: 0 + prototypes: + - ADTMulledWineGlass + - ADTMulledWineColdGlass + - ADTChampagneMandarinGlass + - ADTChristmasMilkshakeGlass + - ADTTeaCinnamonLemonGlass + - ADTSbitenCinnamonLemonGlass + - ADTHotCocoaGlass + - ADTHotChocolateGlass + - ADTHotChocolateAllergicGlass \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml new file mode 100644 index 00000000000..47fc1159820 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -0,0 +1,29 @@ +#спавнер еды +- type: entity + parent: MarkerBase + id: ADTRandomNewYearFoodSpawner + name: random new year food spawner + suffix: New Year + components: + - type: Sprite + layers: + - state: green + - sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi + state: stick + - type: RandomSpawner + offset: 0 + prototypes: + - ADTFoodOlivierSalad + - ADTFoodJelliedMeat + - ADTFoodHerringUnderFurcoat + - ADTFoodMeatHam + - ADTFoodCakePudding + - ADTFoodCakePuddingChristmas + - ADTBoxNewYearSnack1 + - ADTBoxNewYearSnack2 + - ADTBoxNewYearSnack3 + - ADTFoodMeatChickenBaked + - ADTFoodMeatChickenBakedWithVegetables + - ADTFoodMeatChickenBakedWing + - ADTFoodMeatChickenBakedLeg + #chance: 0.7 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/halloween.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/halloween.yml new file mode 100644 index 00000000000..7ac454889c9 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/halloween.yml @@ -0,0 +1,23 @@ +- type: entity + parent: MarkerBase + id: ADTHelloweenPlantRandom + name: random helloween decor spawner + #decription: random helloween decor spawner + suffix: Helloween + components: + - type: Sprite + layers: + - state: red + - sprite: ADT/Structures/Furniture/potted_plant_helloween.rsi + state: plant1 + - type: RandomSpawner + offset: 0 + prototypes: + - ADTHalloweenPumpkinLight1 + - ADTHalloweenPumpkinLight2 + - ADTHalloweenPumpkinLight3 + - ADTHalloweenPumpkinLight4 + - ADTHalloweenPumpkinLight5 + - ADTHalloweenPottedPlant1 + - ADTHalloweenPottedPlant2 + chance: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/UristSpawn.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/human.yml similarity index 60% rename from Resources/Prototypes/ADT/Entities/Markers/Spawners/UristSpawn.yml rename to Resources/Prototypes/ADT/Entities/Markers/Spawners/human.yml index de62654694b..2f851daf72c 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/UristSpawn.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/human.yml @@ -14,4 +14,18 @@ layers: - state: green - sprite: Mobs/Animals/bat.rsi - state: bat \ No newline at end of file + state: bat + +- type: entity + name: Trader Spawnpoint + id: SpawnMobTrader + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: Markers/jobs.rsi + state: cargo_tech + - type: ConditionalSpawner + prototypes: + - Trader \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/manul.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/mobs.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Markers/Spawners/manul.yml rename to Resources/Prototypes/ADT/Entities/Markers/Spawners/mobs.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/soundgenerators.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/soundgenerators.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Misc/soundgenerators.yml rename to Resources/Prototypes/ADT/Entities/Markers/Spawners/soundgenerators.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ftl_point.yml b/Resources/Prototypes/ADT/Entities/Markers/shuttle.yml similarity index 61% rename from Resources/Prototypes/ADT/Entities/Objects/Misc/ftl_point.yml rename to Resources/Prototypes/ADT/Entities/Markers/shuttle.yml index c9723812308..41728de281b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/ftl_point.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/shuttle.yml @@ -1,6 +1,3 @@ -- type: Tag - id: ADTWinterPlanet - - type: entity id: ADTFTLPointWinterMap parent: MarkerBase @@ -15,3 +12,19 @@ #end-whitelist-for-winter-planet= - type: Sprite state: pink + +- type: entity + id: ADTFTLPointCentCom + parent: MarkerBase + name: Central Command FTL point + components: + # - whitelist: + # tags: + # - ADTNanoTrasen + - whitelist: + tags: + - ADTNanoTrasen + type: FTLDestination + #- type: FTLDestination + - type: Sprite + state: pink \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Capibara/Capibara.yml b/Resources/Prototypes/ADT/Entities/Mobs/Capibara/Capibara.yml deleted file mode 100644 index 7be3976c7d3..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Capibara/Capibara.yml +++ /dev/null @@ -1,71 +0,0 @@ -#- type: entity #TODO: xTray почините капибару -# name: Capibara -# parent: SimpleMobBase -# id: Capibara -# description: JustCapibara -# components: -# - type: Sprite -# drawdepth: Mobs -# sprite: ADT/Mobs/Capibara.rsi -# layers: -# - map: ["enum.DamageStateVisualLayers.Base"] -# state: capibara -# - type: Physics -# - type: Fixtures -# fixtures: -# fix1: -# shape: !type:PhysShapeCircle -# radius: 0.35 -# density: 30 -# mask: -# - MobMask -# layer: -# - MobLayer -# - type: Inventory -# speciesId: dog -# templateId: pet -# #- type: Strippable -## - type: UserInterface -## interfaces: -## - key: enum.StrippingUiKey.Key -## type: StrippableBoundUserInterface -# - type: DamageStateVisuals -# states: -# Alive: -# Base: capibara -# Critical: -# Base: capibara_dead -# Dead: -# Base: capibara_dead -# - type: Butcherable -# spawned: -# - id: FoodMeat -# amount: 2 -# - type: Bloodstream -# bloodMaxVolume: 300 -# - type: InteractionPopup -# interactSuccessString: petting-success-dog -# interactFailureString: petting-failure-generic -# interactSuccessSound: -# path: /Audio/Animals/small_dog_bark_happy.ogg -# - type: Grammar -# attributes: -# gender: epicene -# - type: SentienceTarget -# flavorKind: station-event-random-sentience-flavor-corgi -# - type: Puller -# - type: MobPrice -# price: 200 -# - type: Tag -# tags: -# - CannotSuicide -# -# - type: Capibara -# actionRaiseArmy: -# useDelay: 100 -# icon: ADT/Interface/Actions/capibaraborn.png -# name: capibara-born-name -# description: capibara-born-description -# itemIconStyle: NoItem -# event: !type:CapibaraRaiseArmyActionEvent -# hungerPerArmyUse: 5 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/borgi.yml b/Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borgi.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/borgi.yml rename to Resources/Prototypes/ADT/Entities/Mobs/Cyborgs/borgi.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Daniel/daniel.yml b/Resources/Prototypes/ADT/Entities/Mobs/Daniel/daniel.yml deleted file mode 100644 index 81bac3c9a8d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/Daniel/daniel.yml +++ /dev/null @@ -1,40 +0,0 @@ -- type: entity - name: Daniel' - parent: MobCat - id: ADTMobCatDaniel - description: A very important person in the legal department. - components: - - type: Sprite - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: daniel - sprite: ADT/Mobs/Animals/daniel.rsi - - type: DamageStateVisuals - states: - Alive: - Base: daniel - Critical: - Base: daniel_dead - Dead: - Base: daniel_dead - - type: NpcFactionMember - factions: - - PetsNT - - type: HTN - rootTask: - task: SimpleHostileCompound - - type: Grammar - attributes: - proper: true - gender: male - - type: Tag - tags: - - CannotSuicide - - VimPilot - - type: LanguageSpeaker # Frontier - speaks: - - Cat - understands: - - GalacticCommon - - Cat \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml deleted file mode 100644 index 263c701782e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/Hermit.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - noSpawn: true - name: Hermit - description: He looks shabby. - parent: MobHuman - id: MobHermit - components: - - type: GhostRole - name: ghost-role-information-hermit-name - description: ghost-role-information-hermit-description - - type: GhostTakeoverAvailable - - type: RandomHumanoidAppearance - - type: Loadout - prototypes: [ ADTHemritEquipment ] - - type: Icon - sprite: ADT/Mobs/Lavaland/hermit.rsi - state: fulls - -- type: entity - name: Hermit spawner - id: MobHermitSpawner - parent: MarkerBase - components: - - type: Sprite - layers: - - sprite: ADT/Markers/job.rsi - state: green - - sprite: ADT/Mobs/Lavaland/hermit.rsi - state: fulls - - type: ConditionalSpawner - prototypes: - - MobHermit - -- type: entity - parent: BaseSpeciesDummy - id: MobHermitDummy - noSpawn: true - description: A dummy hermit. - components: - - type: HumanoidAppearance - species: Human diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml new file mode 100644 index 00000000000..4d6dbf7b234 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml @@ -0,0 +1,221 @@ +- type: entity + name: Daniel' + parent: MobCat + id: ADTMobCatDaniel + description: A very important person in the legal department. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: daniel + sprite: ADT/Mobs/Animals/daniel.rsi + - type: DamageStateVisuals + states: + Alive: + Base: daniel + Critical: + Base: daniel_dead + Dead: + Base: daniel_dead + - type: NpcFactionMember + factions: + - PetsNT + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: Grammar + attributes: + proper: true + gender: male + - type: Tag + tags: + - CannotSuicide + - VimPilot + - type: LanguageSpeaker # Frontier + speaks: + - Cat + understands: + - GalacticCommon + - Cat + +- type: entity + name: New Year Gorilla + parent: [ SimpleMobBase, MobCombat ] + id: ADTMobGorillaNewYear + description: New Year Gorilla + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: newyeargorilla + sprite: ADT/Mobs/Animals/newyeargorilla.rsi + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.48 + density: 200 + mask: + - MobMask + layer: + - MobLayer + - type: DamageStateVisuals + states: + Alive: + Base: newyeargorilla + Dead: + Base: dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 4 + - id: ClothingHeadHatCargosoft + amount: 1 + - type: Bloodstream + bloodMaxVolume: 600 + - type: Puller + - type: InteractionPopup + successChance: 1 + interactSuccessString: petting-success-gorilla + interactFailureString: petting-failure-gorilla + - type: Tag + tags: + - CannotSuicide + - type: MobThresholds + thresholds: + 0: Alive + 900: Dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg + angle: 100 + attackRate: 1.2 + animation: WeaponArcFist + damage: + types: + Blunt: 15 + - type: StaminaDamageOnHit + damage: 100 + - type: Inventory + templateId: monkey + speciesId: monkey + - type: InventorySlots + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.8 + - type: NoSlip + - type: Speech + speechVerb: SmallMob + - type: TTS # Corvax-TTS + voice: Eugene + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Hands + - type: Body + prototype: Primate + requiredLegs: 1 # TODO: More than 1 leg + +- type: entity + name: New Year Buffrat + parent: ADTMobGorillaNewYear + id: ADTMobBuffratNewYear + description: New Year Buffrat + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: newyeargigarat + sprite: ADT/Mobs/Animals/newyeargigarat.rsi + scale: 1.2, 1.2 + - type: DamageStateVisuals + states: + Alive: + Base: newyeargigarat + Dead: + Base: dead + +- type: entity + name: manul + id: MobCatManul + parent: MobCat + description: It looks cute and fluffy manul. But it only looks.. + components: + - type: Sprite + sprite: ADT/Mobs/Animals/manul.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: manul_state + - type: DamageStateVisuals + states: + Alive: + Base: manul_state + Dead: + Base: manul_dead + - type: InteractionPopup + successChance: 0.9 + interactSuccessString: petting-success-cat + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/ADT/carakal_purr.ogg + interactFailureSound: + path: /Audio/ADT/carakal_hiss.ogg + - type: LanguageSpeaker + speaks: + - Cat + understands: + - GalacticCommon + - Cat + +- type: entity + name: wild pig + parent: MobPig + id: ADTMobWildPig + description: Oink. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: pig + sprite: ADT/Mobs/Animals/wild_pig.rsi + - type: Butcherable + spawned: + - id: FoodMeatBacon + amount: 3 + - id: FoodMeat + amount: 3 + - type: SentienceTarget + flavorKind: station-event-random-sentience-flavor-organic + - type: CanHostGuardian + - type: NPCRetaliation + attackMemoryLength: 10 + - type: FactionException + - type: NpcFactionMember + factions: + - Passive + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: MobThresholds + thresholds: + 0: Alive + 150: Dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg + angle: 100 + attackRate: 1.1 + animation: WeaponArcFist + damage: + types: + Blunt: 15 + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.8 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/drones.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/NPCs/DroneAntag.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/drones.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/human.yml similarity index 74% rename from Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/human.yml index 63ca4ab3915..78b073d7304 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/human.yml @@ -1,3 +1,45 @@ +- type: entity + noSpawn: true + name: Hermit + description: He looks shabby. + parent: MobHuman + id: MobHermit + components: + - type: GhostRole + name: ghost-role-information-hermit-name + description: ghost-role-information-hermit-description + - type: GhostTakeoverAvailable + - type: RandomHumanoidAppearance + - type: Loadout + prototypes: [ ADTHemritEquipment ] + - type: Icon + sprite: ADT/Mobs/Lavaland/hermit.rsi + state: fulls + +- type: entity + name: Hermit spawner + id: MobHermitSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - sprite: ADT/Markers/job.rsi + state: green + - sprite: ADT/Mobs/Lavaland/hermit.rsi + state: fulls + - type: ConditionalSpawner + prototypes: + - MobHermit + +- type: entity + parent: BaseSpeciesDummy + id: MobHermitDummy + noSpawn: true + description: A dummy hermit. + components: + - type: HumanoidAppearance + species: Human + - type: entity save: false name: Ash walker diff --git a/Resources/Prototypes/ADT/Entities/Mobs/HalloweenSlime/halloween_slime.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/HalloweenSlime/halloween_slime.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/xeno.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/xeno.yml rename to Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/cyb_pda.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/cyb_pda.yml deleted file mode 100644 index fc19fcd039f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/cyb_pda.yml +++ /dev/null @@ -1,123 +0,0 @@ -# - type: entity -# id: ADTSecurityCybPDABase -# abstract: true -# components: -# - type: MovedByPressure -# - type: InteractionOutline -# - type: MovedByPressure -# - type: Appearance -# - type: Sprite -# sprite: Objects/Devices/pda.rsi -# layers: -# - map: [ "enum.PdaVisualLayers.Base" ] -# - state: "light_overlay" -# map: [ "enum.PdaVisualLayers.Flashlight" ] -# shader: "unshaded" -# visible: false -# - state: "id_overlay" -# map: [ "enum.PdaVisualLayers.IdLight" ] -# shader: "unshaded" -# visible: false -# - type: Icon -# sprite: Objects/Devices/pda.rsi -# state: pda -# - type: Pda -# state: pda -# paiSlot: -# priority: -2 -# whitelist: -# components: -# - PAI -# penSlot: -# startingItem: Pen -# priority: -1 -# whitelist: -# tags: -# - Write -# idSlot: -# name: ID Card -# ejectSound: /Audio/Machines/id_swipe.ogg -# insertSound: /Audio/Machines/id_insert.ogg -# whitelist: -# components: -# - IdCard -# - type: Item -# size: Small -# - type: ContainerContainer -# containers: -# PDA-id: !type:ContainerSlot {} -# PDA-pen: !type:ContainerSlot {} -# PDA-pai: !type:ContainerSlot {} -# Cartridge-Slot: !type:ContainerSlot {} -# program-container: !type:Container -# - type: ItemSlots -# - type: Clothing -# quickEquip: false -# slots: -# - idcard -# - Belt -# - type: UnpoweredFlashlight -# - type: PointLight -# enabled: false -# radius: 1.5 -# softness: 5 -# autoRot: true -# - type: Ringer -# - type: DeviceNetwork -# deviceNetId: Wireless -# receiveFrequencyId: PDA -# prefix: device-address-prefix-console -# - type: WirelessNetworkConnection -# range: 500 -# - type: CartridgeLoader -# uiKey: enum.PdaUiKey.Key -# preinstalled: -# - CrewManifestCartridge -# - NotekeeperCartridge -# - NewsReadCartridge -# cartridgeSlot: -# priority: -1 -# name: Cartridge -# ejectSound: /Audio/Machines/id_swipe.ogg -# insertSound: /Audio/Machines/id_insert.ogg -# whitelist: -# components: -# - Cartridge -# - type: ActivatableUI -# key: enum.PdaUiKey.Key -# singleUser: true -# closeOnHandDeselect: false -# - type: UserInterface -# interfaces: -# - key: enum.PdaUiKey.Key -# type: PdaBoundUserInterface -# - key: enum.StoreUiKey.Key -# type: StoreBoundUserInterface -# - key: enum.RingerUiKey.Key -# type: RingerBoundUserInterface -# - key: enum.InstrumentUiKey.Key -# type: InstrumentBoundUserInterface -# - key: enum.HealthAnalyzerUiKey.Key -# type: HealthAnalyzerBoundUserInterface -# - type: CrewManifestViewer -# unsecure: true -# - type: Tag -# tags: -# - DoorBumpOpener -# - type: Input -# context: "human" - -- type: entity - parent: BasePDA - id: ADTSecurityCybPDA - name: security PDA - description: Red to hide the stains of passenger blood. - components: - #- type: Unremoveable - - type: Pda - id: ADTSecurityCybIDCard - state: pda-security - - type: PdaBorderColor - borderColor: "#A32D26" - - type: Icon - state: pda-security diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml deleted file mode 100644 index 8f43cfed351..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml +++ /dev/null @@ -1,12 +0,0 @@ -- 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 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml deleted file mode 100644 index 4423d57ed55..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/equipment.yml +++ /dev/null @@ -1,151 +0,0 @@ -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyCybSecurity - name: security encryption key - description: An encryption key used by security. - components: - - type: EncryptionKey - channels: - - Security - - Common - - Science - - Binary - defaultChannel: Security - - type: Sprite - layers: - - state: crypt_gray - - state: sec_label - -- type: entity - name: X-01 multiphas laser pistol - parent: BaseWeaponBatterySmall - id: ADtWeaponSecCyborg - description: new version of antique gun witout selfrcharge - components: - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 10 - - type: Sprite - sprite: ADT/Mobs/Silicon/Cyborg/cyb_gun.rsi - scale: 0.9, 0.9 - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-4 - visible: false - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Appearance - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - - type: Clothing - sprite: ADT/Mobs/Silicon/Cyborg/cyb_gun.rsi - - type: Gun - fireRate: 1.7 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - personable: true - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 60 - - type: BatteryWeaponFireModes - fireModes: - - proto: BulletDisabler - fireCost: 70 - - proto: ADTEmitterBoltCyb - fireCost: 140 - - proto: ADTAnomalousParticleOmegaStrongCyb - fireCost: 200 - - type: Battery - maxCharge: 2220 - startingCharge: 2220 - - -# - type: entity -# id: ADTADTClothingBackpackSecurityCybBase -# abstract: true -# parent: ContentsExplosionResistanceBase -# components: -# - type: Clothing -# quickEquip: false -# slots: -# - back -# - type: ContainerContainer -# containers: -# storagebase: !type:Container -# ents: [] -# - type: UserInterface -# interfaces: -# - key: enum.StorageUiKey.Key -# type: StorageBoundUserInterface -# - type: UseDelay -# delay: 0.5 -# - type: DamageExaminable -# - type: Tag -# tags: -# - WhitelistChameleon -# - type: Sprite -# sprite: Clothing/Back/Backpacks/ertleader.rsi -# - type: Storage -# grid: -# - 0,0,9,5 -# maxItemSize: Huge -# - type: ExplosionResistance -# damageCoefficient: 0.1 - -- type: entity - parent: ClothingBackpackERTLeader # ADTADTClothingBackpackSecurityCybBase - id: ADTClothingBackpackSecurityCyb - name: backpack cyborg - description: desc - components: - - type: Sprite - sprite: ADT/Clothing/Back/ertleader_cyb.rsi - - type: Unremoveable - - type: StorageFill - contents: - - id: ADTMagazineRifleFNFAL - - id: ADTMagazineRifleFNFAL - - id: ADTMagazineRifleFNFAL - - id: Flash - - id: JawsOfLife - - id: CombatKnife - - id: FlashlightSeclite - - id: GrenadeStinger - - id: GrenadeStinger - - id: GrenadeFlashBang - - id: GrenadeFlashBang - - id: ADTSecurityCybPDA - #- id: WelderIndustrialAdvanced - -# - type: entity -# parent: ADTClothingShoesBootsMagERT -# id: ADTClothingShoesBootsCybSec -# name: Boots cyborg -# description: desc -# components: -# - type: Unremoveable -# - type: Sprite -# sprite: ADT/Mobs/Silicon/Cyborg/advanced.rsi -# - type: Clothing -# sprite: ADT/Mobs/Silicon/Cyborg/advanced.rsi -# - type: Magboots -# # toggleAction: ActionToggleMagboots - -- type: entity - parent: ClothingNeckMantleHOSShoulder - id: ADTClothingNeckMantleHOSShoulderSecurityCyb - name: Mantle cyborg - description: desc - components: - - type: Sprite - sprite: ADT/Clothing/Neck/mantles/cybmantle_shoulder.rsi - - type: Clothing - sprite: ADT/Clothing/Neck/mantles/cybmantle_shoulder.rsi - clothingVisuals: - neck: - - state: equipped-NECK - - state: equipped-NECK-unshaded - shader: unshaded diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/identification_cards.yml deleted file mode 100644 index 503348740fb..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/identification_cards.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: CentcomIDCard #SecurityIDCard - id: ADTSecurityCybIDCard - name: "security cyborg ID card" - components: - - type: Sprite - layers: - - state: default - - state: idsecurityofficer - - type: PresetIdCard - job: ADTSecurityCyborg - - type: Access - groups: - - AllAccessCentcom - tags: - - CentralCommand - diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml deleted file mode 100644 index 4580060ace0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sounds.yml +++ /dev/null @@ -1,43 +0,0 @@ -- type: speechSounds - id: Metrocop - saySound: - path: /Audio/ADT/Footsteps/say/off2.ogg - askSound: - path: /Audio/ADT/Footsteps/say/off1.ogg - exclaimSound: - path: /Audio/ADT/Footsteps/say/off3.ogg - -- type: speechSounds - id: Combine - saySound: - path: /Audio/ADT/Footsteps/off2.ogg - askSound: - path: /Audio/ADT/Footsteps/off3.ogg - exclaimSound: - path: /Audio/ADT/Footsteps/off1.ogg - -- type: soundCollection - id: Metrocop - files: - - /Audio/ADT/Footsteps/say/off1.ogg - - /Audio/ADT/Footsteps/say/off2.ogg - - /Audio/ADT/Footsteps/say/off3.ogg - - /Audio/ADT/Footsteps/say/off4.ogg - -- type: soundCollection - id: SoldierDeath - files: - - /Audio/ADT/Footsteps/combine/die1.ogg - - /Audio/ADT/Footsteps/combine/die2.ogg - - /Audio/ADT/Footsteps/combine/die3.ogg - - /Audio/ADT/Footsteps/combine/die4.ogg - -- type: soundCollection - id: FootstepSoldier - files: - - /Audio/ADT/Footsteps/gear1.ogg - - /Audio/ADT/Footsteps/gear2.ogg - - /Audio/ADT/Footsteps/gear3.ogg - - /Audio/ADT/Footsteps/gear4.ogg - - /Audio/ADT/Footsteps/gear5.ogg - - /Audio/ADT/Footsteps/gear6.ogg diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml rename to Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/guards_of_newyear.yml b/Resources/Prototypes/ADT/Entities/Mobs/guards_of_newyear.yml deleted file mode 100644 index 93c7b4baee1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/guards_of_newyear.yml +++ /dev/null @@ -1,101 +0,0 @@ -- type: entity - name: New Year Gorilla - parent: [ SimpleMobBase, MobCombat ] - id: ADTMobGorillaNewYear - description: New Year Gorilla - components: - - type: Sprite - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: newyeargorilla - sprite: ADT/Mobs/Animals/newyeargorilla.rsi - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.48 - density: 200 - mask: - - MobMask - layer: - - MobLayer - - type: DamageStateVisuals - states: - Alive: - Base: newyeargorilla - Dead: - Base: dead - - type: Butcherable - spawned: - - id: FoodMeat - amount: 4 - - id: ClothingHeadHatCargosoft - amount: 1 - - type: Bloodstream - bloodMaxVolume: 600 - - type: Puller - - type: InteractionPopup - successChance: 1 - interactSuccessString: petting-success-gorilla - interactFailureString: petting-failure-gorilla - - type: Tag - tags: - - CannotSuicide - - type: MobThresholds - thresholds: - 0: Alive - 900: Dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg - angle: 100 - attackRate: 1.2 - animation: WeaponArcFist - damage: - types: - Blunt: 15 - - type: StaminaDamageOnHit - damage: 100 - - type: Inventory - templateId: monkey - speciesId: monkey - - type: InventorySlots - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4.8 - - type: NoSlip - - type: Speech - speechVerb: SmallMob - - type: TTS # Corvax-TTS - voice: Eugene - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Hands - - type: Body - prototype: Primate - requiredLegs: 1 # TODO: More than 1 leg - -- type: entity - name: New Year Buffrat - parent: ADTMobGorillaNewYear - id: ADTMobBuffratNewYear - description: New Year Buffrat - components: - - type: Sprite - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: newyeargigarat - sprite: ADT/Mobs/Animals/newyeargigarat.rsi - scale: 1.2, 1.2 - - type: DamageStateVisuals - states: - Alive: - Base: newyeargigarat - Dead: - Base: dead diff --git a/Resources/Prototypes/ADT/Entities/Mobs/manul.yml b/Resources/Prototypes/ADT/Entities/Mobs/manul.yml deleted file mode 100644 index 0753eafa04f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/manul.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - name: manul - id: MobCatManul - parent: MobCat - description: It looks cute and fluffy manul. But it only looks.. - components: - - type: Sprite - sprite: ADT/Mobs/Animals/manul.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: manul_state - - type: DamageStateVisuals - states: - Alive: - Base: manul_state - Dead: - Base: manul_dead - - type: InteractionPopup - successChance: 0.9 - interactSuccessString: petting-success-cat - interactFailureString: petting-failure-generic - interactSuccessSound: - path: /Audio/ADT/carakal_purr.ogg - interactFailureSound: - path: /Audio/ADT/carakal_hiss.ogg - - type: LanguageSpeaker - speaks: - - Cat - understands: - - GalacticCommon - - Cat \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml new file mode 100644 index 00000000000..768d6720bc6 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml @@ -0,0 +1,498 @@ +- type: entity + name: "Инженерный дрон" + id: engineeringdronealt + parent: PlayerSiliconBase + components: + - type: InnateTool + tools: + - id: trayScanner + - id: Omnitool + - id: WelderExperimental + - type: IntrinsicRadioTransmitter + channels: + - ADTSilicon + - Common + - Engineering + - type: ActiveRadio + channels: + - ADTSilicon + - Common + - Engineering + - type: IntrinsicRadioReceiver + - type: Access + tags: + - Engineering + - Atmospherics + - Maintenance + - External + - type: NameIdentifier + group: Drone + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + #- type: GhostTakeoverAvailable + # makeSentient: true + # name: Maintenance Drone + # description: Maintain the station. Ignore other beings except drones. + # rules: | + # You are bound by these laws both in-game and out-of-character: + # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. + # 2. You may not harm any being, regardless of intent or circumstance. + # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. + - type: MovementSpeedModifier + baseWalkSpeed : 5 + baseSprintSpeed : 5 + - type: Flashable + - type: NoSlip + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - type: SlowOnDamage + speedModifierThresholds: + 30: 0.7 + 50: 0.5 + - type: Temperature + heatDamageThreshold: 5000 + currentTemperature: 310.15 + specificHeat: 42 + heatDamage: + types: + Heat : 1 #per second, scales with temperature & other constants + - type: Sprite + drawdepth: Mobs + netsync: false + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: engineering_drone_alt + sprite: Mobs/Silicon/engineering_drone.rsi + - type: MovementIgnoreGravity + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: DamageStateVisuals + states: + Alive: + Base: engineering_drone_alt + Dead: + Base: dead_drone_alt + # - type: Appearance + # visuals: + # - type: GenericEnumVisualizer + # key: enum.DroneVisuals.Status + # layer: 0 + # states: + # enum.DroneStatus.Off: dead_drone_alt + # enum.DroneStatus.On: engineering_drone_alt + #- type: ReplacementAccent + # accent: silicon + - type: Repairable + fuelcost: 15 + doAfterDelay: 8 + - type: Actions + - type: TypingIndicator + proto: robot + - type: Speech + speechSounds: Pai + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + color: orange + - type: Tag + tags: + - ShoesRequiredStepTriggerImmune + - CannotSuicide + - DoorBumpOpener + - type: GhostTakeoverAvailable + makeSentient: true + name: Engineering Drone ALT + description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... + rules: Вы инженерный дрон, помогайте СИ. Вы не можете быть антагонистом! + +- type: entity + name: "Медицинский дрон" + id: medicaldronealt + parent: PlayerSiliconBase + components: + - type: InnateTool + tools: + - id: HandheldCrewMonitor + - id: HandheldHealthAnalyzer + - id: JawsOfLife + - id: Hypospray + - type: IntrinsicRadioTransmitter + channels: + - Common + - Medical + - ADTSilicon + - type: ActiveRadio + channels: + - Common + - Medical + - ADTSilicon + - type: IntrinsicRadioReceiver + - type: Access + tags: + - Medical + - Chemistry + - Maintenance + - External + - type: NameIdentifier + group: Drone + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + #- type: GhostTakeoverAvailable + # makeSentient: true + # name: Maintenance Drone + # description: Maintain the station. Ignore other beings except drones. + # rules: | + # You are bound by these laws both in-game and out-of-character: + # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. + # 2. You may not harm any being, regardless of intent or circumstance. + # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. + - type: MovementSpeedModifier + baseWalkSpeed : 5 + baseSprintSpeed : 5 + - type: Flashable + - type: NoSlip + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - type: SlowOnDamage + speedModifierThresholds: + 30: 0.7 + 50: 0.5 + - type: Temperature + heatDamageThreshold: 5000 + currentTemperature: 310.15 + specificHeat: 42 + heatDamage: + types: + Heat : 1 #per second, scales with temperature & other constants + - type: Sprite + drawdepth: Mobs + netsync: false + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: medical_drone_alt + sprite: Mobs/Silicon/medical_drone.rsi + - type: MovementIgnoreGravity + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: DamageStateVisuals + states: + Alive: + Base: medical_drone_alt + Dead: + Base: dead_drone_alt + # - type: Appearance + # visuals: + # - type: GenericEnumVisualizer + # key: enum.DroneVisuals.Status + # layer: 0 + # states: + # enum.DroneStatus.Off: dead_drone_alt + # enum.DroneStatus.On: medical_drone_alt + - type: Repairable + fuelcost: 15 + doAfterDelay: 8 + - type: Actions + - type: TypingIndicator + proto: robot + - type: Speech + speechSounds: Pai + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + color: cyan + - type: Tag + tags: + - ShoesRequiredStepTriggerImmune + - CannotSuicide + - DoorBumpOpener + - type: GhostTakeoverAvailable + makeSentient: true + name: Medical Drone ALT + description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... + rules: Вы медицинский дрон, помогайте СМО. Вы не можете быть антагонистом! + +- type: entity + name: "Сервисный робот" + id: foodDistributorBot + parent: PlayerSiliconBase + components: + #- type: Drone + - type: IntrinsicRadioTransmitter + channels: + - Common + - Service + - ADTSilicon + - type: ActiveRadio + channels: + - Common + - Service + - ADTSilicon + - type: IntrinsicRadioReceiver + - type: Access + tags: + - HeadOfPersonnel + - Bar + - Kitchen + - Hydroponics + - Service + - Janitor + - Theatre + - Chapel + - type: NameIdentifier + group: Drone + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Body + prototype: foodDistributorBots + - type: Inventory + speciesId: dog + templateId: foodDistributorBots + #- type: GhostTakeoverAvailable + # makeSentient: true + # name: Maintenance Drone + # description: Maintain the station. Ignore other beings except drones. + # rules: | + # You are bound by these laws both in-game and out-of-character: + # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. + # 2. You may not harm any being, regardless of intent or circumstance. + # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. + - type: MovementSpeedModifier + baseWalkSpeed : 2.5 + baseSprintSpeed : 2.5 + - type: Flashable + - type: NoSlip + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - type: SlowOnDamage + speedModifierThresholds: + 30: 0.7 + 50: 0.5 + - type: Temperature + heatDamageThreshold: 5000 + currentTemperature: 310.15 + specificHeat: 42 + heatDamage: + types: + Heat : 1 #per second, scales with temperature & other constants + - type: Sprite + drawdepth: Mobs + netsync: false + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: ["enum.DamageStateVisualLayers.Base"] + state: robot_food_distributor_bot + sprite: ADT/Mobs/Silicon/Bots/robot_food_distributor_bot.rsi + - type: MovementIgnoreGravity + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: DamageStateVisuals + states: + Alive: + Base: robot_food_distributor_bot + Dead: + Base: dead_bot + #- type: Appearance + # visuals: + # - type: GenericEnumVisualizer + # key: enum.DroneVisuals.Status + # layer: 0 + # states: + # enum.DroneStatus.Off: dead_bot + # enum.DroneStatus.On: robot_food_distributor_bot + #- type: ReplacementAccent + # accent: silicon + - type: Repairable + fuelcost: 25 + doAfterDelay: 8 + - type: Actions + - type: TypingIndicator + proto: robot + - type: Speech + speechSounds: Pai + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + color: Yellow + - type: Tag + tags: + - ShoesRequiredStepTriggerImmune + - CannotSuicide + - DoorBumpOpener + - type: GhostTakeoverAvailable + makeSentient: true + name: robot food distributor + description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... + rules: Вы сервисный робот, помогайте ГП. Вы не можете быть антагонистом! + +- type: entity + name: "Сервисный дрон" + id: servicedronealt + parent: PlayerSiliconBase + components: + #- type: Drone + - type: InnateTool + tools: + - id: Omnitool + - type: IntrinsicRadioTransmitter + channels: + - Common + - Service + - ADTSilicon + - type: ActiveRadio + channels: + - Common + - Service + - ADTSilicon + - type: IntrinsicRadioReceiver + - type: Access + tags: + - HeadOfPersonnel + - Bar + - Kitchen + - Hydroponics + - Service + - Janitor + - Theatre + - Chapel + - type: NameIdentifier + group: Drone + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + #- type: GhostTakeoverAvailable + # makeSentient: true + # name: Maintenance Drone + # description: Maintain the station. Ignore other beings except drones. + # rules: | + # You are bound by these laws both in-game and out-of-character: + # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. + # 2. You may not harm any being, regardless of intent or circumstance. + # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. + - type: MovementSpeedModifier + baseWalkSpeed : 5 + baseSprintSpeed : 5 + - type: Flashable + - type: NoSlip + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - type: SlowOnDamage + speedModifierThresholds: + 30: 0.7 + 50: 0.5 + - type: Temperature + heatDamageThreshold: 5000 + currentTemperature: 310.15 + specificHeat: 42 + heatDamage: + types: + Heat : 1 #per second, scales with temperature & other constants + - type: Sprite + drawdepth: Mobs + netsync: false + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: service_drone_alt + sprite: Mobs/Silicon/service_drone.rsi + - type: MovementIgnoreGravity + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 + mask: + - FlyingMobMask + layer: + - FlyingMobLayer + - type: DamageStateVisuals + states: + Alive: + Base: service_drone_alt + Dead: + Base: dead_drone_alt + # - type: Appearance + # visuals: + # - type: GenericEnumVisualizer + # key: enum.DroneVisuals.Status + # layer: 0 + # states: + # enum.DroneStatus.Off: dead_drone_alt + # enum.DroneStatus.On: service_drone_alt + #- type: ReplacementAccent + # accent: silicon + - type: Repairable + fuelcost: 15 + doAfterDelay: 8 + - type: Actions + - type: TypingIndicator + proto: robot + - type: Speech + speechSounds: Pai + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + color: Yellow + - type: Tag + tags: + - ShoesRequiredStepTriggerImmune + - CannotSuicide + - DoorBumpOpener + - type: GhostTakeoverAvailable + makeSentient: true + name: Service Drone ALT + description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... + rules: Вы сервисный дрон, помогайте ГП. Вы не можете быть антагонистом! diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml deleted file mode 100644 index 144e3aa76fb..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/engineeringdrone.yml +++ /dev/null @@ -1,122 +0,0 @@ -- type: entity - name: "Инженерный дрон" - id: engineeringdronealt - parent: PlayerSiliconBase - components: - - type: InnateTool - tools: - - id: trayScanner - - id: Omnitool - - id: WelderExperimental - - type: IntrinsicRadioTransmitter - channels: - - ADTSilicon - - Common - - Engineering - - type: ActiveRadio - channels: - - ADTSilicon - - Common - - Engineering - - type: IntrinsicRadioReceiver - - type: Access - tags: - - Engineering - - Atmospherics - - Maintenance - - External - - type: NameIdentifier - group: Drone - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - #- type: GhostTakeoverAvailable - # makeSentient: true - # name: Maintenance Drone - # description: Maintain the station. Ignore other beings except drones. - # rules: | - # You are bound by these laws both in-game and out-of-character: - # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. - # 2. You may not harm any being, regardless of intent or circumstance. - # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. - - type: MovementSpeedModifier - baseWalkSpeed : 5 - baseSprintSpeed : 5 - - type: Flashable - - type: NoSlip - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - type: SlowOnDamage - speedModifierThresholds: - 30: 0.7 - 50: 0.5 - - type: Temperature - heatDamageThreshold: 5000 - currentTemperature: 310.15 - specificHeat: 42 - heatDamage: - types: - Heat : 1 #per second, scales with temperature & other constants - - type: Sprite - drawdepth: Mobs - netsync: false - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: engineering_drone_alt - sprite: Mobs/Silicon/engineering_drone.rsi - - type: MovementIgnoreGravity - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - FlyingMobMask - layer: - - FlyingMobLayer - - type: DamageStateVisuals - states: - Alive: - Base: engineering_drone_alt - Dead: - Base: dead_drone_alt - # - type: Appearance - # visuals: - # - type: GenericEnumVisualizer - # key: enum.DroneVisuals.Status - # layer: 0 - # states: - # enum.DroneStatus.Off: dead_drone_alt - # enum.DroneStatus.On: engineering_drone_alt - #- type: ReplacementAccent - # accent: silicon - - type: Repairable - fuelcost: 15 - doAfterDelay: 8 - - type: Actions - - type: TypingIndicator - proto: robot - - type: Speech - speechSounds: Pai - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - color: orange - - type: Tag - tags: - - ShoesRequiredStepTriggerImmune - - CannotSuicide - - DoorBumpOpener - - type: GhostTakeoverAvailable - makeSentient: true - name: Engineering Drone ALT - description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... - rules: Вы инженерный дрон, помогайте СИ. Вы не можете быть антагонистом! - diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml deleted file mode 100644 index ab009d7bf75..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/medicaldrone.yml +++ /dev/null @@ -1,121 +0,0 @@ -- type: entity - name: "Медицинский дрон" - id: medicaldronealt - parent: PlayerSiliconBase - components: - - type: InnateTool - tools: - - id: HandheldCrewMonitor - - id: HandheldHealthAnalyzer - - id: JawsOfLife - - id: Hypospray - - type: IntrinsicRadioTransmitter - channels: - - Common - - Medical - - ADTSilicon - - type: ActiveRadio - channels: - - Common - - Medical - - ADTSilicon - - type: IntrinsicRadioReceiver - - type: Access - tags: - - Medical - - Chemistry - - Maintenance - - External - - type: NameIdentifier - group: Drone - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - #- type: GhostTakeoverAvailable - # makeSentient: true - # name: Maintenance Drone - # description: Maintain the station. Ignore other beings except drones. - # rules: | - # You are bound by these laws both in-game and out-of-character: - # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. - # 2. You may not harm any being, regardless of intent or circumstance. - # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. - - type: MovementSpeedModifier - baseWalkSpeed : 5 - baseSprintSpeed : 5 - - type: Flashable - - type: NoSlip - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - type: SlowOnDamage - speedModifierThresholds: - 30: 0.7 - 50: 0.5 - - type: Temperature - heatDamageThreshold: 5000 - currentTemperature: 310.15 - specificHeat: 42 - heatDamage: - types: - Heat : 1 #per second, scales with temperature & other constants - - type: Sprite - drawdepth: Mobs - netsync: false - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: medical_drone_alt - sprite: Mobs/Silicon/medical_drone.rsi - - type: MovementIgnoreGravity - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - FlyingMobMask - layer: - - FlyingMobLayer - - type: DamageStateVisuals - states: - Alive: - Base: medical_drone_alt - Dead: - Base: dead_drone_alt - # - type: Appearance - # visuals: - # - type: GenericEnumVisualizer - # key: enum.DroneVisuals.Status - # layer: 0 - # states: - # enum.DroneStatus.Off: dead_drone_alt - # enum.DroneStatus.On: medical_drone_alt - - type: Repairable - fuelcost: 15 - doAfterDelay: 8 - - type: Actions - - type: TypingIndicator - proto: robot - - type: Speech - speechSounds: Pai - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - color: cyan - - type: Tag - tags: - - ShoesRequiredStepTriggerImmune - - CannotSuicide - - DoorBumpOpener - - type: GhostTakeoverAvailable - makeSentient: true - name: Medical Drone ALT - description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... - rules: Вы медицинский дрон, помогайте СМО. Вы не можете быть антагонистом! - diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml rename to Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml deleted file mode 100644 index 72fdedf9bf9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone.yml +++ /dev/null @@ -1,131 +0,0 @@ -- type: entity - name: "Сервисный робот" - id: foodDistributorBot - parent: PlayerSiliconBase - components: - #- type: Drone - - type: IntrinsicRadioTransmitter - channels: - - Common - - Service - - ADTSilicon - - type: ActiveRadio - channels: - - Common - - Service - - ADTSilicon - - type: IntrinsicRadioReceiver - - type: Access - tags: - - HeadOfPersonnel - - Bar - - Kitchen - - Hydroponics - - Service - - Janitor - - Theatre - - Chapel - - type: NameIdentifier - group: Drone - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: Body - prototype: foodDistributorBots - - type: Inventory - speciesId: dog - templateId: foodDistributorBots - #- type: GhostTakeoverAvailable - # makeSentient: true - # name: Maintenance Drone - # description: Maintain the station. Ignore other beings except drones. - # rules: | - # You are bound by these laws both in-game and out-of-character: - # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. - # 2. You may not harm any being, regardless of intent or circumstance. - # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. - - type: MovementSpeedModifier - baseWalkSpeed : 2.5 - baseSprintSpeed : 2.5 - - type: Flashable - - type: NoSlip - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - type: SlowOnDamage - speedModifierThresholds: - 30: 0.7 - 50: 0.5 - - type: Temperature - heatDamageThreshold: 5000 - currentTemperature: 310.15 - specificHeat: 42 - heatDamage: - types: - Heat : 1 #per second, scales with temperature & other constants - - type: Sprite - drawdepth: Mobs - netsync: false - layers: - - map: [ "enum.HumanoidVisualLayers.Chest" ] - - map: [ "enum.HumanoidVisualLayers.Head" ] - - map: [ "enum.HumanoidVisualLayers.Snout" ] - - map: [ "enum.HumanoidVisualLayers.Eyes" ] - - map: ["enum.DamageStateVisualLayers.Base"] - state: robot_food_distributor_bot - sprite: ADT/Mobs/Silicon/Bots/robot_food_distributor_bot.rsi - - type: MovementIgnoreGravity - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - FlyingMobMask - layer: - - FlyingMobLayer - - type: DamageStateVisuals - states: - Alive: - Base: robot_food_distributor_bot - Dead: - Base: dead_bot - #- type: Appearance - # visuals: - # - type: GenericEnumVisualizer - # key: enum.DroneVisuals.Status - # layer: 0 - # states: - # enum.DroneStatus.Off: dead_bot - # enum.DroneStatus.On: robot_food_distributor_bot - #- type: ReplacementAccent - # accent: silicon - - type: Repairable - fuelcost: 25 - doAfterDelay: 8 - - type: Actions - - type: TypingIndicator - proto: robot - - type: Speech - speechSounds: Pai - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - color: Yellow - - type: Tag - tags: - - ShoesRequiredStepTriggerImmune - - CannotSuicide - - DoorBumpOpener - - type: GhostTakeoverAvailable - makeSentient: true - name: robot food distributor - description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... - rules: Вы сервисный робот, помогайте ГП. Вы не можете быть антагонистом! - diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml deleted file mode 100644 index 57c0cb4b9d7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/servicedrone_alt.yml +++ /dev/null @@ -1,125 +0,0 @@ -- type: entity - name: "Сервисный дрон" - id: servicedronealt - parent: PlayerSiliconBase - components: - #- type: Drone - - type: InnateTool - tools: - - id: Omnitool - - type: IntrinsicRadioTransmitter - channels: - - Common - - Service - - ADTSilicon - - type: ActiveRadio - channels: - - Common - - Service - - ADTSilicon - - type: IntrinsicRadioReceiver - - type: Access - tags: - - HeadOfPersonnel - - Bar - - Kitchen - - Hydroponics - - Service - - Janitor - - Theatre - - Chapel - - type: NameIdentifier - group: Drone - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - #- type: GhostTakeoverAvailable - # makeSentient: true - # name: Maintenance Drone - # description: Maintain the station. Ignore other beings except drones. - # rules: | - # You are bound by these laws both in-game and out-of-character: - # 1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone. - # 2. You may not harm any being, regardless of intent or circumstance. - # 3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals. - - type: MovementSpeedModifier - baseWalkSpeed : 5 - baseSprintSpeed : 5 - - type: Flashable - - type: NoSlip - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - type: SlowOnDamage - speedModifierThresholds: - 30: 0.7 - 50: 0.5 - - type: Temperature - heatDamageThreshold: 5000 - currentTemperature: 310.15 - specificHeat: 42 - heatDamage: - types: - Heat : 1 #per second, scales with temperature & other constants - - type: Sprite - drawdepth: Mobs - netsync: false - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: service_drone_alt - sprite: Mobs/Silicon/service_drone.rsi - - type: MovementIgnoreGravity - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 - mask: - - FlyingMobMask - layer: - - FlyingMobLayer - - type: DamageStateVisuals - states: - Alive: - Base: service_drone_alt - Dead: - Base: dead_drone_alt - # - type: Appearance - # visuals: - # - type: GenericEnumVisualizer - # key: enum.DroneVisuals.Status - # layer: 0 - # states: - # enum.DroneStatus.Off: dead_drone_alt - # enum.DroneStatus.On: service_drone_alt - #- type: ReplacementAccent - # accent: silicon - - type: Repairable - fuelcost: 15 - doAfterDelay: 8 - - type: Actions - - type: TypingIndicator - proto: robot - - type: Speech - speechSounds: Pai - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - color: Yellow - - type: Tag - tags: - - ShoesRequiredStepTriggerImmune - - CannotSuicide - - DoorBumpOpener - - type: GhostTakeoverAvailable - makeSentient: true - name: Service Drone ALT - description: You are an experimental mecha created by who-knows-what, all you know is that you have weapons and you detect fleshy moving targets nearby... - rules: Вы сервисный дрон, помогайте ГП. Вы не можете быть антагонистом! - diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml index bdb1fc06fd1..9944ce7679e 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml @@ -14,333 +14,4 @@ - type: GhostTakeoverAvailable - type: RandomHumanoidAppearance - type: Loadout - prototypes: [ Trader ] - -- type: entity - parent: BasePDA - id: TraderPDA - name: trader PDA - description: trader PDA - components: - - type: Sprite - sprite: ADT/Objects/Misc/trader_pda.rsi - - type: Pda - id: TraderIDCard - state: pda-tradertsf - -- type: entity - parent: IDCardStandard - id: TraderIDCard - name: TraderIDCard - description: TraderIDCard - components: - - type: Sprite - sprite: ADT/Objects/Misc/trader_id.rsi - layers: - - state: tsf - - state: idtrader_tsf - - type: IdCard - jobTitle: Торговец - - type: Access - tags: - - Trader - - External - -- type: radioChannel - id: Trader - name: chat-radio-trader - keycode: 'ф' - frequency: 1673 - color: "#b88646" - longRange: true - -- type: entity - parent: EncryptionKey - id: EncryptionKeyTrader - name: trader encryption key - description: An encryption key used by trader. - components: - - type: EncryptionKey - channels: - - Trader - defaultChannel: Trader - - type: Sprite - layers: - - state: crypt_gray - - state: cargo_label - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetTrader - name: trader headset - description: A headset used by trader. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyTrader - - EncryptionKeyCommon - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/trader.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/trader.rsi - -- type: entity - noSpawn: true - parent: ADTClothingBackpackDuffelDurathead - id: ClothingBackpackTraderFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampTrader - - id: AppraisalTool - - id: SpaceCash500 - - id: ADTClothingOuterCoatTrader - -- type: entity - name: Trader Spawnpoint - id: SpawnMobTrader - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - sprite: Markers/jobs.rsi - state: cargo_tech - - type: ConditionalSpawner - prototypes: - - Trader - -- type: entity - name: RandomTraderProduct - id: RandomTraderProduct - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - type: ConditionalSpawner - prototypes: - - AirCanister - - OxygenCanister - - LiquidOxygenCanister - - NitrogenCanister - - LiquidNitrogenCanister - - CarbonDioxideCanister - - LiquidCarbonDioxideCanister - - StorageCanister - - PlasmaCanister - - CrateHydroponicsSeedsExotic - - CrateHydroponicsSeedsMedicinal - - CrateHydroponicsTools - - CrateHydroponicsSeeds - - CratePlantBGone - - OreBox - - CrateCargoLuxuryHardsuit - - ADTCargoUtilisatorComplectCrate - - CrateCrewMonitoringBoards - - CrateEmergencyExplosive - - CrateEmergencyFire - - CrateEmergencyInternals - - CrateEmergencyInternalsLarge - - CrateEmergencyRadiation - - CrateEmergencyInflatablewall - - CrateSlimepersonLifeSupport - - CrateGenericBiosuit - - CrateEngineeringCableLV - - CrateEngineeringCableMV - - CrateEngineeringCableHV - - CrateEngineeringCableBulk - - CrateEngineeringElectricalSupplies - - CrateEngineeringStationBeaconBundle - - CrateEngineeringJetpack - - CrateEngineeringMiniJetpack - - CrateAirlockKit - - CrateEvaKit - - CrateRCDAmmo - - CrateRCD - - CrateParticleDecelerators - - CrateEngineeringVoidJetpack - - CrateEngineeringAMEJar - - CrateEngineeringSingularityGenerator - - CrateEngineeringSingularityContainment - - CrateEngineeringSingularityCollector - - CrateEngineeringParticleAccelerator - - CrateEngineeringSolar - - CrateEngineeringTeslaGenerator - - CrateEngineeringTeslaCoil - - CrateEngineeringTeslaGroundingRod - - CrateFoodPizza - - CrateFoodPizzaLarge - - CrateFoodMRE - - CrateFoodCooking - - CrateFoodDinnerware - - CrateFoodBarSupply - - CrateFoodSoftdrinks - - CrateFoodSoftdrinksLarge - - CrateFunInstrumentsVariety - - CrateFunInstrumentsBrass - - CrateFunInstrumentsString - - CrateFunInstrumentsWoodwind - - CrateFunInstrumentsKeyedPercussion - - CrateFunInstrumentsSpecial - - CrateFunArtSupplies - - CrateFunParty - - CrateFunWaterGuns - - CrateFunPlushie - - CrateFunLizardPlushieBulk - - CrateFunLightImplants - - CrateFunSadTromboneImplants - - CrateFunBoxing - - CrateFunPirate - - CrateFunToyBox - - CrateFunBikeHornImplants - - CrateFunMysteryFigurines - - CrateFunDartsSet - - CrateNPCBee - - CrateNPCButterflies - - CrateNPCCat - - CrateNPCChicken - - CrateNPCCrab - - CrateNPCDuck - - CrateNPCPuppyCorgi - - CrateNPCCow - - CrateNPCGoat - - CrateNPCGoose - - CrateNPCGorilla - - CrateNPCMonkeyCube - - CrateNPCKoboldCube - - CrateNPCMouse - - CrateNPCParrot - - CrateNPCPenguin - - CrateNPCPig - - CrateNPCSnake - - CrateNPCHamster - - CrateNPCLizard - - CrateNPCKangaroo - - CrateNPCMothroach - - CrateNPCCorgi - - CrateMaterialGlass - - CrateMaterialSteel - - CrateMaterialPlastic - - CrateMaterialPlasteel - - CrateMaterialTextiles - - CrateMaterialPlasma - - CrateMaterialCardboard - - CrateMaterialPaper - - WeldingFuelTankFull - - WaterTankFull - - CrateMedicalSupplies - - CrateChemistrySupplies - - CrateChemistryVials - - CrateEmergencyBurnKit - - CrateEmergencyToxinKit - - CrateEmergencyO2Kit - - CrateEmergencyBruteKit - - CrateEmergencyAdvancedKit - - CrateEmergencyRadiationKit - - CrateBodyBags - - CrateVirologyBiosuit - - CrateMindShieldImplants - - CrateChemistryP - - CrateChemistryS - - CrateChemistryD - - CrateArtifactContainer - - RandomArtifactSpawner - - CrateScienceBiosuit - - Thruster - - Gyroscope - - CrateServiceJanitorialSupplies - - CrateServiceReplacementLights - - CrateMousetrapBoxes - - CrateServiceTheatre - - CrateServiceSmokeables - - CrateServiceCustomSmokable - - CrateServiceBureaucracy - - CrateServicePersonnel - - CrateServiceBooks - - CrateServiceGuidebooks - - CrateServiceSodaDispenser - - CrateServiceBoozeDispenser - - CrateServiceBox - - CrateJanitorBiosuit - - FoodCartHot - - FoodCartCold - - PetCarrier - - CrateJanitorExplosive - -- type: entity - name: RandomTraderRareProduct - id: RandomTraderRareProduct - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - type: ConditionalSpawner - prototypes: - - WelderExperimental - - JawsOfLife - - RPED - - RCDEmpty - - RCDAmmo - - ClothingShoesBootsSpeed - - ClothingShoesBootsMagSci - - WeaponGauntletGorilla - - WeaponPistolCHIMP - - DeviceQuantumSpinInverter - - WeaponProtoKineticAccelerator - - WeaponTetherGun - - WeaponGrapplingGun - - WeaponForceGun - - MiningDrill - - PowerCellMicroreactor - - CrateCargoGambling - -- type: entity - name: RandomTraderArmory - id: RandomTraderArmory - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - type: ConditionalSpawner - prototypes: - - CrateArmorySMG - - CrateArmoryShotgun - - CrateTrackingImplants - - CrateTrainingBombs - - CrateArmoryLaser - - CrateArmoryPistols - - CrateSecurityArmor - - CrateSecurityHelmet - - CrateSecurityNonlethal - - CrateSecurityRiot - - CrateSecuritySupplies - - CrateRestraints - - CrateSecurityBiosuit - - CrateSecurityHardsuit - - CrateSecurityUSSPjuggernaut - -- type: entity - name: RandomTraderLoot - id: RandomTraderLoot - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - type: ConditionalSpawner - prototypes: - - ADTTallRobotFMekaCargo - - ADTTallRobotFMekaEng - - ADTTallRobotFMekaJani - - ADTTallRobotFMekaMed - - ADTTallRobotFMekaServe - - ADTTallRobotMekaCargo - - ADTTallRobotMekaEng - - ADTTallRobotMekaJani - - ADTTallRobotMekaMed - - ADTTallRobotMekaServe + prototypes: [ Trader ] \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/wild_animals.yml b/Resources/Prototypes/ADT/Entities/Mobs/wild_animals.yml deleted file mode 100644 index 54e2efab780..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/wild_animals.yml +++ /dev/null @@ -1,46 +0,0 @@ -- type: entity - name: wild pig - parent: MobPig - id: ADTMobWildPig - description: Oink. - components: - - type: Sprite - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: pig - sprite: ADT/Mobs/Animals/wild_pig.rsi - - type: Butcherable - spawned: - - id: FoodMeatBacon - amount: 3 - - id: FoodMeat - amount: 3 - - type: SentienceTarget - flavorKind: station-event-random-sentience-flavor-organic - - type: CanHostGuardian - - type: NPCRetaliation - attackMemoryLength: 10 - - type: FactionException - - type: NpcFactionMember - factions: - - Passive - - type: HTN - rootTask: - task: SimpleHostileCompound - - type: MobThresholds - thresholds: - 0: Alive - 150: Dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg - angle: 100 - attackRate: 1.1 - animation: WeaponArcFist - damage: - types: - Blunt: 15 - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 4.8 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml deleted file mode 100644 index 1d17e418785..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: DrinkCanBaseFull - id: ADTDrinkNoStopCan - name: No Stop Can - description: No Stop Can - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: EnergyDrink - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/nostop.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cherry_exquisite_wine.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cherry_exquisite_wine.yml deleted file mode 100644 index ae0e0d792ea..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cherry_exquisite_wine.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: ADTCherryExquisiteWine - name: cherry-exq-wine-name - description: cherry-exq-wine-desc - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTCherryExquisiteWine - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/cherryexquisitewineglass.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/chocodrink_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/chocodrink_glass.yml deleted file mode 100644 index a433053cf58..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/chocodrink_glass.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: ADTChocolateGlass - name: hot choco - description: A heated drink consisting chocolate. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTChocolateDrink - Quantity: 30 - - type: Sprite - sprite: Objects/Consumable/Drinks/chocolateglass.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cocoa_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cocoa_glass.yml deleted file mode 100644 index dff74b9204f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cocoa_glass.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: ADTDrinkCocoaGlass - name: hot cocoa - description: A heated drink consisting cocoa powder. - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTCocoaDrink - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_and_teapot.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_and_teapot.yml deleted file mode 100644 index 156c9ecdeab..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_and_teapot.yml +++ /dev/null @@ -1,41 +0,0 @@ -# короче, в игре есть вот это всё, но оно изначально с чаем. -# чтобы не обломать автомат по разлитию кофе и некоторые карты, на которых спавнится чайник, я делаю это. - -- type: entity - parent: DrinkBaseCup - id: ADTDrinkTeacup - name: Teacup - description: A plain white porcelain teacup. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 20 - - type: Sprite - sprite: Objects/Consumable/Drinks/teacup.rsi - layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 4 - fillBaseName: icon- - - type: Item - size: Tiny - -- type: entity - parent: DrinkGlassBase - id: ADTDrinkTeapot - name: teapot - description: An elegant teapot. It simply oozes class. - suffix: Пустой - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 - - type: Item - size: Normal - - type: Sprite - sprite: Objects/Consumable/Drinks/teapot.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_tea.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_tea.yml deleted file mode 100644 index a8efd3641d1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cup_tea.yml +++ /dev/null @@ -1,74 +0,0 @@ -- type: entity - parent: DrinkBaseCup - id: ADTDrinkChamotea - name: chamomile tea - description: Soothing tea. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Chamotea - Quantity: 20 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/chamomile-tea.rsi - layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 4 - fillBaseName: icon- - - type: TrashOnSolutionEmpty - solution: drink - -- type: entity - parent: DrinkBaseCup - id: ADTDrinkKarkadetea - name: karkade tea - description: Karkade tea will help calm the nervous system, as well as activate brain activity. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Karkadetea - Quantity: 20 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/karkade-tea.rsi - layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 4 - fillBaseName: icon- - - type: TrashOnSolutionEmpty - solution: drink - -- type: entity - parent: DrinkBaseCup - id: ADTDrinkLemontea - name: lemon tea - description: Tea with lemon, literally hot water with lemon. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Lemontea - Quantity: 20 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/lemon-tea.rsi - layers: - - state: icon-0 - - map: ["enum.SolutionContainerLayers.Fill"] - state: icon-4 - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 4 - fillBaseName: icon- - - type: TrashOnSolutionEmpty - solution: drink \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/just_kekc_cocktails_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml similarity index 59% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/just_kekc_cocktails_glass.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index 893faba32d9..dae2029420c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/just_kekc_cocktails_glass.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -431,3 +431,287 @@ - type: Sprite sprite: ADT/Objects/Consumable/Drinks/cosmopolitan.rsi state: icon + +- type: entity + parent: DrinkGlassBase + id: ADTMulledWineGlass + name: mulled-wine-name + description: mulled-wine-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTMulledWine + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine + +- type: entity + parent: DrinkGlassBase + id: ADTMulledWineColdGlass + name: mulled-wine-cold-name + description: mulled-wine-cold-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTMulledWineCold + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine_cold + +- type: entity + parent: DrinkGlassBase + id: ADTChampagneMandarinGlass + name: champagne-mandarin-name + description: champagne-mandarin-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTChampagneMandarin + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: champagne_mandarin + +- type: entity + parent: DrinkGlassBase + id: ADTChristmasMilkshakeGlass + name: christmas-milkshake-name + description: christmas-milkshake-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTChristmasMilkshake + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: christmas_milkshake + +- type: entity + parent: DrinkGlassBase + id: ADTTeaCinnamonLemonGlass + name: tea-cinnamon-lemon-name + description: tea-cinnamon-lemon-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTeaCinnamonLemon + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: warm_tea_cinnamon_lemon + +- type: entity + parent: DrinkGlassBase + id: ADTSbitenCinnamonLemonGlass + name: sbiten-cinnamon-lemon-name + description: sbiten-cinnamon-lemon-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSbitenCinnamonLemon + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon + +- type: entity + parent: DrinkGlassBase + id: ADTHotCocoaGlass + name: hot-cocoa-name + description: hot-cocoa-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotCocoa + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_cocoa + +- type: entity + parent: DrinkGlassBase + id: ADTHotChocolateGlass + name: hot-chocolate-name + description: hot-chocolate-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotChocolate + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + +- type: entity + parent: DrinkGlassBase + id: ADTHotChocolateAllergicGlass + name: hot-chocolate-name-allergic + description: hot-chocolate-desc-allergic + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotChocolateAllergic + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + +- type: entity + parent: DrinkGlassBase + id: ADTVodkaAntivirusGlass + name: vodka-antivirus-name + description: vodka-antivirus-desc + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTVodkaAntivirus + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/vodka_antivirusglass.rsi + state: icon + +- type: entity + parent: DrinkGlassBase + id: ADTCherryExquisiteWine + name: cherry-exq-wine-name + description: cherry-exq-wine-desc + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCherryExquisiteWine + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/cherryexquisitewineglass.rsi + state: icon + +- type: entity + parent: DrinkGlassBase + id: ADTChocolateGlass + name: hot choco + description: A heated drink consisting chocolate. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTChocolateDrink + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/chocolateglass.rsi + +- type: entity + parent: DrinkGlassBase + id: ADTDrinkCocoaGlass + name: hot cocoa + description: A heated drink consisting cocoa powder. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCocoaDrink + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + +# короче, в игре есть вот это всё, но оно изначально с чаем. +# чтобы не обломать автомат по разлитию кофе и некоторые карты, на которых спавнится чайник, я делаю это. + +- type: entity + parent: DrinkBaseCup + id: ADTDrinkTeacup + name: Teacup + description: A plain white porcelain teacup. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + - type: Sprite + sprite: Objects/Consumable/Drinks/teacup.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- + - type: Item + size: Tiny + +- type: entity + parent: DrinkGlassBase + id: ADTDrinkTeapot + name: teapot + description: An elegant teapot. It simply oozes class. + suffix: Пустой + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + - type: Item + size: Normal + - type: Sprite + sprite: Objects/Consumable/Drinks/teapot.rsi + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drink_bottles.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_bottles.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drink_bottles.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_bottles.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/hell_energy.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml similarity index 64% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/hell_energy.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml index f58cf61eb06..93a23f24657 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/hell_energy.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -22,3 +22,19 @@ sprite: ADT/Objects/Consumable/Drinks/hell_energy.rsi - type: Item sprite: ADT/Objects/Consumable/Drinks/hell_energy.rsi + +- type: entity + parent: DrinkCanBaseFull + id: ADTDrinkNoStopCan + name: No Stop Can + description: No Stop Can + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: EnergyDrink + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/nostop.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/juices_carton.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_carton.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/juices_carton.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_carton.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/oktoberfest.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cups.yml similarity index 64% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/oktoberfest.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 0be83dd0e5f..266bbed9559 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/oktoberfest.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -1,3 +1,78 @@ +- type: entity + parent: DrinkBaseCup + id: ADTDrinkChamotea + name: chamomile tea + description: Soothing tea. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Chamotea + Quantity: 20 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/chamomile-tea.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- + - type: TrashOnSolutionEmpty + solution: drink + +- type: entity + parent: DrinkBaseCup + id: ADTDrinkKarkadetea + name: karkade tea + description: Karkade tea will help calm the nervous system, as well as activate brain activity. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Karkadetea + Quantity: 20 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/karkade-tea.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- + - type: TrashOnSolutionEmpty + solution: drink + +- type: entity + parent: DrinkBaseCup + id: ADTDrinkLemontea + name: lemon tea + description: Tea with lemon, literally hot water with lemon. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Lemontea + Quantity: 20 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/lemon-tea.rsi + layers: + - state: icon-0 + - map: ["enum.SolutionContainerLayers.Fill"] + state: icon-4 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: icon- + - type: TrashOnSolutionEmpty + solution: drink + - type: entity parent: DrinkGlassBase id: ADTGoldenAleGlass @@ -291,158 +366,14 @@ types: Blunt: 10 -#пивные бочонки -- type: entity - parent: StorageTank - id: ADTBeerTank - name: beer tank - description: beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: Beer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: beer - -- type: entity - parent: StorageTank - id: ADTBeerTankGoldenAle - name: golden ale tank - description: golden ale tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTGoldenAle - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: goldenale - -- type: entity - parent: StorageTank - id: ADTBeerTankSausage - name: sausage beer tank - description: sausage beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTSausageBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: sausagebeer - -- type: entity - parent: StorageTank - id: ADTBeerTankTechno - name: techno beer tank - description: techno beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTTechnoBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: technobeer - -- type: entity - parent: StorageTank - id: ADTBeerTankClassicPaulaner - name: paulaner beer tank - description: paulaner beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTClassicPaulanerBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: paulanerbeer - -- type: entity - parent: StorageTank - id: ADTBeerTankLivsey - name: livsey beer tank - description: livsey beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTLivseyBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: livseybeer - -- type: entity - parent: StorageTank - id: ADTBeerTankLuckyJonny - name: lucky jonny beer tank - description: lucky jonny beer tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTLuckyJonnyBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: luckyjonnybeer - - type: entity - parent: StorageTank - id: ADTBeerTankSecUnfiltered - name: sec unfiltered beer tank - description: sec unfiltered beer tank - suffix: Oktoberfest + parent: DrinkBaseMug + id: ADTUSSPMug + name: ussp mug + description: A metal mug. You're not sure which metal. components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTSecUnfilteredBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: secunfilteredbeer - -- type: entity - parent: StorageTank - id: ADTBeerTankGlyphidStout - name: glyphid stout tank - description: glyphid stout tank - suffix: Oktoberfest - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: ADTGlyphidStoutBeer - Quantity: 1500 - - type: Sprite - sprite: ADT/Structures/Storage/beertank.rsi - state: glyphidstout - - + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/ussp_cup.rsi + - type: PhysicalComposition + materialComposition: + Steel: 25 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ArmyFlask.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ArmyFlask.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_flasks.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/DrinkJugs.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_jugs.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/DrinkJugs.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_jugs.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml deleted file mode 100644 index 2f7c9ced660..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/new_year.yml +++ /dev/null @@ -1,194 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: ADTMulledWineGlass - name: mulled-wine-name - description: mulled-wine-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTMulledWine - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: mulled_wine - -- type: entity - parent: DrinkGlassBase - id: ADTMulledWineColdGlass - name: mulled-wine-cold-name - description: mulled-wine-cold-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTMulledWineCold - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: mulled_wine_cold - -- type: entity - parent: DrinkGlassBase - id: ADTChampagneMandarinGlass - name: champagne-mandarin-name - description: champagne-mandarin-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTChampagneMandarin - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: champagne_mandarin - -- type: entity - parent: DrinkGlassBase - id: ADTChristmasMilkshakeGlass - name: christmas-milkshake-name - description: christmas-milkshake-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTChristmasMilkshake - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: christmas_milkshake - -- type: entity - parent: DrinkGlassBase - id: ADTTeaCinnamonLemonGlass - name: tea-cinnamon-lemon-name - description: tea-cinnamon-lemon-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTTeaCinnamonLemon - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: warm_tea_cinnamon_lemon - -- type: entity - parent: DrinkGlassBase - id: ADTSbitenCinnamonLemonGlass - name: sbiten-cinnamon-lemon-name - description: sbiten-cinnamon-lemon-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTSbitenCinnamonLemon - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: sbiten_cinnamon_lemon - -- type: entity - parent: DrinkGlassBase - id: ADTHotCocoaGlass - name: hot-cocoa-name - description: hot-cocoa-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTHotCocoa - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_cocoa - -- type: entity - parent: DrinkGlassBase - id: ADTHotChocolateGlass - name: hot-chocolate-name - description: hot-chocolate-desc - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTHotChocolate - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_chocolate - -- type: entity - parent: DrinkGlassBase - id: ADTHotChocolateAllergicGlass - name: hot-chocolate-name-allergic - description: hot-chocolate-desc-allergic - suffix: New Year - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTHotChocolateAllergic - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_chocolate - -- type: entity - parent: MarkerBase - id: ADTRandomNewYearDrinkSpawner - name: random new year drink spawner - suffix: New Year - components: - - type: Sprite - layers: - - state: green - - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: sbiten_cinnamon_lemon - - type: RandomSpawner - offset: 0 - prototypes: - - ADTMulledWineGlass - - ADTMulledWineColdGlass - - ADTChampagneMandarinGlass - - ADTChristmasMilkshakeGlass - - ADTTeaCinnamonLemonGlass - - ADTSbitenCinnamonLemonGlass - - ADTHotCocoaGlass - - ADTHotChocolateGlass - - ADTHotChocolateAllergicGlass diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/trash_drinks.yml new file mode 100644 index 00000000000..316c335b557 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -0,0 +1 @@ +# У официалов все странно очень с этим, вроде тут алкашка а вроде не алкашка,вроде картонки. Определил категорию по наследованию DrinkBottleBaseEmpty и DrinkCartonBaseEmpty \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml deleted file mode 100644 index 66f70665fa5..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/ussp_mug.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - parent: DrinkBaseMug - id: ADTUSSPMug - name: ussp mug - description: A metal mug. You're not sure which metal. - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/ussp_cup.rsi - - type: PhysicalComposition - materialComposition: - Steel: 25 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/vodka_antivirus.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/vodka_antivirus.yml deleted file mode 100644 index a7e504628be..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/vodka_antivirus.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: ADTVodkaAntivirusGlass - name: vodka-antivirus-name - description: vodka-antivirus-desc - components: - - type: Drink - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTVodkaAntivirus - Quantity: 30 - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/vodka_antivirusglass.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml new file mode 100644 index 00000000000..4f46fd095cd --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -0,0 +1,41 @@ +- type: entity + name: chocolate cake + parent: FoodCakeBase + id: ADTFoodCakeChocolateHeart + description: A cake with added chocolate. + components: + - type: Sprite + state: chocolate_heart + - type: SliceableFood + slice: ADTFoodCakeChocolateHeartSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + +- type: entity + name: slice of chocolate cake + parent: FoodCakeSliceBase + id: ADTFoodCakeChocolateHeartSlice + components: + - type: Sprite + state: chocolate-slice-heart + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Theobromine + Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donut.yml new file mode 100644 index 00000000000..f54bd2555a5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -0,0 +1,83 @@ +- type: entity + name: brown eclair + parent: FoodDonutBase + id: ADTFoodEclairBrown + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_brown + +- type: entity + name: chocolate eclair + parent: FoodDonutBase + id: ADTFoodEclairChocolate + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_chocolate + +- type: entity + name: pink eclair + parent: FoodDonutBase + id: ADTFoodEclairPink + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_pink + +- type: entity + name: white eclair + parent: FoodDonutBase + id: ADTFoodEclairWhite + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_white + +- type: entity + name: banana in chocolate + parent: FoodDonutBase + id: ADTFoodBananChocolate + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - banana + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi + state: in-dark-choco + +- type: entity + name: banana in pink chocolate + parent: FoodDonutBase + id: ADTFoodBananChocolatePink + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - banana + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi + state: in-pink-choco diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml new file mode 100644 index 00000000000..444a643b963 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -0,0 +1,97 @@ +- type: entity + name: pumpkin pie + parent: FoodPieBase + id: ADTFoodPiePumpkin + description: A pie containing sweet, sweet love... and pumpkin. + components: + - type: FlavorProfile + flavors: + - sweet + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/pumpkin_pie.rsi + state: pumpkin_pie + - type: SliceableFood + slice: ADTFoodPiePumpkinSlice + - type: Tag + tags: + - Fruit + - Pie + +- type: entity + name: slice of pumpkin pie + parent: FoodPieSliceBase + id: ADTFoodPiePumpkinSlice + components: + - type: FlavorProfile + flavors: + - sweet + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/pumpkin_pie.rsi + state: slice + - type: Tag + tags: + - Fruit + - Pie + +- type: entity + name: ham + parent: FoodMeatBase + id: ADTFoodMeatHam + description: ham + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + - state: plate + - state: ham + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 18 + - ReagentId: Protein + Quantity: 6 + - type: SliceableFood + count: 6 + slice: ADTFoodMeatHamPiece + - type: Item + size: Normal + - type: Food + transferAmount: 4 + trash: FoodPlate + +- type: entity + name: ham piece + parent: FoodMeatBase + id: ADTFoodMeatHamPiece + description: ham piece + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + - state: hampiece + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 1 + - type: Item + size: Normal + - type: Food + transferAmount: 6 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml new file mode 100644 index 00000000000..d8c94fbb13c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml @@ -0,0 +1,155 @@ +- type: entity + parent: [ BoxCardboard, BaseBagOpenClose ] + id: ADTFoodBoxEclairs + name: eclairs obx + description: Mmm, Eclairs. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: box + layers: + - state: box + - state: box-open + map: ["openLayer"] + visible: false + - state: eclairs_1 + map: ["eclairs_1"] + visible: false + - state: eclairs_2 + map: ["eclairs_2"] + visible: false + - state: eclairs_3 + map: ["eclairs_3"] + visible: false + - state: eclairs_4 + map: ["eclairs_4"] + visible: false + - type: Storage + grid: + - 0,0,3,0 + whitelist: + tags: + - Donut + - type: Item + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + size: Small + # heldPrefix: box + - type: StorageFill + contents: + - id: ADTFoodEclairBrown + amount: 1 + - id: ADTFoodEclairChocolate + amount: 1 + - id: ADTFoodEclairWhite + amount: 1 + - id: ADTFoodEclairPink + amount: 1 + - type: ItemCounter + count: + tags: [Donut] + composite: true + layerStates: + - eclairs_1 + - eclairs_2 + - eclairs_3 + - eclairs_4 + - type: Appearance + +#Коробки со сладостями + +- type: entity + id: ADTBoxNewYearSnack1 + parent: BaseStorageItem + name: new year snackbox 1 + description: new year snackbox 1 + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi + state: box1 + - type: Item + size: Large + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,3 + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: PhysicalComposition + materialComposition: + Cardboard: 100 + - type: StorageFill + contents: + - id: ADTFoodSnackAtmosCake + amount: 1 + - id: ADTFoodSnackBotanicCake + amount: 1 + - id: ADTFoodSnackCargoCake + amount: 2 + - id: ADTFoodSnackChefCake + amount: 1 + - id: ADTFoodSnackDoctorCake + amount: 2 + - id: ADTFoodSnackJanitoryCake + amount: 1 + - id: ADTFoodSnackScientistCake + amount: 1 + - id: ADTFoodSnackSecurityCake + amount: 1 + - id: ADTFoodSnackYellowCandies + amount: 1 + - id: ADTFoodSnackBunnyCandies + amount: 1 + +- type: entity + name: new year snackbox 2 + description: new year snackbox 2 + parent: ADTBoxNewYearSnack1 + id: ADTBoxNewYearSnack2 + components: + - type: Sprite + state: box2 + - type: StorageFill + contents: + - id: ADTFoodSnackCandyStick + amount: 3 + - id: ADTFoodSnackCookieMan + amount: 2 + - id: ADTFoodSnackGiftCake + amount: 1 + - id: ADTFoodSnackGloveCake + amount: 1 + - id: ADTFoodSnackSnowflakeCake + amount: 1 + - id: ADTFoodSnackSnowmanCake + amount: 1 + - id: ADTFoodSnackSocksCake + amount: 1 + - id: ADTFoodSnackTreeCake + amount: 1 + - id: ADTFoodSnackCoinCandies + amount: 1 + +- type: entity + name: new year snackbox 3 + description: new year snackbox 3 + parent: ADTBoxNewYearSnack1 + id: ADTBoxNewYearSnack3 + components: + - type: Sprite + state: box3 + - type: StorageFill + contents: + - id: ADTFoodSnackMimeCake + amount: 1 + - id: ADTFoodSnackNukieCake + amount: 3 + - id: ADTFoodSnackClownCake + amount: 2 + - id: ADTFoodSnackGreytideCake + amount: 3 + - id: ADTFoodSnackCoinCandies + amount: 2 + - id: ADTFoodSnackBlackCandies + amount: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_bushel.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_bushel.yml deleted file mode 100644 index 4624bcfc74d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_bushel.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - name: buckwheat bushel - description: buckwheat bushel - id: ADTBuckwheatFood - parent: ProduceBase - components: - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/buckwheat.rsi - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: ADTBuckwheatSolids - Quantity: 5 - - type: Produce - seedId: ADTbuckwheatplant diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_pack.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_pack.yml deleted file mode 100644 index af730588e90..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_pack.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: ReagentContainerBase - id: ADTReagentContainerBuckwheat - name: buckwheat bag - description: A big bag of buckwheat. - components: - - type: SolutionContainerManager - solutions: - food: - maxVol: 50 - reagents: - - ReagentId: ADTBuckwheatSolids - Quantity: 50 - - type: TrashOnSolutionEmpty - solution: food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/buckwheat_pack.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/chocolate.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/chocolate.yml deleted file mode 100644 index 012159a7eca..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/chocolate.yml +++ /dev/null @@ -1,258 +0,0 @@ -#Chocolate packing - -- type: entity - name: chocolate bar - parent: FoodSnackChocolate - id: ADTFoodSnackChocolateBarsBase - description: Tastes like cardboard. - abstract: true - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Chocolate/packing.rsi - state: choco-packed - - type: Item - heldPrefix: chocolatebar - size: Tiny - - type: Tag - tags: - - FoodSnack - - type: SpawnItemsOnUse - items: - - id: FoodPacketChocolateTrash - - id: FoodSnackChocolateBar - sound: - path: /Audio/Effects/unwrap.ogg - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarChocoPack - description: Tastes like cardboard. - components: - - type: Sprite - state: choco-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashChoco - - id: ADTFoodSnackChocolateBarCoconut - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarCoconutPack - description: Tastes like cardboard. - components: - - type: Sprite - state: coconut-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashCoconut - - id: ADTFoodSnackChocolateBarCoconut - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarEnergyPack - description: Tastes like cardboard. - components: - - type: Sprite - state: energy-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashEnergy - - id: ADTFoodSnackChocolateBarEnergy - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarNutsPack - description: Tastes like cardboard. - components: - - type: Sprite - state: nuts-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashNuts - - id: ADTFoodSnackChocolateBarNuts - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarPinkPack - description: Tastes like cardboard. - components: - - type: Sprite - state: pink-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashPink - - id: ADTFoodSnackChocolateBarPink - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarsBase - id: ADTFoodSnackChocolateBarTwoPack - description: Tastes like cardboard. - components: - - type: Sprite - state: two-packed - - type: Tag - - type: SpawnItemsOnUse - items: - - id: ADTFoodPacketChocolateTrashTwo - - id: ADTFoodSnackChocolateBarTwo -#Chocolate bars -- type: entity - name: chocolate bar - parent: FoodSnackChocolateBar - id: ADTFoodSnackChocolateBarBase - description: Tastes like cardboard. - abstract: true - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Chocolate/bars.rsi - state: bar-choco - - type: Item - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Theobromine - Quantity: 3 - - ReagentId: CocoaPowder - Quantity: 1 - - type: Extractable - grindableSolutionName: food - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarChoco - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-choco - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarCoconut - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-coconut - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarEnergy - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-energy - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarNuts - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-nuts - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarPink - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-pink - -- type: entity - name: chocolate bar - parent: ADTFoodSnackChocolateBarBase - id: ADTFoodSnackChocolateBarTwo - description: Tastes like cardboard. - components: - - type: Sprite - state: bar-two - -#Trash - -- type: entity - noSpawn: true - parent: FoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrash - name: chocolate wrapper - abstract: true - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Chocolate/trash.rsi - state: choco-trash - - type: Item - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashChoco - name: chocolate wrapper - components: - - type: Sprite - state: choco-trash - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashCoconut - name: chocolate wrapper - components: - - type: Sprite - state: coconut-trash - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashEnergy - name: chocolate wrapper - components: - - type: Sprite - state: energy-trash - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashNuts - name: chocolate wrapper - components: - - type: Sprite - state: nuts-trash - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashPink - name: chocolate wrapper - components: - - type: Sprite - state: pink-trash - -- type: entity - noSpawn: true - parent: ADTFoodPacketChocolateTrash - id: ADTFoodPacketChocolateTrashTwo - name: chocolate wrapper - components: - - type: Sprite - state: two-trash \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_pod.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_pod.yml deleted file mode 100644 index 5d64d7c0dac..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_pod.yml +++ /dev/null @@ -1,16 +0,0 @@ -#- type: entity -# name: cocoa pod -# description: a cocoabara? -# id: ADTCocoaFood -# parent: ProduceBase -# components: -# - type: Sprite -# sprite: ADT/Objects/Specific/Hydroponics/cocoa.rsi -# - type: SolutionContainerManager -# solutions: -# food: -# reagents: -# - ReagentId: ADTCocoaSolids -# Quantity: 5 -# - type: Produce -# seedId: ADTcocoatree diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_solid_pack.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_solid_pack.yml deleted file mode 100644 index 82d4dc6dcb9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/cocoa_solid_pack.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: ReagentContainerBase - id: ADTReagentContainerCocoaSolid - name: cocoa solid bag - description: A big bag of cocoa solid. Use water before consumption! - components: - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: CocoaPowder - Quantity: 30 - - type: TrashOnSolutionEmpty - solution: food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/cocoa_pack.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml deleted file mode 100644 index c5863c01be9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/croissant.yml +++ /dev/null @@ -1,110 +0,0 @@ -- type: entity - name: croissant-cream-name - parent: FoodBakedBase - id: ADTFoodCroissantCream - description: croissant-cream-desc - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/croissant.rsi - state: cream - - type: FlavorProfile - flavors: - - sweet - - creamy - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 8 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: croissant-choco-name - parent: FoodBakedBase - id: ADTFoodCroissantChocolate - description: croissant-choco-desc - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/croissant.rsi - state: chocolate - - type: FlavorProfile - flavors: - - sweet - - nutty - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 12 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: croissant-cheese-name - parent: FoodBakedBase - id: ADTFoodCroissantCheese - description: croissant-cheese-desc - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/croissant.rsi - state: cheese - - type: FlavorProfile - flavors: - - sweet - - cheesy - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: hot-dog-name - parent: FoodInjectableBase - id: ADTFoodHotDog - description: hot-dog-desc - components: - - type: FlavorProfile - flavors: - - bun - - meaty - - spicy - - type: Food - transferAmount: 3 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/croissant.rsi - state: hotdog - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 8 - - ReagentId: Vitamin - Quantity: 1 - - ReagentId: Protein - Quantity: 3 - - type: Tag - tags: - - ADTCarnivoreFriendlyFood - - diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/disgustings.yml similarity index 80% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/disgustings.yml index f5f1287408b..8b2354cb8b2 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/changeling_lavra.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/disgustings.yml @@ -1,3 +1,4 @@ +# Данной категории нету у визардов, но куда определить ЭТО я без понятия, так же возможно будущее применение - type: entity name: synthetic changeling larva parent: FoodBreadSliceBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/easter_food.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/easter_food.yml deleted file mode 100644 index 69fa57da0b3..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/easter_food.yml +++ /dev/null @@ -1,137 +0,0 @@ -- type: entity - parent: FoodEggBase - id: ADTFoodEggBoiledEaster - name: easter egg - description: easter egg - components: - - type: Sprite - layers: - - state: red - map: [ "enum.DamageStateVisualLayers.Base" ] - - type: SolutionContainerManager - solutions: - food: - maxVol: 6 - reagents: - - ReagentId: EggCooked - Quantity: 6 - - type: Temperature - # preserve temperature from the boiling step - currentTemperature: 344 - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - blue: "" - green: "" - orange: "" - purple: "" - rainbow: "" - red: "" - yellow: "" - -- type: entity - name: kulich small - parent: FoodBakedBase - id: ADTFoodKulichSmall - description: kulich small - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/easter.rsi - state: small - - type: FlavorProfile - flavors: - - sweet - - type: SolutionContainerManager - solutions: - food: - maxVol: 8 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: kulich big - parent: FoodBakedBase - id: ADTFoodKulichBig - description: kulich big - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/easter.rsi - state: big - - type: FlavorProfile - flavors: - - sweet - - type: SolutionContainerManager - solutions: - food: - maxVol: 35 - reagents: - - ReagentId: Nutriment - Quantity: 25 - - ReagentId: Vitamin - Quantity: 5 - - type: Tag - tags: - - ADTMothFriendlyFood - - type: Item - size: Normal - -- type: entity - name: kulich cheesy - parent: FoodBakedBase - id: ADTFoodKulichCheesy - description: kulich cheesy - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/easter.rsi - state: cheesy - - type: FlavorProfile - flavors: - - sweet - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Vitamin - Quantity: 2 - - type: Tag - tags: - - ADTMothFriendlyFood - - ADTCarnivoreFriendlyFood - - type: Item - size: Small - -- type: entity - name: sweet roll - parent: FoodBakedBase - id: ADTFoodSweetRoll - description: sweet roll - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/easter.rsi - state: sweetroll - - type: FlavorProfile - flavors: - - sweet - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Vitamin - Quantity: 2 - - type: Tag - tags: - - ADTMothFriendlyFood - - type: Item - size: Small diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/egg.yml new file mode 100644 index 00000000000..51452bb87bd --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/egg.yml @@ -0,0 +1,60 @@ +- type: entity + name: fried-egg-name + parent: FoodInjectableBase + id: ADTFriedEggSausage + description: fried-egg-desc + components: + - type: FlavorProfile + flavors: + - egg + - meaty + - type: Food + transferAmount: 3 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/fried_egg.rsi + state: fried_egg + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + +- type: entity + parent: FoodEggBase + id: ADTFoodEggBoiledEaster + name: easter egg + description: easter egg + components: + - type: Sprite + layers: + - state: red + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: EggCooked + Quantity: 6 + - type: Temperature + # preserve temperature from the boiling step + currentTemperature: 344 + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + blue: "" + green: "" + orange: "" + purple: "" + rainbow: "" + red: "" + yellow: "" \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml deleted file mode 100644 index 65a420cbb94..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/fried_egg.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - name: fried-egg-name - parent: FoodInjectableBase - id: ADTFriedEggSausage - description: fried-egg-desc - components: - - type: FlavorProfile - flavors: - - egg - - meaty - - type: Food - transferAmount: 3 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/fried_egg.rsi - state: fried_egg - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Vitamin - Quantity: 2 - - ReagentId: Protein - Quantity: 3 - - type: Tag - tags: - - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml deleted file mode 100644 index 85c721c7b4e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml +++ /dev/null @@ -1,424 +0,0 @@ -- type: entity - name: pumpkin - parent: [FoodProduceBase, ItemHeftyBase] - id: ADTFoodPumpkin - description: Round orange object that you can slice and eat. - components: - - type: Item - size: Normal - - type: FlavorProfile - flavors: - - adt_pumpkin - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Vitamin - Quantity: 5 - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/pumpkin.rsi - - type: Produce - seedId: adt_pumpkin - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTJuicePumpkin - Quantity: 20 - - type: Damageable - damageContainer: Biological - - type: DamageOnHighSpeedImpact - minimumSpeed: 0.1 - damage: - types: - Blunt: 1 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: desecration - - !type:SpillBehavior - solution: food - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: SliceableFood - count: 3 - slice: ADTFoodPumkinSlice - - type: Butcherable - butcheringType: Knife - spawned: - - id: ClothingHeadHatPumpkin - - type: Tag - tags: - - Fruit - -- type: entity - name: pumpkin slice - parent: ProduceSliceBase - id: ADTFoodPumkinSlice - description: Juicy orange slice. - components: - - type: Item - size: Tiny - - type: FlavorProfile - flavors: - - adt_pumpkin - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/pumpkin.rsi - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Vitamin - Quantity: 1 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTJuicePumpkin - Quantity: 5 - - type: Tag - tags: - - Fruit - -#снэки на хеллоуин -- type: entity - name: black candies - parent: FoodSnackBase - id: ADTFoodSnackBlackCandies - description: black candies - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - sprite: ADT/Objects/Consumable/Food/halloween_candies.rsi - state: black - - type: Item - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: Nutriment - Quantity: 3 - -- type: entity - name: green candies - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackGreenCandies - description: green candies - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: green - -- type: entity - name: red candies - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackRedCandies - description: red candies - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: red - -- type: entity - name: violet candies - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackVioletCandies - description: violet candies - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: violet - -- type: entity - name: yellow candies - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackYellowCandies - description: yellow candies - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: yellow - -- type: entity - name: bat gingerbread - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackBatGingerBread - description: bat gingerbread - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - sweet - - type: Sprite - state: bat - - type: SolutionContainerManager - solutions: - food: - maxVol: 7 - reagents: - - ReagentId: Nutriment - Quantity: 5 - -- type: entity - name: scull gingerbread - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackScullGingerBread - description: scull gingerbread - suffix: Halloween - components: - - type: Sprite - state: scull - -- type: entity - name: pumpkin gingerbread - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackPumpkinGingerBread - description: pumpkin gingerbread - suffix: Halloween - components: - - type: Sprite - state: pumpkin - -- type: entity - name: chocolate bunny - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackBunnyCandies - description: chocolate bunny - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: bunny - -- type: entity - name: chocolate coin - parent: ADTFoodSnackBlackCandies - id: ADTFoodSnackCoinCandies - description: chocolate coin - suffix: Halloween - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - state: coin - -- type: entity - name: jelly brains - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackBrains - description: jelly brains - suffix: Halloween - components: - - type: Sprite - state: brains - -- type: entity - name: jelly heart - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackHeart - description: jelly heart - suffix: Halloween - components: - - type: Sprite - state: heart - -- type: entity - name: jelly worms - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackWorms - description: jelly worms - suffix: Halloween - components: - - type: Sprite - state: worms - -- type: entity - name: caramel stick - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackHLCaramel - description: caramel stick - suffix: Halloween - components: - - type: Sprite - state: hl_caramel - -- type: entity - name: caramel stick - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackMintCaramel - description: caramel stick - suffix: Halloween - components: - - type: Sprite - state: mint_caramel - -- type: entity - name: jelly eyes - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackEyes - description: jelly eyes - suffix: Halloween - components: - - type: Sprite - state: eyes - -- type: entity - name: candy blue - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackCandyBlue - description: candy blue - suffix: Halloween - components: - - type: Sprite - state: candyblue - -- type: entity - name: candy gow - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackCandyGoW - description: candy gow - suffix: Halloween - components: - - type: Sprite - state: candygow - -- type: entity - name: candy green - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackCandyGreen - description: candy green - suffix: Halloween - components: - - type: Sprite - state: candygreen - -- type: entity - name: candy mine - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackCandyMine - description: candy mine - suffix: Halloween - components: - - type: Sprite - state: candymine - -- type: entity - name: candy red - parent: ADTFoodSnackBatGingerBread - id: ADTFoodSnackCandyRed - description: candy red - suffix: Halloween - components: - - type: Sprite - state: candyred - -- type: entity - name: pumpkin pie - parent: FoodPieBase - id: ADTFoodPiePumpkin - description: A pie containing sweet, sweet love... and pumpkin. - components: - - type: FlavorProfile - flavors: - - sweet - - adt_pumpkin - - type: Sprite - sprite: ADT/Objects/Consumable/Food/pumpkin_pie.rsi - state: pumpkin_pie - - type: SliceableFood - slice: ADTFoodPiePumpkinSlice - - type: Tag - tags: - - Fruit - - Pie - -- type: entity - name: slice of pumpkin pie - parent: FoodPieSliceBase - id: ADTFoodPiePumpkinSlice - components: - - type: FlavorProfile - flavors: - - sweet - - adt_pumpkin - - type: Sprite - sprite: ADT/Objects/Consumable/Food/pumpkin_pie.rsi - state: slice - - type: Tag - tags: - - Fruit - - Pie - -- type: microwaveMealRecipe - id: ADTRecipePumpkinPie - name: pumpkin pie - result: ADTFoodPiePumpkin - time: 15 - solids: - FoodDoughPie: 1 - ADTFoodPumpkin: 1 - FoodPlateTin: 1 - -- type: entity - name: pumpkin soup - parent: FoodBowlBase - id: ADTFoodSoupPumpkin - description: A humble split pumpkin soup. - components: - - type: FlavorProfile - flavors: - - creamy - - adt_pumpkin - - type: Sprite - sprite: ADT/Objects/Consumable/Food/pumpkin_soup.rsi - state: icon - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 8 - - ReagentId: Vitamin - Quantity: 5 - -- type: microwaveMealRecipe - id: ADTRecipePumpkinSoup - name: pumpkin soup recipe - result: ADTFoodSoupPumpkin - time: 10 - reagents: - Water: 5 - solids: - FoodBowlBig: 1 - ADTFoodPumkinSlice: 2 - FoodCarrot: 1 - FoodPotato: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml deleted file mode 100644 index 4a4c53de385..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/hypoallergen_chocolate.yml +++ /dev/null @@ -1,30 +0,0 @@ - - -- type: entity - name: hypoallergen chocolate bar - parent: FoodSnackBase - id: ADTHypoAllergenChocolateBar - description: It tastes like cardboard, but harmless to unaths and vulpes. - components: - - type: FlavorProfile - flavors: - - chocolate - - type: Sprite - sprite: ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi - state: hypoallergen_chocolate - - type: Item - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 8 - - ReagentId: CocoaPowder - Quantity: 1 - - type: Extractable - grindableSolutionName: food - - type: Tag - tags: - - ADTCarnivoreFriendlyFood - - ADTMothFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ice_pack.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ice_pack.yml deleted file mode 100644 index 82e3c2659cc..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ice_pack.yml +++ /dev/null @@ -1,46 +0,0 @@ -#- type: entity -# parent: ReagentContainerBase -# id: ADTIcePacket -# name: icepacket-name -# description: icepacket-desc -# components: -# - type: SolutionContainerManager -# solutions: -# food: -# maxVol: 50 -# reagents: -# - ReagentId: Ice -# Quantity: 50 -# - type: TrashOnEmpty -# solution: food -# - type: Sprite -# sprite: ADT/Objects/Consumable/Food/ice_pack.rsi -# layers: -# - state: fill-5 -# map: ["enum.SolutionContainerLayers.Fill"] -# visible: true -# - state: icon -# - type: Icon -# state: icon -# - type: SolutionContainerVisuals -# maxFillLevels: 5 -# fillBaseName: fill- - -- type: entity - parent: ReagentContainerBase - id: ADTIcePacket - name: ice-packet-name - description: ice packet-desc - components: - - type: SolutionContainerManager - solutions: - food: - maxVol: 50 - reagents: - - ReagentId: Ice - Quantity: 50 - - type: TrashOnSolutionEmpty - solution: food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/ice_pack.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ingredients.yml new file mode 100644 index 00000000000..8770d8e3867 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/ingredients.yml @@ -0,0 +1,56 @@ +- type: entity + parent: ReagentContainerBase + id: ADTReagentContainerBuckwheat + name: buckwheat bag + description: A big bag of buckwheat. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: ADTBuckwheatSolids + Quantity: 50 + - type: TrashOnSolutionEmpty + solution: food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/buckwheat_pack.rsi + state: icon + +- type: entity + parent: ReagentContainerBase + id: ADTReagentContainerCocoaSolid + name: cocoa solid bag + description: A big bag of cocoa solid. Use water before consumption! + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: CocoaPowder + Quantity: 30 + - type: TrashOnSolutionEmpty + solution: food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/cocoa_pack.rsi + state: icon + +- type: entity + parent: ReagentContainerBase + id: ADTIcePacket + name: ice-packet-name + description: ice packet-desc + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Ice + Quantity: 50 + - type: TrashOnSolutionEmpty + solution: food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/ice_pack.rsi + state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml deleted file mode 100644 index c946eae6817..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/khachapuri.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Khachapuri-name - parent: ADTFoodSausageRaw - id: ADTFoodKhachapuri - description: Khachapuri-desc - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/khachapuri.rsi - state: icon - - type: FlavorProfile - flavors: - - cheesy - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTCarnivoreFriendlyFood - - ADTMothFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml deleted file mode 100644 index 5d3c396dbc1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml +++ /dev/null @@ -1,165 +0,0 @@ -#by ModerN for Adventure Time project -# плод -- type: entity - name: mandarin - parent: FoodProduceBase - id: ADTFoodMandarin - description: Healthy, very orange. - suffix: NewYear - components: - - type: SolutionContainerManager - solutions: - food: - maxVol: 9 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Vitamin - Quantity: 4 - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - - type: Produce - seedId: ADTmandarin - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTJuiceMandarin - Quantity: 10 - - type: SpawnItemsOnUse - items: - - id: ADTTrashMandarinPeel - - id: ADTFoodMandarinPeeled - - type: Tag - tags: - - Fruit - - #очищенный плод. -- type: entity - name: mandarin - parent: BaseItem - id: ADTFoodMandarinPeeled - description: Peeled mandarin. Is it holidays already? - suffix: NewYear - components: - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - state: peeledprod - - type: Produce - seedId: ADTmandarin - - type: SolutionContainerManager - solutions: - food: - maxVol: 9 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Vitamin - Quantity: 4 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTJuiceMandarin - Quantity: 10 - - type: SpawnItemsOnUse - items: - - id: ADTFoodMandarinSlice - uses: 8 - - type: Tag - tags: - - Fruit - -# кожура -- type: entity - name: mandarin peel - parent: BaseItem - id: ADTTrashMandarinPeel - suffix: NewYear - components: - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - state: peel - - type: Item - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - heldPrefix: peel - - type: Tag - tags: - - Trash - - type: SpaceGarbage - -# долька -- type: entity - name: mandarin slice - parent: ProduceSliceBase - id: ADTFoodMandarinSlice - description: Mmm, tropical. - suffix: NewYear - components: - - type: FlavorProfile - flavors: - - ADTmandarin - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTJuiceMandarin - Quantity: 2 - - type: Tag - tags: - - Fruit - -# пакет семян -- type: entity - parent: SeedBase - name: packet of mandarin seeds - id: ADTMandarinSeeds - suffix: NewYear - components: - - type: Seed - seedId: ADTmandarin - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi - -#семяна -- type: seed - id: ADTmandarin - name: seeds-mandarin-name - noun: seeds-noun-seeds - displayName: seeds-mandarin-display-name - suffix: NewYear - plantRsi: ADT/Objects/Specific/Hydroponics/mandarin.rsi - packetPrototype: ADTMandarinSeeds - productPrototypes: - - ADTFoodMandarin - harvestRepeat: Repeat - lifespan: 55 - maturation: 6 - production: 6 - yield: 3 - potency: 10 - idealLight: 8 - chemicals: - Nutriment: - Min: 1 - Max: 5 - PotencyDivisor: 20 - Vitamin: - Min: 1 - Max: 4 - PotencyDivisor: 25 - -#сок -- type: reagent - id: ADTJuiceMandarin - name: reagent-name-juice-mandarin - parent: BaseDrink - desc: reagent-desc-juice-mandarin - physicalDesc: reagent-physical-desc-citric - flavor: ADTmandarin - color: "#E78108" - -#на вкус как.. -- type: flavor - id: ADTmandarin - flavorType: Base - description: flavor-base-mandarin diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml new file mode 100644 index 00000000000..2245c626d12 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml @@ -0,0 +1,514 @@ +- type: entity + name: Sashimi + parent: FoodMealSashimi + id: ADTFoodMealSashimi + description: Its taste can only be described as "Exotic". The poisoning though? That's pretty common. + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 31 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 10 + - ReagentId: Vitamin + Quantity: 10 + - ReagentId: TableSalt + Quantity: 1 + - type: Tag + tags: + - Fish + - ADTCarnivoreFriendlyFood + +- type: entity + parent: FoodInjectableBase + id: ADTShawermaBase + components: + - type: FlavorProfile + flavors: + - vegetables + - meaty + - magical + - type: Food + transferAmount: 5 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/shawerma.rsi + state: shawerma + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Protein + Quantity: 3 + - type: Item + sprite: ADT/Objects/Consumable/Food/shawerma.rsi + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + +- type: entity + name: shawerma-default-name + parent: ADTShawermaBase + id: ADTShawermaDefault + description: shawerma-default-desc + components: + - type: FlavorProfile + flavors: + - vegetables + - meaty + - magical + - type: Food + transferAmount: 5 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/shawerma.rsi + state: shawerma + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Protein + Quantity: 3 + +- type: entity + name: shawerma-cheese-name + parent: ADTShawermaBase + id: ADTShawermaCheese + description: shawerma-cheese-desc + components: + - type: FlavorProfile + flavors: + - vegetables + - meaty + - cheesy + - magical + - type: Food + transferAmount: 5 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/shawerma.rsi + state: cheese_shawerma + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 16 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Protein + Quantity: 4 + +- type: entity + name: shawerma-meat-name + parent: ADTShawermaBase + id: ADTShawermaMeat + description: shawerma-meat-desc + components: + - type: FlavorProfile + flavors: + - bacon + - egg + - meaty + - magical + - type: Food + transferAmount: 5 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/shawerma.rsi + state: meat_shawerma + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Protein + Quantity: 6 + +- type: entity + name: Вульпикс + parent: ADTFoodSausageRaw + id: ADTFoodVulpix + suffix: Еда + description: Аппетитное блюдо,с плавленным сыром. + components: + - type: Food + transferAmount: 6 + trash: FoodPlateSmall + - type: Sprite + sprite: ADT/Objects/Consumable/Food/vulpix.rsi + state: icon + - type: FlavorProfile + flavors: + - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + +- type: entity + name: croissant-cream-name + parent: FoodBakedBase + id: ADTFoodCroissantCream + description: croissant-cream-desc + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/croissant.rsi + state: cream + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: croissant-choco-name + parent: FoodBakedBase + id: ADTFoodCroissantChocolate + description: croissant-choco-desc + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/croissant.rsi + state: chocolate + - type: FlavorProfile + flavors: + - sweet + - nutty + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: croissant-cheese-name + parent: FoodBakedBase + id: ADTFoodCroissantCheese + description: croissant-cheese-desc + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/croissant.rsi + state: cheese + - type: FlavorProfile + flavors: + - sweet + - cheesy + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: hot-dog-name + parent: FoodInjectableBase + id: ADTFoodHotDog + description: hot-dog-desc + components: + - type: FlavorProfile + flavors: + - bun + - meaty + - spicy + - type: Food + transferAmount: 3 + - type: Sprite + sprite: ADT/Objects/Consumable/Food/croissant.rsi + state: hotdog + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Protein + Quantity: 3 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + +# Кулич все таки не торт + +- type: entity + name: kulich small + parent: FoodBakedBase + id: ADTFoodKulichSmall + description: kulich small + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/easter.rsi + state: small + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: kulich big + parent: FoodBakedBase + id: ADTFoodKulichBig + description: kulich big + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/easter.rsi + state: big + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 25 + - ReagentId: Vitamin + Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood + - type: Item + size: Normal + +- type: entity + name: kulich cheesy + parent: FoodBakedBase + id: ADTFoodKulichCheesy + description: kulich cheesy + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/easter.rsi + state: cheesy + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCarnivoreFriendlyFood + - type: Item + size: Small + +- type: entity + name: sweet roll + parent: FoodBakedBase + id: ADTFoodSweetRoll + description: sweet roll + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/easter.rsi + state: sweetroll + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood + - type: Item + size: Small + + +- type: entity + name: jellied meat + parent: FoodMeatBase + id: ADTFoodJelliedMeat + description: jellied meat + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + #- state: plate_small + - state: jellymeat + - type: FlavorProfile + flavors: + - ADTJellymeat + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 8 + - type: Item + size: Normal + - type: Food + transferAmount: 5 + trash: FoodPlateSmall + +- type: entity + name: herring under furcoat + parent: FoodMeatBase + id: ADTFoodHerringUnderFurcoat + description: herring under furcoat + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + - state: plate_small + - state: herring + - type: FlavorProfile + flavors: + - ADTHerringUnderFurcoat + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + trash: FoodPlateSmall + +- type: entity + name: pudding + parent: FoodCakeBase + id: ADTFoodCakePudding + description: pudding + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + #- state: plate_small + - state: pudding + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + trash: FoodPlateSmall + +- type: entity + name: christmas pudding + parent: FoodCakeBase + id: ADTFoodCakePuddingChristmas + description: christmas pudding + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + #- state: plate_small + - state: christmaspudding + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 4 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + trash: FoodPlateSmall \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml index 7c352c56244..af66946e854 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml @@ -380,3 +380,135 @@ graph: FishCutlet node: fish cutlet +- type: entity + name: sausage-raw-name + parent: FoodMeatBase + id: ADTFoodSausageRaw + description: sausage-raw-desc + components: + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + - type: Sprite + sprite: ADT/Objects/Consumable/Food/sausage.rsi + state: raw + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 3 + - ReagentId: UncookedAnimalProteins + Quantity: 3 + - ReagentId: Fat + Quantity: 1 + +- type: entity + name: sausage-fried-name + parent: FoodMeatBase + id: ADTFoodSausageFried + description: sausage-fried-desc + components: + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + - type: Sprite + sprite: ADT/Objects/Consumable/Food/sausage.rsi + state: fried + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 6 + +- type: entity + name: Khachapuri-name + parent: ADTFoodSausageRaw + id: ADTFoodKhachapuri + description: Khachapuri-desc + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/khachapuri.rsi + state: icon + - type: FlavorProfile + flavors: + - cheesy + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + - ADTMothFriendlyFood + +- type: entity + name: weisswurst + parent: FoodMeatBase + id: ADTFoodWeissWurst + description: Traditional white Bavarian sausage made of veal, lard and spices. + suffix: Oktoberfest + components: + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата + state: weisswurst + - type: FlavorProfile + flavors: + - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 + +- type: entity + name: bratwurst + parent: FoodMeatBase + id: ADTFoodBratWurst + description: Fried pork sausage, very appetizing, but greasy. + suffix: Oktoberfest + components: + - type: Tag + tags: + - Cooked + - ADTCarnivoreFriendlyFood + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата + state: bratwurst + - type: FlavorProfile + flavors: + - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/new_year.yml deleted file mode 100644 index 33a827732de..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/new_year.yml +++ /dev/null @@ -1,780 +0,0 @@ -#Гвоздика -- type: entity - name: carnation - parent: FoodProduceBase - id: ADTFoodCarnation - description: Is that really IS a carnation? - suffix: New Year - components: - - type: FlavorProfile - flavors: - - savory - - type: Food - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: ADTCarnation - Quantity: 5 - - type: Item - sprite: ADT/Objects/Consumable/Food/new-year/carnation.rsi - size: Tiny - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/carnation.rsi #спрайты от Умы. - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTCarnation - Quantity: 5 - - type: SolutionSpiker - sourceSolution: food - ignoreEmpty: true - popup: adt-spike-solution-put - - type: Appearance - - type: DeleteOnTrigger - -#Корица -- type: entity - name: cinnamon - parent: FoodProduceBase - id: ADTFoodCinnamon - description: Fragrant cinnamon sticks. - suffix: New Year - components: - - type: FlavorProfile - flavors: - - sweet - - type: Food - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: ADTСinnamon - Quantity: 5 - - type: Item - sprite: ADT/Objects/Consumable/Food/new-year/cinnamon.rsi - size: Tiny - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/cinnamon.rsi #спрайты от Умы. - - type: Extractable - juiceSolution: - reagents: - - ReagentId: ADTСinnamon - Quantity: 5 - - type: SolutionSpiker - sourceSolution: food - ignoreEmpty: true - popup: adt-spike-solution-put - - type: Appearance - - type: DeleteOnTrigger - -#Печенье -- type: entity - name: atmos cake - parent: FoodSnackBase - id: ADTFoodSnackAtmosCake - description: atmos cake - suffix: New Year - components: - - type: FlavorProfile - flavors: - - sweet - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi - state: atmos - - type: Item - size: Tiny - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: Nutriment - Quantity: 2 - -- type: entity - name: botanic cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackBotanicCake - description: botanic cake - components: - - type: Sprite - state: botanic - -- type: entity - name: candy stick - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackCandyStick - description: candy stick - components: - - type: Sprite - state: stick - -- type: entity - name: cargo cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackCargoCake - description: cargo cake - components: - - type: Sprite - state: cargo - -- type: entity - name: cookie man - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackCookieMan - description: cookie man - components: - - type: Sprite - state: cookieman - -- type: entity - name: chef cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackChefCake - description: chef cake - components: - - type: Sprite - state: chef - -- type: entity - name: doctor cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackDoctorCake - description: doctor cake - components: - - type: Sprite - state: doctor - -- type: entity - name: gift cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackGiftCake - description: gift cake - components: - - type: Sprite - state: gift - -- type: entity - name: glove cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackGloveCake - description: glove cake - components: - - type: Sprite - state: glove - -- type: entity - name: janitory cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackJanitoryCake - description: janitory cake - components: - - type: Sprite - state: janitory - -- type: entity - name: mime cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackMimeCake - description: mime cake - components: - - type: Sprite - state: mime - -- type: entity - name: nukie cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackNukieCake - description: nukie cake - components: - - type: Sprite - state: nukie - -- type: entity - name: clown cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackClownCake - description: clown cake - components: - - type: Sprite - state: clown - -- type: entity - name: greytide cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackGreytideCake - description: greytide cake - components: - - type: Sprite - state: greytide - -- type: entity - name: scientist cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackScientistCake - description: scientist cake - components: - - type: Sprite - state: scientist - -- type: entity - name: security cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackSecurityCake - description: security cake - components: - - type: Sprite - state: security - -- type: entity - name: snowflake cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackSnowflakeCake - description: snowflake cake - components: - - type: Sprite - state: snowflake - -- type: entity - name: snowman cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackSnowmanCake - description: snowman cake - components: - - type: Sprite - state: snowman - -- type: entity - name: socks cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackSocksCake - description: socks cake - components: - - type: Sprite - state: socks - -- type: entity - name: tree cake - parent: ADTFoodSnackAtmosCake - id: ADTFoodSnackTreeCake - description: tree cake - components: - - type: Sprite - state: tree - -#Коробки со сладостями - -- type: entity - id: ADTBoxNewYearSnack1 - parent: BaseStorageItem - name: new year snackbox 1 - description: new year snackbox 1 - suffix: New Year - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi - state: box1 - - type: Item - size: Large - - type: Storage - maxItemSize: Small - grid: - - 0,0,2,3 - - type: ContainerContainer - containers: - storagebase: !type:Container - - type: PhysicalComposition - materialComposition: - Cardboard: 100 - - type: StorageFill - contents: - - id: ADTFoodSnackAtmosCake - amount: 1 - - id: ADTFoodSnackBotanicCake - amount: 1 - - id: ADTFoodSnackCargoCake - amount: 2 - - id: ADTFoodSnackChefCake - amount: 1 - - id: ADTFoodSnackDoctorCake - amount: 2 - - id: ADTFoodSnackJanitoryCake - amount: 1 - - id: ADTFoodSnackScientistCake - amount: 1 - - id: ADTFoodSnackSecurityCake - amount: 1 - - id: ADTFoodSnackYellowCandies - amount: 1 - - id: ADTFoodSnackBunnyCandies - amount: 1 - -- type: entity - name: new year snackbox 2 - description: new year snackbox 2 - parent: ADTBoxNewYearSnack1 - id: ADTBoxNewYearSnack2 - components: - - type: Sprite - state: box2 - - type: StorageFill - contents: - - id: ADTFoodSnackCandyStick - amount: 3 - - id: ADTFoodSnackCookieMan - amount: 2 - - id: ADTFoodSnackGiftCake - amount: 1 - - id: ADTFoodSnackGloveCake - amount: 1 - - id: ADTFoodSnackSnowflakeCake - amount: 1 - - id: ADTFoodSnackSnowmanCake - amount: 1 - - id: ADTFoodSnackSocksCake - amount: 1 - - id: ADTFoodSnackTreeCake - amount: 1 - - id: ADTFoodSnackCoinCandies - amount: 1 - -- type: entity - name: new year snackbox 3 - description: new year snackbox 3 - parent: ADTBoxNewYearSnack1 - id: ADTBoxNewYearSnack3 - components: - - type: Sprite - state: box3 - - type: StorageFill - contents: - - id: ADTFoodSnackMimeCake - amount: 1 - - id: ADTFoodSnackNukieCake - amount: 3 - - id: ADTFoodSnackClownCake - amount: 2 - - id: ADTFoodSnackGreytideCake - amount: 3 - - id: ADTFoodSnackCoinCandies - amount: 2 - - id: ADTFoodSnackBlackCandies - amount: 1 - -#новогодние блюда - -- type: entity - name: olivier salad - parent: FoodBowlBase - id: ADTFoodOlivierSalad - description: olivier salad - suffix: New Year - components: - - type: FlavorProfile - flavors: - - ADTOlivier - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - - state: bowl - - state: olivier - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 9 - - ReagentId: Vitamin - Quantity: 3 - -- type: entity - name: jellied meat - parent: FoodMeatBase - id: ADTFoodJelliedMeat - description: jellied meat - suffix: New Year - components: - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - #- state: plate_small - - state: jellymeat - - type: FlavorProfile - flavors: - - ADTJellymeat - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Protein - Quantity: 8 - - type: Item - size: Normal - - type: Food - transferAmount: 5 - trash: FoodPlateSmall - -- type: entity - name: herring under furcoat - parent: FoodMeatBase - id: ADTFoodHerringUnderFurcoat - description: herring under furcoat - suffix: New Year - components: - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - - state: plate_small - - state: herring - - type: FlavorProfile - flavors: - - ADTHerringUnderFurcoat - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 9 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Vitamin - Quantity: 3 - - type: Item - size: Normal - - type: Food - transferAmount: 6 - trash: FoodPlateSmall - -- type: entity - name: ham - parent: FoodMeatBase - id: ADTFoodMeatHam - description: ham - suffix: New Year - components: - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - - state: plate - - state: ham - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 18 - - ReagentId: Protein - Quantity: 6 - - type: SliceableFood - count: 6 - slice: ADTFoodMeatHamPiece - - type: Item - size: Normal - - type: Food - transferAmount: 4 - trash: FoodPlate - -- type: entity - name: ham piece - parent: FoodMeatBase - id: ADTFoodMeatHamPiece - description: ham piece - suffix: New Year - components: - - type: Tag - tags: - - Cooked - - Meat - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - - state: hampiece - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 3 - - ReagentId: Protein - Quantity: 1 - - type: Item - size: Normal - - type: Food - transferAmount: 6 - -- type: entity - name: pudding - parent: FoodCakeBase - id: ADTFoodCakePudding - description: pudding - suffix: New Year - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - #- state: plate_small - - state: pudding - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 12 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Vitamin - Quantity: 3 - - type: Item - size: Normal - - type: Food - transferAmount: 6 - trash: FoodPlateSmall - -- type: entity - name: christmas pudding - parent: FoodCakeBase - id: ADTFoodCakePuddingChristmas - description: christmas pudding - suffix: New Year - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi - layers: - #- state: plate_small - - state: christmaspudding - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Vitamin - Quantity: 4 - - type: Item - size: Normal - - type: Food - transferAmount: 6 - trash: FoodPlateSmall - -#рецепты - -- type: microwaveMealRecipe - id: ADTFoodOlivierSaladRecipe - name: olivier salad recipe - result: ADTFoodOlivierSalad - time: 15 - reagents: - Mayo: 5 - solids: - FoodBowlBig: 1 - FoodPotato: 2 - FoodMeat: 1 - FoodCarrot: 1 - FoodEgg: 1 - -- type: microwaveMealRecipe - id: ADTFoodJelliedMeatRecipe - name: jellied meat recipe - result: ADTFoodJelliedMeat - time: 20 - reagents: - Water: 15 - UncookedAnimalProteins: 9 - Fat: 9 - solids: - FoodMeat: 1 - FoodPlateSmall: 1 - -- type: microwaveMealRecipe - id: ADTFoodHerringUnderFurcoatRecipe - name: herring under furcoat recipe - result: ADTFoodHerringUnderFurcoat - time: 15 - reagents: - Mayo: 5 - solids: - FoodCarrot: 2 - FoodEgg: 1 - FoodMeatFish: 1 - FoodPlateSmall: 1 - -- type: microwaveMealRecipe - id: ADTFoodMeatHamRecipe - name: ham with mead recipe - result: ADTFoodMeatHam - time: 25 - reagents: - Blackpepper: 5 - TableSalt: 5 - solids: - FoodMeat: 2 - FoodPlate: 1 - -- type: microwaveMealRecipe - id: ADTFoodCakePuddingRecipe - name: puding recipe - result: ADTFoodCakePudding - time: 10 - reagents: - Water: 15 - Milk: 10 - Flour: 10 - Sugar: 15 - Egg: 6 - solids: - FoodPlateSmall: 1 - -- type: microwaveMealRecipe - id: ADTFoodCakePuddingChristmasRecipe - name: christmas puding recipe - result: ADTFoodCakePuddingChristmas - time: 10 - reagents: - Water: 15 - Milk: 10 - Flour: 10 - Sugar: 15 - Egg: 6 - solids: - FoodPlateSmall: 1 - ADTFoodSnackCandyStick: 2 - -#спавнер еды -- type: entity - parent: MarkerBase - id: ADTRandomNewYearFoodSpawner - name: random new year food spawner - suffix: New Year - components: - - type: Sprite - layers: - - state: green - - sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi - state: stick - - type: RandomSpawner - offset: 0 - prototypes: - - ADTFoodOlivierSalad - - ADTFoodJelliedMeat - - ADTFoodHerringUnderFurcoat - - ADTFoodMeatHam - - ADTFoodCakePudding - - ADTFoodCakePuddingChristmas - - ADTBoxNewYearSnack1 - - ADTBoxNewYearSnack2 - - ADTBoxNewYearSnack3 - - ADTFoodMeatChickenBaked - - ADTFoodMeatChickenBakedWithVegetables - - ADTFoodMeatChickenBakedWing - - ADTFoodMeatChickenBakedLeg - #chance: 0.7 - -#шоколадная горилла - -- type: entity - id: ADTChocolateGorillaLarge - parent: BaseStructure - name: chocolate gorilla - description: chocolate gorilla - suffix: New Year - placement: - mode: SnapgridCenter - components: - - type: Clickable - - type: InteractionOutline - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.45 - density: 100 - mask: - - Impassable - - type: Sprite - sprite: ADT/Objects/Consumable/Food/new-year/chocogorilla.rsi - state: chocogorilla - - type: Pullable - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 400 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 75 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - Log: - min: 2 - max: 8 - - type: StaticPrice - price: 10 - - type: Physics - bodyType: Static - - type: Anchorable - - type: Appearance - - type: Food - - type: InjectableSolution - solution: food - - type: RefillableSolution - solution: food - - type: SolutionContainerManager - solutions: - food: - maxVol: 550 - reagents: - - ReagentId: Nutriment - Quantity: 350 - - ReagentId: Theobromine - Quantity: 105 - - ReagentId: CocoaPowder - Quantity: 35 - - type: FlavorProfile - flavors: - - chocolate - - type: Tag - tags: - - FoodSnack - - type: Rotatable - -- type: entity - id: ADTCrateChocolateGorilla - parent: CratePlastic - name: chocolate gorilla crate - description: chocolate gorilla crate - suffix: New Year - components: - - type: StorageFill - contents: - - id: ADTChocolateGorillaLarge - amount: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml deleted file mode 100644 index c5baac29a64..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/oktoberfest.yml +++ /dev/null @@ -1,197 +0,0 @@ -- type: entity - name: weisswurst - parent: FoodMeatBase - id: ADTFoodWeissWurst - description: Traditional white Bavarian sausage made of veal, lard and spices. - suffix: Oktoberfest - components: - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата - state: weisswurst - - type: FlavorProfile - flavors: - - meaty - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Protein - Quantity: 2 - - ReagentId: Vitamin - Quantity: 1 - -- type: entity - name: bratwurst - parent: FoodMeatBase - id: ADTFoodBratWurst - description: Fried pork sausage, very appetizing, but greasy. - suffix: Oktoberfest - components: - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайт от Празата - state: bratwurst - - type: FlavorProfile - flavors: - - meaty - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Protein - Quantity: 2 - - ReagentId: Vitamin - Quantity: 1 - -- type: entity - name: brezel - parent: FoodBreadSliceBase - id: ADTFoodBreadBrezel - description: The usual pretzel, a popular snack at Oktoberfest. - suffix: Oktoberfest - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата - layers: - - state: brezel - - type: FlavorProfile - flavors: - - bun - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: brezel with poppy seeds - parent: FoodBreadSliceBase - id: ADTFoodBreadBrezelPoppySeeds - description: The brezel with poppy seeds, a popular snack at Oktoberfest. - suffix: Oktoberfest - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата - layers: - - state: brezel_poppy - - type: FlavorProfile - flavors: - - bun - - adt_poppy - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: brezel with salt - parent: FoodBreadSliceBase - id: ADTFoodBreadBrezelSalt - description: The brezel with salt, a popular snack at Oktoberfest. - suffix: Oktoberfest - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата - layers: - - state: brezel_salt - - type: FlavorProfile - flavors: - - bun - - salty - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Vitamin - Quantity: 1 - - type: Tag - tags: - - ADTMothFriendlyFood - -- type: entity - name: brezel with chocolate - parent: FoodBreadSliceBase - id: ADTFoodBreadBrezelChocolate - description: The brezel with chocolate, a sweet snack for Oktoberfest. - suffix: Oktoberfest - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата - layers: - - state: brezel_chocolate - - type: FlavorProfile - flavors: - - bun - - chocolate - - sweet - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 1 - - ReagentId: Vitamin - Quantity: 1 - -- type: entity - name: brezel with vanilla - parent: FoodBreadSliceBase - id: ADTFoodBreadBrezelVanilla - description: Brezel with vanilla glaze, a sweet snack for Oktoberfest - suffix: Oktoberfest - components: - - type: Food - - type: Sprite - sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата - layers: - - state: brezel_vanilla - - type: FlavorProfile - flavors: - - bun - - sweet - - adt_vanilla - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Vitamin - Quantity: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml index d4cbaeebc44..889cacac5cf 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/produce.yml @@ -26,4 +26,295 @@ grindableSolutionName: food - type: Tag tags: - - Flower \ No newline at end of file + - Flower + +- type: entity + name: buckwheat bushel + description: buckwheat bushel + id: ADTBuckwheatFood + parent: ProduceBase + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/buckwheat.rsi + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: ADTBuckwheatSolids + Quantity: 5 + - type: Produce + seedId: ADTbuckwheatplant + +- type: entity + name: pumpkin + parent: [FoodProduceBase, ItemHeftyBase] + id: ADTFoodPumpkin + description: Round orange object that you can slice and eat. + components: + - type: Item + size: Normal + - type: FlavorProfile + flavors: + - adt_pumpkin + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Vitamin + Quantity: 5 + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/pumpkin.rsi + - type: Produce + seedId: adt_pumpkin + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuicePumpkin + Quantity: 20 + - type: Damageable + damageContainer: Biological + - type: DamageOnHighSpeedImpact + minimumSpeed: 0.1 + damage: + types: + Blunt: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: desecration + - !type:SpillBehavior + solution: food + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: SliceableFood + count: 3 + slice: ADTFoodPumkinSlice + - type: Butcherable + butcheringType: Knife + spawned: + - id: ClothingHeadHatPumpkin + - type: Tag + tags: + - Fruit + +- type: entity + name: pumpkin slice + parent: ProduceSliceBase + id: ADTFoodPumkinSlice + description: Juicy orange slice. + components: + - type: Item + size: Tiny + - type: FlavorProfile + flavors: + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/pumpkin.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuicePumpkin + Quantity: 5 + - type: Tag + tags: + - Fruit + +#by ModerN for Adventure Time project +# плод +- type: entity + name: mandarin + parent: FoodProduceBase + id: ADTFoodMandarin + description: Healthy, very orange. + suffix: NewYear + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + - type: Produce + seedId: ADTmandarin + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 10 + - type: SpawnItemsOnUse + items: + - id: ADTTrashMandarinPeel + - id: ADTFoodMandarinPeeled + - type: Tag + tags: + - Fruit + + #очищенный плод. +- type: entity + name: mandarin + parent: BaseItem + id: ADTFoodMandarinPeeled + description: Peeled mandarin. Is it holidays already? + suffix: NewYear + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + state: peeledprod + - type: Produce + seedId: ADTmandarin + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 10 + - type: SpawnItemsOnUse + items: + - id: ADTFoodMandarinSlice + uses: 8 + - type: Tag + tags: + - Fruit + +# кожура +- type: entity + name: mandarin peel + parent: BaseItem + id: ADTTrashMandarinPeel + suffix: NewYear + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + state: peel + - type: Item + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + heldPrefix: peel + - type: Tag + tags: + - Trash + - type: SpaceGarbage + +# долька +- type: entity + name: mandarin slice + parent: ProduceSliceBase + id: ADTFoodMandarinSlice + description: Mmm, tropical. + suffix: NewYear + components: + - type: FlavorProfile + flavors: + - ADTmandarin + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 2 + - type: Tag + tags: + - Fruit + +#Гвоздика +- type: entity + name: carnation + parent: FoodProduceBase + id: ADTFoodCarnation + description: Is that really IS a carnation? + suffix: New Year + components: + - type: FlavorProfile + flavors: + - savory + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: ADTCarnation + Quantity: 5 + - type: Item + sprite: ADT/Objects/Consumable/Food/new-year/carnation.rsi + size: Tiny + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/carnation.rsi #спрайты от Умы. + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTCarnation + Quantity: 5 + - type: SolutionSpiker + sourceSolution: food + ignoreEmpty: true + popup: adt-spike-solution-put + - type: Appearance + - type: DeleteOnTrigger + +#Не совсем уверен про этих двоих ниже +#Корица +- type: entity + name: cinnamon + parent: FoodProduceBase + id: ADTFoodCinnamon + description: Fragrant cinnamon sticks. + suffix: New Year + components: + - type: FlavorProfile + flavors: + - sweet + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: ADTСinnamon + Quantity: 5 + - type: Item + sprite: ADT/Objects/Consumable/Food/new-year/cinnamon.rsi + size: Tiny + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/cinnamon.rsi #спрайты от Умы. + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTСinnamon + Quantity: 5 + - type: SolutionSpiker + sourceSolution: food + ignoreEmpty: true + popup: adt-spike-solution-put + - type: Appearance + - type: DeleteOnTrigger \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml deleted file mode 100644 index 516d771f849..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sashimisafe.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - name: Sashimi - parent: FoodMealSashimi - id: ADTFoodMealSashimi - description: Its taste can only be described as "Exotic". The poisoning though? That's pretty common. - components: - - type: SolutionContainerManager - solutions: - food: - maxVol: 31 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 10 - - ReagentId: Vitamin - Quantity: 10 - - ReagentId: TableSalt - Quantity: 1 - - type: Tag - tags: - - Fish - - ADTCarnivoreFriendlyFood diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml deleted file mode 100644 index 430a1e03ca4..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sausage.yml +++ /dev/null @@ -1,47 +0,0 @@ -- type: entity - name: sausage-raw-name - parent: FoodMeatBase - id: ADTFoodSausageRaw - description: sausage-raw-desc - components: - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood - - type: Sprite - sprite: ADT/Objects/Consumable/Food/sausage.rsi - state: raw - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 3 - - ReagentId: Protein - Quantity: 3 - - ReagentId: UncookedAnimalProteins - Quantity: 3 - - ReagentId: Fat - Quantity: 1 - -- type: entity - name: sausage-fried-name - parent: FoodMeatBase - id: ADTFoodSausageFried - description: sausage-fried-desc - components: - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood - - type: Sprite - sprite: ADT/Objects/Consumable/Food/sausage.rsi - state: fried - - type: SolutionContainerManager - solutions: - food: - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Protein - Quantity: 6 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sawdustsoup.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sawdustsoup.yml deleted file mode 100644 index b633a16d15c..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/sawdustsoup.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: entity - name: sawdust soup - parent: FoodBowlBase - id: ADTFoodSoupSawdust - description: Where did the soup come from in my sawdust? - components: - - type: FlavorProfile - flavors: - - ADTSawdust - - type: Sprite - sprite: ADT/Objects/Consumable/Food/sawdustsoup.rsi - layers: - - state: bowl - - state: sawdustsoup - - type: SolutionContainerManager - solutions: - food: - maxVol: 12 - reagents: - - ReagentId: Nutriment - Quantity: 3 - - ReagentId: Vitamin - Quantity: 3 - - ReagentId: Water - Quantity: 10 - -- type: microwaveMealRecipe - id: ADTFoodSawdustSoupRecipe - name: sawdust soup recipe - result: ADTFoodSoupSawdust - time: 15 - reagents: - Water: 10 - TableSalt: 10 - solids: - FoodBowlBig: 1 - MaterialWoodPlank1: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml deleted file mode 100644 index 11ab551050a..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/shawerma.yml +++ /dev/null @@ -1,117 +0,0 @@ -- type: entity - parent: FoodInjectableBase - id: ADTShawermaBase - components: - - type: FlavorProfile - flavors: - - vegetables - - meaty - - magical - - type: Food - transferAmount: 5 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/shawerma.rsi - state: shawerma - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Vitamin - Quantity: 3 - - ReagentId: Protein - Quantity: 3 - - type: Item - sprite: ADT/Objects/Consumable/Food/shawerma.rsi - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood - -- type: entity - name: shawerma-default-name - parent: ADTShawermaBase - id: ADTShawermaDefault - description: shawerma-default-desc - components: - - type: FlavorProfile - flavors: - - vegetables - - meaty - - magical - - type: Food - transferAmount: 5 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/shawerma.rsi - state: shawerma - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 15 - - ReagentId: Vitamin - Quantity: 3 - - ReagentId: Protein - Quantity: 3 - -- type: entity - name: shawerma-cheese-name - parent: ADTShawermaBase - id: ADTShawermaCheese - description: shawerma-cheese-desc - components: - - type: FlavorProfile - flavors: - - vegetables - - meaty - - cheesy - - magical - - type: Food - transferAmount: 5 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/shawerma.rsi - state: cheese_shawerma - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 16 - - ReagentId: Vitamin - Quantity: 3 - - ReagentId: Protein - Quantity: 4 - -- type: entity - name: shawerma-meat-name - parent: ADTShawermaBase - id: ADTShawermaMeat - description: shawerma-meat-desc - components: - - type: FlavorProfile - flavors: - - bacon - - egg - - meaty - - magical - - type: Food - transferAmount: 5 - - type: Sprite - sprite: ADT/Objects/Consumable/Food/shawerma.rsi - state: meat_shawerma - - type: SolutionContainerManager - solutions: - food: - maxVol: 25 - reagents: - - ReagentId: Nutriment - Quantity: 12 - - ReagentId: Vitamin - Quantity: 1 - - ReagentId: Protein - Quantity: 6 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 414c9243ec8..0d42fada380 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -282,7 +282,957 @@ shape: - 0,0,0,1 -- type: flavor - id: adtconsideredmilk - flavorType: Complex - description: flavor-complex-adtconsideredmilk +#Печенье +- type: entity + name: atmos cake + parent: FoodSnackBase + id: ADTFoodSnackAtmosCake + description: atmos cake + suffix: New Year + components: + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearsnack.rsi + state: atmos + - type: Item + size: Tiny + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + +- type: entity + name: botanic cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackBotanicCake + description: botanic cake + components: + - type: Sprite + state: botanic + +- type: entity + name: candy stick + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCandyStick + description: candy stick + components: + - type: Sprite + state: stick + +- type: entity + name: cargo cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCargoCake + description: cargo cake + components: + - type: Sprite + state: cargo + +- type: entity + name: cookie man + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCookieMan + description: cookie man + components: + - type: Sprite + state: cookieman + +- type: entity + name: chef cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackChefCake + description: chef cake + components: + - type: Sprite + state: chef + +- type: entity + name: doctor cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackDoctorCake + description: doctor cake + components: + - type: Sprite + state: doctor + +- type: entity + name: gift cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGiftCake + description: gift cake + components: + - type: Sprite + state: gift + +- type: entity + name: glove cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGloveCake + description: glove cake + components: + - type: Sprite + state: glove + +- type: entity + name: janitory cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackJanitoryCake + description: janitory cake + components: + - type: Sprite + state: janitory + +- type: entity + name: mime cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackMimeCake + description: mime cake + components: + - type: Sprite + state: mime + +- type: entity + name: nukie cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackNukieCake + description: nukie cake + components: + - type: Sprite + state: nukie + +- type: entity + name: clown cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackClownCake + description: clown cake + components: + - type: Sprite + state: clown + +- type: entity + name: greytide cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGreytideCake + description: greytide cake + components: + - type: Sprite + state: greytide + +- type: entity + name: scientist cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackScientistCake + description: scientist cake + components: + - type: Sprite + state: scientist + +- type: entity + name: security cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSecurityCake + description: security cake + components: + - type: Sprite + state: security + +- type: entity + name: snowflake cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSnowflakeCake + description: snowflake cake + components: + - type: Sprite + state: snowflake + +- type: entity + name: snowman cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSnowmanCake + description: snowman cake + components: + - type: Sprite + state: snowman + +- type: entity + name: socks cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSocksCake + description: socks cake + components: + - type: Sprite + state: socks + +- type: entity + name: tree cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackTreeCake + description: tree cake + components: + - type: Sprite + state: tree + +- type: entity + name: black candies + parent: FoodSnackBase + id: ADTFoodSnackBlackCandies + description: black candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Consumable/Food/halloween_candies.rsi + state: black + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + +- type: entity + name: green candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackGreenCandies + description: green candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: green + +- type: entity + name: red candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackRedCandies + description: red candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: red + +- type: entity + name: violet candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackVioletCandies + description: violet candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: violet + +- type: entity + name: yellow candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackYellowCandies + description: yellow candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: yellow + +- type: entity + name: bat gingerbread + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackBatGingerBread + description: bat gingerbread + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + state: bat + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 5 + +- type: entity + name: scull gingerbread + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackScullGingerBread + description: scull gingerbread + suffix: Halloween + components: + - type: Sprite + state: scull + +- type: entity + name: pumpkin gingerbread + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackPumpkinGingerBread + description: pumpkin gingerbread + suffix: Halloween + components: + - type: Sprite + state: pumpkin + +- type: entity + name: chocolate bunny + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackBunnyCandies + description: chocolate bunny + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: bunny + +- type: entity + name: chocolate coin + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCoinCandies + description: chocolate coin + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: coin + +- type: entity + name: jelly brains + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackBrains + description: jelly brains + suffix: Halloween + components: + - type: Sprite + state: brains + +- type: entity + name: jelly heart + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackHeart + description: jelly heart + suffix: Halloween + components: + - type: Sprite + state: heart + +- type: entity + name: jelly worms + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackWorms + description: jelly worms + suffix: Halloween + components: + - type: Sprite + state: worms + +- type: entity + name: caramel stick + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackHLCaramel + description: caramel stick + suffix: Halloween + components: + - type: Sprite + state: hl_caramel + +- type: entity + name: caramel stick + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackMintCaramel + description: caramel stick + suffix: Halloween + components: + - type: Sprite + state: mint_caramel + +- type: entity + name: jelly eyes + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackEyes + description: jelly eyes + suffix: Halloween + components: + - type: Sprite + state: eyes + +- type: entity + name: candy blue + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackCandyBlue + description: candy blue + suffix: Halloween + components: + - type: Sprite + state: candyblue + +- type: entity + name: candy gow + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackCandyGoW + description: candy gow + suffix: Halloween + components: + - type: Sprite + state: candygow + +- type: entity + name: candy green + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackCandyGreen + description: candy green + suffix: Halloween + components: + - type: Sprite + state: candygreen + +- type: entity + name: candy mine + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackCandyMine + description: candy mine + suffix: Halloween + components: + - type: Sprite + state: candymine + +- type: entity + name: candy red + parent: ADTFoodSnackBatGingerBread + id: ADTFoodSnackCandyRed + description: candy red + suffix: Halloween + components: + - type: Sprite + state: candyred + +#шоколадная горилла +- type: entity + id: ADTChocolateGorillaLarge + parent: BaseStructure + name: chocolate gorilla + description: chocolate gorilla + suffix: New Year + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 100 + mask: + - Impassable + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/chocogorilla.rsi + state: chocogorilla + - type: Pullable + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + Log: + min: 2 + max: 8 + - type: StaticPrice + price: 10 + - type: Physics + bodyType: Static + - type: Anchorable + - type: Appearance + - type: Food + - type: InjectableSolution + solution: food + - type: RefillableSolution + solution: food + - type: SolutionContainerManager + solutions: + food: + maxVol: 550 + reagents: + - ReagentId: Nutriment + Quantity: 350 + - ReagentId: Theobromine + Quantity: 105 + - ReagentId: CocoaPowder + Quantity: 35 + - type: FlavorProfile + flavors: + - chocolate + - type: Tag + tags: + - FoodSnack + - type: Rotatable + + +- type: entity + name: brezel + parent: FoodBreadSliceBase + id: ADTFoodBreadBrezel + description: The usual pretzel, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата + layers: + - state: brezel + - type: FlavorProfile + flavors: + - bun + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with poppy seeds + parent: FoodBreadSliceBase + id: ADTFoodBreadBrezelPoppySeeds + description: The brezel with poppy seeds, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата + layers: + - state: brezel_poppy + - type: FlavorProfile + flavors: + - bun + - adt_poppy + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with salt + parent: FoodBreadSliceBase + id: ADTFoodBreadBrezelSalt + description: The brezel with salt, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата + layers: + - state: brezel_salt + - type: FlavorProfile + flavors: + - bun + - salty + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with chocolate + parent: FoodBreadSliceBase + id: ADTFoodBreadBrezelChocolate + description: The brezel with chocolate, a sweet snack for Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата + layers: + - state: brezel_chocolate + - type: FlavorProfile + flavors: + - bun + - chocolate + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 + +- type: entity + name: brezel with vanilla + parent: FoodBreadSliceBase + id: ADTFoodBreadBrezelVanilla + description: Brezel with vanilla glaze, a sweet snack for Oktoberfest + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/oktoberfest.rsi #спрайты от празата + layers: + - state: brezel_vanilla + - type: FlavorProfile + flavors: + - bun + - sweet + - adt_vanilla + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + + +#Chocolate packing + +- type: entity + name: chocolate bar + parent: FoodSnackChocolate + id: ADTFoodSnackChocolateBarsBase + description: Tastes like cardboard. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/packing.rsi + state: choco-packed + - type: Item + heldPrefix: chocolatebar + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: FoodPacketChocolateTrash + - id: FoodSnackChocolateBar + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarChocoPack + description: Tastes like cardboard. + components: + - type: Sprite + state: choco-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashChoco + - id: ADTFoodSnackChocolateBarCoconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarCoconutPack + description: Tastes like cardboard. + components: + - type: Sprite + state: coconut-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashCoconut + - id: ADTFoodSnackChocolateBarCoconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarEnergyPack + description: Tastes like cardboard. + components: + - type: Sprite + state: energy-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashEnergy + - id: ADTFoodSnackChocolateBarEnergy + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarNutsPack + description: Tastes like cardboard. + components: + - type: Sprite + state: nuts-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashNuts + - id: ADTFoodSnackChocolateBarNuts + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarPinkPack + description: Tastes like cardboard. + components: + - type: Sprite + state: pink-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashPink + - id: ADTFoodSnackChocolateBarPink + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarTwoPack + description: Tastes like cardboard. + components: + - type: Sprite + state: two-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashTwo + - id: ADTFoodSnackChocolateBarTwo + +#Chocolate bars + +- type: entity + name: hypoallergen chocolate bar + parent: FoodSnackBase + id: ADTHypoAllergenChocolateBar + description: It tastes like cardboard, but harmless to unaths and vulpes. + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi + state: hypoallergen_chocolate + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Extractable + grindableSolutionName: food + - type: Tag + tags: + - ADTCarnivoreFriendlyFood + - ADTMothFriendlyFood + +- type: entity + name: chocolate bar + parent: FoodSnackChocolateBar + id: ADTFoodSnackChocolateBarBase + description: Tastes like cardboard. + abstract: true + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/bars.rsi + state: bar-choco + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Extractable + grindableSolutionName: food + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarChoco + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-choco + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarCoconut + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-coconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarEnergy + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-energy + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarNuts + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-nuts + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarPink + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-pink + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarTwo + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-two + +#Trash + +- type: entity + noSpawn: true + parent: FoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrash + name: chocolate wrapper + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/trash.rsi + state: choco-trash + - type: Item + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashChoco + name: chocolate wrapper + components: + - type: Sprite + state: choco-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashCoconut + name: chocolate wrapper + components: + - type: Sprite + state: coconut-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashEnergy + name: chocolate wrapper + components: + - type: Sprite + state: energy-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashNuts + name: chocolate wrapper + components: + - type: Sprite + state: nuts-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashPink + name: chocolate wrapper + components: + - type: Sprite + state: pink-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashTwo + name: chocolate wrapper + components: + - type: Sprite + state: two-trash + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml similarity index 51% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml index 59e47f059c4..de121347a84 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml @@ -1,3 +1,29 @@ +- type: entity + name: sawdust soup + parent: FoodBowlBase + id: ADTFoodSoupSawdust + description: Where did the soup come from in my sawdust? + components: + - type: FlavorProfile + flavors: + - ADTSawdust + - type: Sprite + sprite: ADT/Objects/Consumable/Food/sawdustsoup.rsi + layers: + - state: bowl + - state: sawdustsoup + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Water + Quantity: 10 + - type: entity name: buckwheat-kasha-name parent: FoodBowlBase @@ -75,3 +101,53 @@ Quantity: 7 - ReagentId: Protein Quantity: 6 + +- type: entity + name: pumpkin soup + parent: FoodBowlBase + id: ADTFoodSoupPumpkin + description: A humble split pumpkin soup. + components: + - type: FlavorProfile + flavors: + - creamy + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/pumpkin_soup.rsi + state: icon + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 5 + +#новогодние блюда + +- type: entity + name: olivier salad + parent: FoodBowlBase + id: ADTFoodOlivierSalad + description: olivier salad + suffix: New Year + components: + - type: FlavorProfile + flavors: + - ADTOlivier + - type: Sprite + sprite: ADT/Objects/Consumable/Food/new-year/newyearfood.rsi + layers: + - state: bowl + - state: olivier + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Vitamin + Quantity: 3 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/valentine_day.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/valentine_day.yml deleted file mode 100644 index aa8566c209a..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/valentine_day.yml +++ /dev/null @@ -1,181 +0,0 @@ -- type: entity - name: chocolate cake - parent: FoodCakeBase - id: ADTFoodCakeChocolateHeart - description: A cake with added chocolate. - components: - - type: Sprite - state: chocolate_heart - - type: SliceableFood - slice: ADTFoodCakeChocolateHeartSlice - - type: SolutionContainerManager - solutions: - food: - maxVol: 35 - reagents: - - ReagentId: Nutriment - Quantity: 20 - - ReagentId: Theobromine - Quantity: 5 - - ReagentId: Vitamin - Quantity: 5 - -- type: entity - name: slice of chocolate cake - parent: FoodCakeSliceBase - id: ADTFoodCakeChocolateHeartSlice - components: - - type: Sprite - state: chocolate-slice-heart - - type: SolutionContainerManager - solutions: - food: - maxVol: 8 - reagents: - - ReagentId: Nutriment - Quantity: 4 - - ReagentId: Theobromine - Quantity: 1 - - ReagentId: Vitamin - Quantity: 1 - -- type: entity - name: banana in chocolate - parent: FoodDonutBase - id: ADTFoodBananChocolate - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - banana - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi - state: in-dark-choco - -- type: entity - name: banana in pink chocolate - parent: FoodDonutBase - id: ADTFoodBananChocolatePink - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - banana - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi - state: in-pink-choco - -- type: entity - parent: [ BoxCardboard, BaseBagOpenClose ] - id: ADTFoodBoxEclairs - name: eclairs obx - description: Mmm, Eclairs. - components: - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - state: box - layers: - - state: box - - state: box-open - map: ["openLayer"] - visible: false - - state: eclairs_1 - map: ["eclairs_1"] - visible: false - - state: eclairs_2 - map: ["eclairs_2"] - visible: false - - state: eclairs_3 - map: ["eclairs_3"] - visible: false - - state: eclairs_4 - map: ["eclairs_4"] - visible: false - - type: Storage - grid: - - 0,0,3,0 - whitelist: - tags: - - Donut - - type: Item - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - size: Small - # heldPrefix: box - - type: StorageFill - contents: - - id: ADTFoodEclairBrown - amount: 1 - - id: ADTFoodEclairChocolate - amount: 1 - - id: ADTFoodEclairWhite - amount: 1 - - id: ADTFoodEclairPink - amount: 1 - - type: ItemCounter - count: - tags: [Donut] - composite: true - layerStates: - - eclairs_1 - - eclairs_2 - - eclairs_3 - - eclairs_4 - - type: Appearance - -- type: entity - name: brown eclair - parent: FoodDonutBase - id: ADTFoodEclairBrown - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - creamy - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - state: eclairs_brown - -- type: entity - name: chocolate eclair - parent: FoodDonutBase - id: ADTFoodEclairChocolate - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - creamy - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - state: eclairs_chocolate - -- type: entity - name: pink eclair - parent: FoodDonutBase - id: ADTFoodEclairPink - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - creamy - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - state: eclairs_pink - -- type: entity - name: white eclair - parent: FoodDonutBase - id: ADTFoodEclairWhite - description: Goes great with a mason jar of hippie's delight. - components: - - type: FlavorProfile - flavors: - - sweet - - creamy - - type: Sprite - sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi - state: eclairs_white diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml deleted file mode 100644 index 6f2f308e7ae..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/vulpix.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - name: Вульпикс - parent: ADTFoodSausageRaw - id: ADTFoodVulpix - suffix: Еда - description: Аппетитное блюдо,с плавленным сыром. - components: - - type: Food - transferAmount: 6 - trash: FoodPlateSmall - - type: Sprite - sprite: ADT/Objects/Consumable/Food/vulpix.rsi - state: icon - - type: FlavorProfile - flavors: - - meaty - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Vitamin - Quantity: 3 - - type: Tag - tags: - - Cooked - - ADTCarnivoreFriendlyFood \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_case.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_case.yml deleted file mode 100644 index 6fe698f6193..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_case.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - id: ADTCigarNe4toCase - parent: CigarCase - name: case Melnicov - description: Case - components: - - type: StorageFill - contents: - - id: ADTMelnikovCigar - amount: 8 - - type: Sprite - sprite: ADT/Objects/Consumable/Smokeables/melnikov_case.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/joints.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/joints.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/case.yml index e7b3061ef47..6378bf1640f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/case.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/case.yml @@ -1,13 +1,25 @@ -# Сделала Лапка - type: entity - id: ADTCigarFellyCase + id: ADTCigarNe4toCase parent: CigarCase - name: элитный портсигар #Рот я трахала таких названий. Выдумывайте сами - description: Прочный, матовый и приятный на ощупь портсигар с внутренней обивкой из кожи розовых вульп. Создан для демонстрации красивого способа умереть. + name: case Melnicov + description: Case components: - type: StorageFill contents: - - id: CigarGold + - id: ADTMelnikovCigar amount: 8 - type: Sprite - sprite: ADT/Objects/Consumable/Smokeables/Cigars/case.rsi + sprite: ADT/Objects/Consumable/Smokeables/melnikov_case.rsi + +- type: entity + id: ADTCigarSchrodingerCase + parent: CigarCase + name: case Melnicov + description: Case + components: + - type: StorageFill + contents: + - id: ADTSchrodingerCigar + amount: 8 + - type: Sprite + sprite: ADT/Objects/Consumable/Smokeables/melnikov_case.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_cigar.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml similarity index 50% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_cigar.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml index 24de1b44d0c..7ef22f0672b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeable/Cigarettes/Cigars/melnikov_cigar.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml @@ -13,3 +13,19 @@ Quantity: 40 - ReagentId: Omnizine Quantity: 5 + +- type: entity + id: ADTSchrodingerCigar + parent: CigarGold + name: Sigar Gold + description: Sigar + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 45 + reagents: + - ReagentId: Nicotine + Quantity: 40 + - ReagentId: Omnizine + Quantity: 5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Decoration/palmtree.yml b/Resources/Prototypes/ADT/Entities/Objects/Decoration/flora.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Decoration/palmtree.yml rename to Resources/Prototypes/ADT/Entities/Objects/Decoration/flora.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Decoration/new_year.yml b/Resources/Prototypes/ADT/Entities/Objects/Decoration/new_year.yml index 6874981cfc6..6954bc433c3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Decoration/new_year.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Decoration/new_year.yml @@ -1,3 +1,4 @@ +#Здесь не вижу смысла сортировки так как у визардов тут скудно и тоже не сильно категорично - type: entity parent: BaseSign id: NewYearDecorationBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml new file mode 100644 index 00000000000..eb649da090a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/Machine/production.yml @@ -0,0 +1,86 @@ +- type: entity + id: ADTPortableGeneratorSuperPacmanMachineCircuitboardHard + parent: BaseMachineCircuitboard + name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator machine board + suffix: Hard + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: ADTPortableGeneratorSuperPacman + requirements: + Capacitor: 20 + materialRequirements: + CableHV: 100 + +- type: entity + id: ADTIndustrialSMESMachineCircuitboard + parent: BaseMachineCircuitboard + name: Industrial SMES machine board + description: A machine printed circuit board for a SMES. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: ind_smes_circuit + - type: MachineBoard + prototype: ADTSMESIndustrialEmpty + requirements: + Capacitor: 4 + PowerCell: 16 + materialRequirements: + CableHV: 30 + + #плата принтера +- type: entity + id: ADTFormPrinterMachineCircuitboard + parent: BaseItem + name: form printer machine board + components: + - type: MachineBoard + prototype: PrinterDoc + requirements: + MatterBin: 1 + Manipulator: 2 + - type: Sprite + sprite: Objects/Misc/module.rsi + state: generic + - type: Tag + tags: + - WhitelistChameleon + - type: StaticPrice + price: 100 + - type: PhysicalComposition + materialComposition: + Glass: 400 + chemicalComposition: + Silicon: 20 + +- type: entity + parent: BaseMachineCircuitboard + id: ADTFurnanceMachineCircuitboard + name: ore furnance machine board + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: ADTFurnance + requirements: + MatterBin: 1 + Manipulator: 3 + materialRequirements: + Glass: 1 + +- type: entity + parent: BaseMachineCircuitboard + id: ADTFoodFurnanceMachineCircuitboard + name: food furnance machine board + components: + - type: Sprite + state: supply + - type: MachineBoard + prototype: ADTFoodFurnance + requirements: + MatterBin: 1 + Manipulator: 3 + materialRequirements: + Glass: 1 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/computers.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/computers.yml new file mode 100644 index 00000000000..55a8f2e4174 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/computers.yml @@ -0,0 +1,8 @@ +- type: entity + parent: BaseComputerCircuitboard + id: ADTCentComShuttleConsoleCircuitboard + name: консоль управления шаттлом ЦК + description: Плата консоли, используемая для постройки консоли управления ЦК шаттлом. + components: + - type: ComputerBoard + prototype: ADTComputerShuttleCentCom diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/industrial.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/industrial.yml deleted file mode 100644 index a5495737a6c..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/industrial.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - id: ADTIndustrialSMESMachineCircuitboard - parent: BaseMachineCircuitboard - name: Industrial SMES machine board - description: A machine printed circuit board for a SMES. - components: - - type: Sprite - sprite: Objects/Misc/module.rsi - state: ind_smes_circuit - - type: MachineBoard - prototype: ADTSMESIndustrialEmpty - requirements: - Capacitor: 4 - PowerCell: 16 - materialRequirements: - CableHV: 30 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml deleted file mode 100644 index 12bc512c14f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/EncryptionKey.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyDroneAntag - name: Ключ к каналу дронов - description: Ключ к доступу каналов дронов. - components: - - type: EncryptionKey - channels: - - ADTDroneAntagChannel - - Common - defaultChannel: ADTDroneAntagChannel - - type: Sprite - layers: - - state: crypt_silver - - state: rd_label - -- type: entity - parent: EncryptionKey - id: EncryptionKeyBotic - name: Ключ к каналу ботов - description: Ключ к доступу каналов ботов. - components: - - type: EncryptionKey - channels: - - ADTSilicon - defaultChannel: ADTSilicon - - type: Sprite - sprite: Objects/Devices/encryption_keys.rsi - state: robotics_label diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translator_implants.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translator_implants.yml deleted file mode 100644 index 3ebd7c90366..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translator_implants.yml +++ /dev/null @@ -1,287 +0,0 @@ -- type: entity - id: BaseTranslatorImplanter - parent: [ BaseItem ] - name: Basic translator implant - description: "Translates speech." - abstract: true - components: - - type: Sprite - sprite: Objects/Specific/Medical/implanter.rsi - state: implanter0 - layers: - - state: implanter1 - map: [ "implantFull" ] - visible: true - - state: implanter0 - map: [ "implantBroken" ] - - type: Appearance - - type: GenericVisualizer - visuals: - enum.ImplanterVisuals.Full: - implantFull: - True: {visible: true} - False: {visible: false} - implantBroken: - True: {visible: false} - False: {visible: true} - -- type: entity - id: BasicGalaticCommonTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Basic Galatic Common translator implant - description: "An implant giving the ability to understand Galatic Common." - components: - - type: TranslatorImplanter - understood: - - GalacticCommon - -- type: entity - id: AdvancedGalaticCommonTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Advanced Galatic Common translator implant - description: "An implant giving the ability to understand and speak Galatic Common." - components: - - type: TranslatorImplanter - spoken: - - GalacticCommon - understood: - - GalacticCommon - -- type: entity - id: BubblishTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Bubblish translator implant - description: "An implant giving the ability to understand and speak Bubblish." - components: - - type: TranslatorImplanter - spoken: - - Bubblish - understood: - - Bubblish - -- type: entity - id: NekomimeticTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Nekomimetic translator implant - description: "An implant giving the ability to understand and speak Nekomimetic, Nya~!" - components: - - type: TranslatorImplanter - spoken: - - Nekomimetic - understood: - - Nekomimetic - -- type: entity - id: DraconicTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Draconic translator implant - description: "An implant giving the ability to understand and speak Draconic." - components: - - type: TranslatorImplanter - spoken: - - Draconic - understood: - - Draconic - -- type: entity - id: CanilunztTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Canilunzt translator implant - description: "An implant giving the ability to understand and speak Canilunzt, Yeeps!" - components: - - type: TranslatorImplanter - spoken: - - Canilunzt - understood: - - Canilunzt - -- type: entity - id: SolCommonTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: SolCommon translator implant - description: "An implant giving the ability to understand and speak SolCommon, raaagh!" - components: - - type: TranslatorImplanter - spoken: - - SolCommon - understood: - - SolCommon - -- type: entity - id: RootSpeakTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: RootSpeak translator implant - description: "An implant giving the ability to understand and speak RootSpeak." - components: - - type: TranslatorImplanter - understood: - - RootSpeak - -- type: entity - id: MofficTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Moffic translator implant - description: "An implant giving the ability to understand and speak Moffic." - components: - - type: TranslatorImplanter - spoken: - - Moffic - understood: - - Moffic - -- type: entity - id: CodeSpeakImplanter - parent: [ BaseTranslatorImplanter ] - name: CodeSpeak Implanter - description: "\"CodeSpeak(tm) - Secure your communication with metaphors so elaborate, they seem randomly generated!\"" - components: - - type: TranslatorImplanter - spoken: - - CodeSpeak - understood: - - CodeSpeak - - type: StaticPrice - price: 150 - -- type: entity - id: SikTajTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: SikTaj translator implant - description: "An implant giving the ability to understand and speak SikTaj." - components: - - type: TranslatorImplanter - spoken: - - SikTaj - understood: - - SikTaj - -- type: entity - id: NianTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Nian translator implant - description: "An implant giving the ability to understand and speak Nian." - components: - - type: TranslatorImplanter - spoken: - - Nian - understood: - - Nian - -- type: entity - id: FireTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Nian translator implant - description: "An implant giving the ability to understand and speak Nian." - components: - - type: TranslatorImplanter - understood: - - Fire - -- type: entity - id: DraskTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Orluum translator implant - description: "An implant giving the ability to understand and speak Orluum." - components: - - type: TranslatorImplanter - spoken: - - Drask - understood: - - Drask - -- type: entity - id: UrsTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Urs translator implant - description: "An implant giving the ability to understand and speak Ursus language." - components: - - type: TranslatorImplanter - spoken: - - Urs - understood: - - Urs - -- type: entity - id: ArkaneTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Arkane translator implant - description: "An implant giving the ability to understand and speak Arcane language." - components: - - type: TranslatorImplanter - spoken: - - Arkane - understood: - - Arkane - -- type: entity - id: ShadowkinTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Shadowkin translator implant - description: "An implant giving the ability to understand and speak Shadowkin language." - components: - - type: TranslatorImplanter - spoken: - - Shadowkin - understood: - - Shadowkin - -- type: entity - id: BorgTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Borg translator implant - description: "An implant giving the ability to understand and speak Binary." - components: - - type: TranslatorImplanter - spoken: - - BorgTalk - understood: - - BorgTalk - -- type: entity - id: CintaTajTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: CintaTaj translator implant - description: "An implant giving the ability to understand and speak CintaTaj." - components: - - type: TranslatorImplanter - spoken: - - CintaTaj - understood: - - CintaTaj - - -- type: entity - id: SyndUniversalTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: universal translator implant - description: "An implant giving the ability to understand any racial language." - components: - - type: TranslatorImplanter - understood: - - RobotTalk - - Shadowkin - - Arkane - - Urs - - Drask - - Fire - - Nian - - SikTaj - - Moffic - - RootSpeak - - SolCommon - - Canilunzt - - Draconic - - Bubblish - - Nekomimetic - -- type: entity - id: DevTranslatorImplanter - parent: [ BaseTranslatorImplanter ] - name: Dev translator implant - description: "e" - components: - - type: TranslatorImplanter - spoken: - - Dev - understood: - - Dev diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml new file mode 100644 index 00000000000..36ac9acdd65 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml @@ -0,0 +1,157 @@ +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyDroneAntag + name: Ключ к каналу дронов + description: Ключ к доступу каналов дронов. + components: + - type: EncryptionKey + channels: + - ADTDroneAntagChannel + - Common + defaultChannel: ADTDroneAntagChannel + - type: Sprite + layers: + - state: crypt_silver + - state: rd_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyBotic + name: Ключ к каналу ботов + description: Ключ к доступу каналов ботов. + components: + - type: EncryptionKey + channels: + - ADTSilicon + defaultChannel: ADTSilicon + - type: Sprite + sprite: Objects/Devices/encryption_keys.rsi + state: robotics_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyCybSecurity + name: security encryption key + description: An encryption key used by security. + components: + - type: EncryptionKey + channels: + - Security + - Common + - Science + - Binary + defaultChannel: Security + - type: Sprite + layers: + - state: crypt_gray + - state: sec_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyLawyer + name: law department encryption key + description: The encryption key used by the most hated person (after the clown). + components: + - type: EncryptionKey + channels: + - ADTLawyerChannel + defaultChannel: ADTLawyerChannel + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyTrader + name: trader encryption key + description: An encryption key used by trader. + components: + - type: EncryptionKey + channels: + - Trader + defaultChannel: Trader + - type: Sprite + layers: + - state: crypt_gray + - state: cargo_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyMerc + name: Merc encryption key + description: The encryption key of the mercenaries radio channel. + components: + - type: EncryptionKey + channels: + - ADTMercChannel + defaultChannel: ADTMercChannel + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeySpec + name: Spec encryption key + description: Special Forces radio channel encryption key. + components: + - type: EncryptionKey + channels: + - ADTSpecChannel + defaultChannel: ADTSpecChannel + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyUSSP + name: USSP encryption key + description: USSP Forces radio channel encryption key. + components: + - type: EncryptionKey + channels: + - ADTUSSPChannel + - Common + defaultChannel: ADTUSSPChannel + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label + +- type: entity + parent: EncryptionKey + id: ADTEncryptionKeyTSF + name: Ключ шифрования ТСФ + description: Ключ шифрования войск ТСФ с доступом к их стандартным частотам. + suffix: TSF + components: + - type: EncryptionKey + channels: + - ADTTransSolar19482Channel + - ADTTransSolar19487Channel + - ADTTransSolar19489Channel + - Common + defaultChannel: Common + - type: Sprite + layers: + - state: crypt_silver + - state: nano_label + +- type: entity + parent: EncryptionKey + id: ADTWiretappingEncryptionKey + name: common encryption key + description: An encryption key used by anyone. + components: + - type: EncryptionKey + channels: + - ADTWiretapping + defaultChannel: ADTWiretapping + - type: Sprite + layers: + - state: crypt_gray + - state: sec_label \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml new file mode 100644 index 00000000000..90728816f86 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml @@ -0,0 +1,47 @@ +- type: entity + parent: BaseItem + id: ADTWiretappingToy + name: WiretappingToy + abstract: true + components: + - type: Matchbox + - type: StorageFill + contents: + - id: ADTWiretapping + - type: Storage + grid: + - 0,0,1,0 + maxItemSize: Small + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + + +- type: entity + parent: [ PlushieBee, ADTWiretappingToy ] + id: ADTWiretappingPlushieBee + name: bee plushie + description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. + +- type: entity + parent: [ PlushieSharkPink, ADTWiretappingToy ] + id: ADTWiretappingPlushieSharkPink + name: pink shark soft toy + description: Hehe shonk :) + +- type: entity + parent: [ PlushieCarp, ADTWiretappingToy ] + id: ADTWiretappingPlushieCarp + name: carp plushie + description: An adorable stuffed toy that resembles the monstrous space carp. + +- type: entity + parent: [ PlushieSlime, ADTWiretappingToy ] + id: ADTWiretappingPlushieSlime + name: slime plushie + description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml index 2dbc75708b5..62b0dfe4314 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml @@ -105,3 +105,30 @@ - type: Icon state: pda-criminalist - type: ForensicScanner + +- type: entity + parent: BasePDA + id: ADTSecurityCybPDA + name: security PDA + description: Red to hide the stains of passenger blood. + components: + #- type: Unremoveable + - type: Pda + id: ADTSecurityCybIDCard + state: pda-security + - type: PdaBorderColor + borderColor: "#A32D26" + - type: Icon + state: pda-security + +- type: entity + parent: BasePDA + id: TraderPDA + name: trader PDA + description: trader PDA + components: + - type: Sprite + sprite: ADT/Objects/Misc/trader_pda.rsi + - type: Pda + id: TraderIDCard + state: pda-tradertsf \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translators.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Misc/translators.yml rename to Resources/Prototypes/ADT/Entities/Objects/Device/translators.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_base.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_base.yml deleted file mode 100644 index 61907f2533f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_base.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - name: playing card - parent: BaseItem - id: ADTFunCardBase - suffix: Cards - description: A high-tech scanning device that uses Terahertz Radiation to detect subfloor infrastructure. - abstract: true - components: - - type: Sprite #Resources/Textures/ADT/Objects/Fun/cards.rsi - sprite: ADT/Objects/Fun/cards.rsi - scale: 0.55, 0.55 - layers: - - state: back-off - map: ["base"] - - type: TrayScanner - range: 0.000000000001 - - type: Item - size: Tiny - sprite: ADT/Objects/Fun/cards.rsi - - type: Appearance - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs2-on } - Off: { state: back-off } - - type: Tag - tags: - - WhitelistChameleon - - ADTCardPlay - - type: StaticPrice - price: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_base.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_base.yml deleted file mode 100644 index 739feb0a564..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_base.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: entity - name: chemistry bag - id: ADTFunCardsBox - parent: BaseStorageItem - description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. - suffix: Empty - components: - - type: Sprite - sprite: ADT/Objects/Fun/box_card.rsi - drawdepth: SmallObjects - layers: - - state: box - map: ["enum.StorageVisualLayers.Base"] - - state: box-open - map: ["enum.StorageVisualLayers.Door"] - - type: Appearance - - type: EntityStorageVisuals - stateDoorOpen: box-open - stateDoorClosed: box - - type: Item - sprite: ADT/Objects/Fun/box_card.rsi - heldPrefix: box - size: Small - shape: - - 0,0,0,0 - - type: Storage - maxItemSize: Tiny # allow up to 5 large beakers / 10 beakers / 10 pill canisters - grid: - - 0,0,8,5 - # 9 6 - quickInsert: true - areaInsert: true - whitelist: - tags: - - ADTCardPlay - - type: Dumpable diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_full.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_full.yml deleted file mode 100644 index 5f42d35aa94..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_box_full.yml +++ /dev/null @@ -1,115 +0,0 @@ -- type: entity - name: chemistry bag - id: ADTFunCardsBoxFull54 - parent: ADTFunCardsBox - description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. - suffix: Full - components: - - type: Item - size: Small - - type: StorageFill - contents: - - id: ADTFunCardClubs2 - - id: ADTFunCardClubs3 - - id: ADTFunCardClubs4 - - id: ADTFunCardClubs5 - - id: ADTFunCardClubs6 - - id: ADTFunCardClubs7 - - id: ADTFunCardClubs8 - - id: ADTFunCardClubs9 - - id: ADTFunCardClubs10 - - id: ADTFunCardAceOfClubs - - id: ADTFunCardJackOfClubs - - id: ADTFunCardQueenOfClubs - - id: ADTFunCardKingOfClubs - - id: ADTFunCardDimonds2 - - id: ADTFunCardDimonds3 - - id: ADTFunCardDimonds4 - - id: ADTFunCardDimonds5 - - id: ADTFunCardDimonds6 - - id: ADTFunCardDimonds7 - - id: ADTFunCardDimonds8 - - id: ADTFunCardDimonds9 - - id: ADTFunCardDimonds10 - - id: ADTFunCardAceOfDimonds - - id: ADTFunCardJackOfDimonds - - id: ADTFunCardKingOfDimonds - - id: ADTFunCardQueenOfDimonds - - id: ADTFunCardHearts2 - - id: ADTFunCardHearts3 - - id: ADTFunCardHearts4 - - id: ADTFunCardHearts5 - - id: ADTFunCardHearts6 - - id: ADTFunCardHearts7 - - id: ADTFunCardHearts8 - - id: ADTFunCardHearts9 - - id: ADTFunCardHearts10 - - id: ADTFunCardAceOfHearts - - id: ADTFunCardJackOfHearts - - id: ADTFunCardKingOfHearts - - id: ADTFunCardQueenOfHearts - - id: ADTFunCardSpades2 - - id: ADTFunCardSpades3 - - id: ADTFunCardSpades4 - - id: ADTFunCardSpades5 - - id: ADTFunCardSpades6 - - id: ADTFunCardSpades7 - - id: ADTFunCardSpades8 - - id: ADTFunCardSpades9 - - id: ADTFunCardSpades10 - - id: ADTFunCardAceOfSpades - - id: ADTFunCardJackOfSpades - - id: ADTFunCardKingOfSpades - - id: ADTFunCardQueenOfSpades - - id: ADTFunCardBlackJoker - - id: ADTFunCardRedJoker - -- type: entity - name: chemistry bag - id: ADTFunCardsBoxFull36 - parent: ADTFunCardsBox - description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. - suffix: Full - components: - - type: Item - size: Small - - type: StorageFill - contents: - - id: ADTFunCardClubs6 - - id: ADTFunCardClubs7 - - id: ADTFunCardClubs8 - - id: ADTFunCardClubs9 - - id: ADTFunCardClubs10 - - id: ADTFunCardAceOfClubs - - id: ADTFunCardJackOfClubs - - id: ADTFunCardQueenOfClubs - - id: ADTFunCardKingOfClubs - - id: ADTFunCardDimonds6 - - id: ADTFunCardDimonds7 - - id: ADTFunCardDimonds8 - - id: ADTFunCardDimonds9 - - id: ADTFunCardDimonds10 - - id: ADTFunCardAceOfDimonds - - id: ADTFunCardJackOfDimonds - - id: ADTFunCardKingOfDimonds - - id: ADTFunCardQueenOfDimonds - - id: ADTFunCardHearts6 - - id: ADTFunCardHearts7 - - id: ADTFunCardHearts8 - - id: ADTFunCardHearts9 - - id: ADTFunCardHearts10 - - id: ADTFunCardAceOfHearts - - id: ADTFunCardJackOfHearts - - id: ADTFunCardKingOfHearts - - id: ADTFunCardQueenOfHearts - - id: ADTFunCardSpades6 - - id: ADTFunCardSpades7 - - id: ADTFunCardSpades8 - - id: ADTFunCardSpades9 - - id: ADTFunCardSpades10 - - id: ADTFunCardAceOfSpades - - id: ADTFunCardJackOfSpades - - id: ADTFunCardKingOfSpades - - id: ADTFunCardQueenOfSpades - - diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_clubs.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_clubs.yml deleted file mode 100644 index 41990471ea7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_clubs.yml +++ /dev/null @@ -1,146 +0,0 @@ -#пики -- type: entity - name: playing card - parent: ADTFunCardBase - id: ADTFunCardClubs2 - suffix: Cards - description: A high-tech scanning device that uses Terahertz Radiation to detect subfloor infrastructure. - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs2-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs3 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs3-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs4 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs4-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs5 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs5-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs6 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs6-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs7 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs7-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs8 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs8-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs9 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs9-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardClubs10 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: clubs10-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardAceOfClubs - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: aceofclubs-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardJackOfClubs - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: jackofclubs-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardQueenOfClubs - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: queenofclubs-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardKingOfClubs - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: kingofclubs-on } - Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_dimond.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_dimond.yml deleted file mode 100644 index 8edacb593d6..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_dimond.yml +++ /dev/null @@ -1,146 +0,0 @@ -#бубс -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds2 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds2-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds3 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds3-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds4 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds4-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds5 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds5-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds6 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds6-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds7 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds7-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds8 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds8-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds9 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds9-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardDimonds10 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: dimonds10-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardAceOfDimonds - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: aceofdimonds-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardJackOfDimonds - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: jackofdimonds-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardKingOfDimonds - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: kingofdimonds-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardQueenOfDimonds - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: queenofdimonds-on } - Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_hearts.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_hearts.yml deleted file mode 100644 index d4417ce234b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_hearts.yml +++ /dev/null @@ -1,146 +0,0 @@ -#черви -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts2 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts2-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts3 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts3-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts4 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts4-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts5 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts5-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts6 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts6-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts7 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts7-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts8 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts8-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts9 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts9-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardHearts10 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: hearts10-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardAceOfHearts - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: aceofhearts-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardJackOfHearts - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: jackofhearts-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardKingOfHearts - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: kingofhearts-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardQueenOfHearts - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: queenofhearts-on } - Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_jocker.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_jocker.yml deleted file mode 100644 index 832584b8d9f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_jocker.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: entity - parent: ADTFunCardBase - id: ADTFunCardBlackJoker - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: blackjoker-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardRedJoker - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: redjoker-on } - Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_spades.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_spades.yml deleted file mode 100644 index fc296fd57bc..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_spades.yml +++ /dev/null @@ -1,146 +0,0 @@ -#крести -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades2 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades2-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades3 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades3-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades4 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades4-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades5 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades5-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades6 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades6-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades7 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades7-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades8 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades8-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades9 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades9-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardSpades10 - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: spades10-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardAceOfSpades - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: aceofspades-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardJackOfSpades - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: jackofspades-on } - Off: { state: back-off } - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardKingOfSpades - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: kingofspades-on } - Off: { state: back-off } - - -- type: entity - parent: ADTFunCardBase - id: ADTFunCardQueenOfSpades - components: - - type: GenericVisualizer - visuals: - enum.TrayScannerVisual.Visual: - base: - On: { state: queenofspades-on } - Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_tag.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_tag.yml deleted file mode 100644 index b9c70356a2d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/card_tag.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: Tag - id: ADTCardPlay diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/Instruments/instruments_percussion.yml similarity index 95% rename from Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml rename to Resources/Prototypes/ADT/Entities/Objects/Fun/Instruments/instruments_percussion.yml index 9d7a316d121..4285601481b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/rock-guitar.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/Instruments/instruments_percussion.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: SuperSynthesizerInstrument id: ADTEntityRockGuitarInstrument name: Chariton's multi-guitar diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/aidan.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/aidan.yml deleted file mode 100644 index 1e0c413c0b5..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/aidan.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: BasePlushie - id: ADTPlushieAidan - name: Aidan Simp - description: Very very good moderator. - components: - - type: Sprite - sprite: ADT/Objects/Fun/plushie_aidan.rsi - state: plushie_aidan diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/c4toy.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/c4toy.yml deleted file mode 100644 index cc3e92e2b0c..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/c4toy.yml +++ /dev/null @@ -1,56 +0,0 @@ -- type: entity - name: Suspicious gift - description: A gift of suspicious appearance. A barely audible beeping sound comes from it. - parent: BaseItem - id: toyC4Package - suffix: New Year - components: - - type: Sprite - sprite: ADT/Objects/Fun/c4toyPackage.rsi - state: icon - layers: - - state: icon - map: ["enum.TriggerVisualLayers.Base"] - - type: Item - sprite: ADT/Objects/Fun/c4toyPackage.rsi - size: Small - - type: SpawnItemsOnUse - items: - - id: toyC4 - sound: - path: /Audio/Effects/unwrap.ogg - - - -- type: entity - parent: BaseItem - id: toyC4 - name: toy c4 - description: A toy that will help you EXPLODE with laughter. - suffix: Новый год - components: - - type: Sprite - sprite: ADT/Objects/Fun/c4toy.rsi - state: icon - - type: Item - sprite: ADT/Objects/Fun/c4toy.rsi - size: Tiny - #- type: ItemCooldown - - type: EmitSoundOnUse - sound: - path: /Audio/ADT/Fun/c4NY_music.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/ADT/Fun/bell.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/ADT/Fun/bell.ogg - - type: MeleeWeapon - wideAnimationRotation: 135 - soundHit: - path: /Audio/ADT/Fun/bell.ogg - damage: - types: - Blunt: 0 - - type: UseDelay - delay: 28 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/cards.yml new file mode 100644 index 00000000000..6829dc4ea89 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/cards.yml @@ -0,0 +1,795 @@ +- type: entity + name: playing card + parent: BaseItem + id: ADTFunCardBase + suffix: Cards + description: A high-tech scanning device that uses Terahertz Radiation to detect subfloor infrastructure. + abstract: true + components: + - type: Sprite #Resources/Textures/ADT/Objects/Fun/cards.rsi + sprite: ADT/Objects/Fun/cards.rsi + scale: 0.55, 0.55 + layers: + - state: back-off + map: ["base"] + - type: TrayScanner + range: 0.000000000001 + - type: Item + size: Tiny + sprite: ADT/Objects/Fun/cards.rsi + - type: Appearance + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs2-on } + Off: { state: back-off } + - type: Tag + tags: + - WhitelistChameleon + - ADTCardPlay + - type: StaticPrice + price: 1 + +- type: entity + name: chemistry bag + id: ADTFunCardsBox + parent: BaseStorageItem + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + suffix: Empty + components: + - type: Sprite + sprite: ADT/Objects/Fun/box_card.rsi + drawdepth: SmallObjects + layers: + - state: box + map: ["enum.StorageVisualLayers.Base"] + - state: box-open + map: ["enum.StorageVisualLayers.Door"] + - type: Appearance + - type: EntityStorageVisuals + stateDoorOpen: box-open + stateDoorClosed: box + - type: Item + sprite: ADT/Objects/Fun/box_card.rsi + heldPrefix: box + size: Small + shape: + - 0,0,0,0 + - type: Storage + maxItemSize: Tiny # allow up to 5 large beakers / 10 beakers / 10 pill canisters + grid: + - 0,0,8,5 + # 9 6 + quickInsert: true + areaInsert: true + whitelist: + tags: + - ADTCardPlay + - type: Dumpable + +- type: entity + name: chemistry bag + id: ADTFunCardsBoxFull54 + parent: ADTFunCardsBox + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + suffix: Full + components: + - type: Item + size: Small + - type: StorageFill + contents: + - id: ADTFunCardClubs2 + - id: ADTFunCardClubs3 + - id: ADTFunCardClubs4 + - id: ADTFunCardClubs5 + - id: ADTFunCardClubs6 + - id: ADTFunCardClubs7 + - id: ADTFunCardClubs8 + - id: ADTFunCardClubs9 + - id: ADTFunCardClubs10 + - id: ADTFunCardAceOfClubs + - id: ADTFunCardJackOfClubs + - id: ADTFunCardQueenOfClubs + - id: ADTFunCardKingOfClubs + - id: ADTFunCardDimonds2 + - id: ADTFunCardDimonds3 + - id: ADTFunCardDimonds4 + - id: ADTFunCardDimonds5 + - id: ADTFunCardDimonds6 + - id: ADTFunCardDimonds7 + - id: ADTFunCardDimonds8 + - id: ADTFunCardDimonds9 + - id: ADTFunCardDimonds10 + - id: ADTFunCardAceOfDimonds + - id: ADTFunCardJackOfDimonds + - id: ADTFunCardKingOfDimonds + - id: ADTFunCardQueenOfDimonds + - id: ADTFunCardHearts2 + - id: ADTFunCardHearts3 + - id: ADTFunCardHearts4 + - id: ADTFunCardHearts5 + - id: ADTFunCardHearts6 + - id: ADTFunCardHearts7 + - id: ADTFunCardHearts8 + - id: ADTFunCardHearts9 + - id: ADTFunCardHearts10 + - id: ADTFunCardAceOfHearts + - id: ADTFunCardJackOfHearts + - id: ADTFunCardKingOfHearts + - id: ADTFunCardQueenOfHearts + - id: ADTFunCardSpades2 + - id: ADTFunCardSpades3 + - id: ADTFunCardSpades4 + - id: ADTFunCardSpades5 + - id: ADTFunCardSpades6 + - id: ADTFunCardSpades7 + - id: ADTFunCardSpades8 + - id: ADTFunCardSpades9 + - id: ADTFunCardSpades10 + - id: ADTFunCardAceOfSpades + - id: ADTFunCardJackOfSpades + - id: ADTFunCardKingOfSpades + - id: ADTFunCardQueenOfSpades + - id: ADTFunCardBlackJoker + - id: ADTFunCardRedJoker + +- type: entity + name: chemistry bag + id: ADTFunCardsBoxFull36 + parent: ADTFunCardsBox + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + suffix: Full + components: + - type: Item + size: Small + - type: StorageFill + contents: + - id: ADTFunCardClubs6 + - id: ADTFunCardClubs7 + - id: ADTFunCardClubs8 + - id: ADTFunCardClubs9 + - id: ADTFunCardClubs10 + - id: ADTFunCardAceOfClubs + - id: ADTFunCardJackOfClubs + - id: ADTFunCardQueenOfClubs + - id: ADTFunCardKingOfClubs + - id: ADTFunCardDimonds6 + - id: ADTFunCardDimonds7 + - id: ADTFunCardDimonds8 + - id: ADTFunCardDimonds9 + - id: ADTFunCardDimonds10 + - id: ADTFunCardAceOfDimonds + - id: ADTFunCardJackOfDimonds + - id: ADTFunCardKingOfDimonds + - id: ADTFunCardQueenOfDimonds + - id: ADTFunCardHearts6 + - id: ADTFunCardHearts7 + - id: ADTFunCardHearts8 + - id: ADTFunCardHearts9 + - id: ADTFunCardHearts10 + - id: ADTFunCardAceOfHearts + - id: ADTFunCardJackOfHearts + - id: ADTFunCardKingOfHearts + - id: ADTFunCardQueenOfHearts + - id: ADTFunCardSpades6 + - id: ADTFunCardSpades7 + - id: ADTFunCardSpades8 + - id: ADTFunCardSpades9 + - id: ADTFunCardSpades10 + - id: ADTFunCardAceOfSpades + - id: ADTFunCardJackOfSpades + - id: ADTFunCardKingOfSpades + - id: ADTFunCardQueenOfSpades + + +#пики +- type: entity + name: playing card + parent: ADTFunCardBase + id: ADTFunCardClubs2 + suffix: Cards + description: A high-tech scanning device that uses Terahertz Radiation to detect subfloor infrastructure. + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs2-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs3 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs3-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs4 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs4-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs5 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs5-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs6 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs6-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs7 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs7-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs8 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs8-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs9 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs9-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardClubs10 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: clubs10-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardAceOfClubs + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: aceofclubs-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardJackOfClubs + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: jackofclubs-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardQueenOfClubs + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: queenofclubs-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardKingOfClubs + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: kingofclubs-on } + Off: { state: back-off } + +#бубс +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds2 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds2-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds3 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds3-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds4 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds4-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds5 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds5-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds6 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds6-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds7 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds7-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds8 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds8-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds9 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds9-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardDimonds10 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: dimonds10-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardAceOfDimonds + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: aceofdimonds-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardJackOfDimonds + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: jackofdimonds-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardKingOfDimonds + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: kingofdimonds-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardQueenOfDimonds + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: queenofdimonds-on } + Off: { state: back-off } + +#черви +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts2 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts2-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts3 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts3-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts4 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts4-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts5 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts5-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts6 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts6-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts7 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts7-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts8 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts8-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts9 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts9-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardHearts10 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: hearts10-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardAceOfHearts + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: aceofhearts-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardJackOfHearts + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: jackofhearts-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardKingOfHearts + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: kingofhearts-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardQueenOfHearts + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: queenofhearts-on } + Off: { state: back-off } + +#крести +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades2 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades2-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades3 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades3-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades4 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades4-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades5 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades5-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades6 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades6-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades7 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades7-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades8 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades8-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades9 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades9-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardSpades10 + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: spades10-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardAceOfSpades + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: aceofspades-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardJackOfSpades + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: jackofspades-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardKingOfSpades + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: kingofspades-on } + Off: { state: back-off } + + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardQueenOfSpades + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: queenofspades-on } + Off: { state: back-off } + +#Джокеры +- type: entity + parent: ADTFunCardBase + id: ADTFunCardBlackJoker + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: blackjoker-on } + Off: { state: back-off } + +- type: entity + parent: ADTFunCardBase + id: ADTFunCardRedJoker + components: + - type: GenericVisualizer + visuals: + enum.TrayScannerVisual.Visual: + base: + On: { state: redjoker-on } + Off: { state: back-off } diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/nine.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/nine.yml deleted file mode 100644 index 70cd9400b83..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/nine.yml +++ /dev/null @@ -1,164 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadHatBMF - name: hat bmf - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/bmf.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/bmf.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadMusical - name: hat mus - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/musical.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/musical.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadKVD - name: hat KVD - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/kvdhead.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/kvdhead.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadMVD - name: hat mvd - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/mvd.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/mvd.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadMSH - name: hat msh - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/msh.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/msh.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadSea - name: hat sea - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/sea.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/sea.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadMil - name: hat millitary - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/millitary.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/millitary.rsi - -- type: entity - parent: ClothingHeadBase - id: ADTClothingHeadBorder - name: hat border - description: - components: - - type: Sprite - sprite: ADT/Clothing/Head/Hats/Nine/border.rsi - - type: Clothing - sprite: ADT/Clothing/Head/Hats/Nine/border.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformBMF - name: UniformBMF - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/bmf.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/bmf.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformMusical - name: Uniform Mus - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/musical.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/musical.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformKVD - name: UniformKVD - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/kvd.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/kvd.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformSea - name: UniformSea - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/sea.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/sea.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformCommon - name: UniformCommon - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/commonnine.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/commonnine.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformMillitary - name: UniformMillitary - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/millitary.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/millitary.rsi - -- type: entity - parent: ClothingUniformBase - id: ADTClothingUniformBorder - name: UniformBorder - description: Pepe - components: - - type: Sprite - sprite: ADT/Clothing/Uniforms/Nine/border.rsi - - type: Clothing - sprite: ADT/Clothing/Uniforms/Nine/border.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/poker_chips.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/poker_chips.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Fun/Cards/poker_chips.yml rename to Resources/Prototypes/ADT/Entities/Objects/Fun/poker_chips.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 18fed82e38b..38f61bef7b7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -114,6 +114,16 @@ types: Blunt: 0 +- type: entity + parent: BasePlushie + id: ADTPlushieAidan + name: Aidan Simp + description: Very very good moderator. + components: + - type: Sprite + sprite: ADT/Objects/Fun/plushie_aidan.rsi + state: plushie_aidan + - type: entity parent: BasePlushie id: ADTPlushieJessie @@ -562,4 +572,61 @@ components: - type: Sprite sprite: Objects/Fun/toys.rsi - state: plusie_mio \ No newline at end of file + state: plusie_mio + +- type: entity + name: Suspicious gift + description: A gift of suspicious appearance. A barely audible beeping sound comes from it. + parent: BaseItem + id: toyC4Package + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Fun/c4toyPackage.rsi + state: icon + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: Item + sprite: ADT/Objects/Fun/c4toyPackage.rsi + size: Small + - type: SpawnItemsOnUse + items: + - id: toyC4 + sound: + path: /Audio/Effects/unwrap.ogg + + + +- type: entity + parent: BaseItem + id: toyC4 + name: toy c4 + description: A toy that will help you EXPLODE with laughter. + suffix: Новый год + components: + - type: Sprite + sprite: ADT/Objects/Fun/c4toy.rsi + state: icon + - type: Item + sprite: ADT/Objects/Fun/c4toy.rsi + size: Tiny + #- type: ItemCooldown + - type: EmitSoundOnUse + sound: + path: /Audio/ADT/Fun/c4NY_music.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Fun/bell.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/ADT/Fun/bell.ogg + - type: MeleeWeapon + wideAnimationRotation: 135 + soundHit: + path: /Audio/ADT/Fun/bell.ogg + damage: + types: + Blunt: 0 + - type: UseDelay + delay: 28 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/weapon_polymorphUSSP.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/weapon_polymorphUSSP.yml deleted file mode 100644 index 328d1c7e6c0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/weapon_polymorphUSSP.yml +++ /dev/null @@ -1,163 +0,0 @@ -- type: polymorph - id: ADTWizardForcedVulpkanin - configuration: - entity: MobVulpkanin - forced: true - inventory: None - transferName: true - transferDamage: true - revertOnCrit: false - revertOnDeath: true - - - -# - type: entity -# name: wand of vulpkanin polymorph -# parent: WeaponDisabler -# id: ADTWeaponPulseCarabinUSSP -# description: For when you need a monkey friend. -# components: -# - type: Sprite -# sprite: ADT/Objects/Weapons/Guns/Battery/secretsUSSPLaser.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - type: Gun -# selectedMode: SemiAuto -# availableModes: -# - SemiAuto -# soundGunshot: -# path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg -# - type: BasicEntityAmmoProvider -# proto: ADTProjectilePolyboltVulpkanin -# fireCost: 300 -# #capacity: 10 -# # count: 5 -# - type: Battery -# maxCharge: 2000 -# startingCharge: 2000 - -- type: entity - name: disabler - parent: BaseWeaponBatterySmall - id: ADTWeaponPulseCarabinUSSP - description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Battery/secretsUSSPLaser.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - type: Gun - fireRate: 1.5 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - - type: ProjectileBatteryAmmoProvider - proto: ADTProjectilePolyboltVulpkanin - fireCost: 300 - - type: Appearance - - type: Battery - maxCharge: 2000 - startingCharge: 2000 - - - - - - -# - type: entity -# id: 1ADTWeaponLasgunUSSP -# parent: BaseItem -# name: SA-LR36 -# description: SA-LR36 -# components: -# - type: Sprite -# sprite: ADT/Objects/Weapons/Guns/Battery/secretsUSSPLaser.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - state: mag-0 -# map: ["enum.GunVisualLayers.Mag"] -# - type: Item -# size: Huge -# #- type: AmmoCounter -# - type: Gun -# fireRate: 2 -# selectedMode: SemiAuto -# availableModes: -# - SemiAuto -# #- FullAuto -# soundGunshot: -# path: /Audio/Weapons/Guns/Gunshots/laser.ogg -# - type: MagazineAmmoProvider -# - type: ItemSlots -# slots: -# gun_magazine: -# name: Magazine -# startingItem: ADTLasgunPowerCellUssp -# insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg -# ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg -# whitelist: -# tags: -# - ADTLasgunPowerCellUssp -# - type: Appearance -# - type: StaticPrice -# price: 1000 -# - type: ContainerContainer -# containers: -# gun_magazine: !type:ContainerSlot -# # - type: MagazineVisuals -# # magState: mag -# # steps: 1 -# # zeroVisible: true - -# #тэг для магазина лазгана -# - type: Tag -# id: ADTLasgunPowerCellUssp - -# - type: entity -# name: lasgun power sell -# description: lasgun power sell -# id: ADTPowerCellLasgunUssp -# suffix: Full -# parent: BaseItem -# components: -# - type: Battery -# maxCharge: 600 -# startingCharge: 600 -# pricePerJoule: 0.15 -# - type: Sprite -# sprite: ADT/Objects/Weapons/Guns/Battery/lasgunbatteryussp.rsi -# state: icon -# - type: SolutionContainerManager -# solutions: -# battery: -# maxVol: 5 -# - type: InjectableSolution -# solution: battery -# - type: DrawableSolution -# solution: battery -# - type: Extractable -# juiceSolution: -# reagents: -# - ReagentId: Zinc -# Quantity: 5 -# - type: Tag -# tags: -# - ADTLasgunPowerCellUssp -# - type: Appearance -# - type: Riggable -# - type: ProjectileBatteryAmmoProvider -# proto: ADTProjectilePolyboltVulpkanin -# fireCost: 30 - -# - type: entity -# name: lasgun power sell -# description: lasgun power sell -# id: ADTPowerCellLasgunEmptyUssp -# suffix: Empty -# parent: ADTPowerCellLasgunUssp -# components: -# - type: Battery -# maxCharge: 600 -# startingCharge: 0 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Magic/vulpunator.yml b/Resources/Prototypes/ADT/Entities/Objects/Magic/vulpunator.yml new file mode 100644 index 00000000000..30006aa4444 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Magic/vulpunator.yml @@ -0,0 +1,23 @@ +# Магия не иначе +- type: entity + name: disabler + parent: BaseWeaponBatterySmall + id: ADTWeaponPulseCarabinUSSP + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/secretsUSSPLaser.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Gun + fireRate: 1.5 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: ADTProjectilePolyboltVulpkanin + fireCost: 300 + - type: Appearance + - type: Battery + maxCharge: 2000 + startingCharge: 2000 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/ADT/Entities/Objects/Materials/materials.yml new file mode 100644 index 00000000000..7a8d8d73d5d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Materials/materials.yml @@ -0,0 +1,19 @@ + + # Материал бумага +- type: material + id: SheetPrinter + stackEntity: Paper + name: бумага + icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } + color: "#ffffff" + price: 0.05 + + +# Стак бумаги. +- type: stack + id: Paper1 + name: paper + icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } + spawn: Paper + maxCount: 1 + itemSize: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerEncryptionKey.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerEncryptionKey.yml deleted file mode 100644 index 09ba604d7fc..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerEncryptionKey.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyLawyer - name: law department encryption key - description: The encryption key used by the most hated person (after the clown). - components: - - type: EncryptionKey - channels: - - ADTLawyerChannel - defaultChannel: ADTLawyerChannel - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerHeadset.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerHeadset.yml deleted file mode 100644 index 578b7c23d3c..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/ADTLawyerHeadset.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetLawyer - name: lawyer headset - description: A headset for lawyer. - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeyLawyer - - EncryptionKeySecurity - - EncryptionKeyCommon - - type: Sprite - sprite: Clothing/Ears/Headsets/servicesecurity.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/CratesCase.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/CratesCase.yml deleted file mode 100644 index 68c8854f818..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/CratesCase.yml +++ /dev/null @@ -1,65 +0,0 @@ -# - type: entity -# parent: CrateGeneric -# id: CrateBaseWeldable -# components: -# - type: Weldable -# - type: ResistLocker - - -# - type: entity -# parent: CrateBaseWeldable -# id: CrateBaseSecure -# components: -# - type: Lock -# - type: AccessReader -# - type: Icon -# sprite: Structures/Storage/Crates/secure.rsi -# state: icon -# - type: Sprite -# sprite: Structures/Storage/Crates/secure.rsi -# layers: -# - state: base -# - state: closed -# map: ["enum.StorageVisualLayers.Door"] -# - state: welded -# visible: false -# map: ["enum.WeldableLayers.BaseWelded"] -# - state: locked -# map: ["enum.StorageVisualLayers.Lock"] -# shader: unshaded -# - type: Damageable -# damageContainer: Inorganic -# damageModifierSet: StrongMetallic -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 75 -# behaviors: -# - !type:DoActsBehavior -# acts: ["Destruction"] -# - type: Construction -# graph: CrateSecure -# node: cratesecure -# containers: -# - entity_storage -# - type: Reflect -# reflects: -# - Energy -# reflectProb: 0.2 -# spread: 90 - -# Прототип кейса для хранения оружия. -- type: entity - parent: CrateBaseSecure - id: ADTCrateCaseSecurity - name: secgear crate - components: - - type: Icon - sprite: Structures/Storage/Crates/sec_gear.rsi - - type: Sprite - sprite: Structures/Storage/Crates/sec_gear.rsi - - type: AccessReader - access: [["Security"]] - - type: Item - size: Ginormous diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml deleted file mode 100644 index 8ab16c6ab8e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml +++ /dev/null @@ -1,113 +0,0 @@ -- type: Tag - id: ADTPillExperimental - -- type: Tag - id: ADTPillExter - -- type: entity - id: ADTEvidanceBag - name: Evidance Bag - parent: BaseItem - description: Designed to store evidence, not drugs - components: - - type: Appearance - - type: Sprite - sprite: ADT/Objects/Misc/Evidance.rsi - state: icon - scale: 0.6, 0.6 - - type: ItemSlots - slots: - place: - name: Place - #startingItem: null - priority: 1 - whitelist: - tags: - - ADTPillExperimental - - ADTPillExter - - type: ItemMapper - mapLayers: - place_number: - whitelist: - tags: - - ADTPillExperimental - place_number2: - whitelist: - tags: - - ADTPillExter - sprite: ADT/Objects/Misc/Evidance.rsi - - type: ContainerContainer - containers: - place: !type:ContainerSlot - -- type: entity - name: pill - parent: FoodInjectableBase - id: ADTPillExperimental - description: It's not a suppository. - components: - - type: SliceableFood - count: 2 - - type: Sprite - sprite: ADT/Objects/Misc/pill_ex.rsi - state: trava_ent - scale: 0.6, 0.6 - - type: Item - size: Tiny - - type: Tag - tags: - - ADTPillExperimental - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: SpaceDrugs - Quantity: 15 - - ReagentId: Nocturine - Quantity: 15 - -- type: entity - name: pill - parent: FoodInjectableBase - id: ADTPillExter - description: It's not a suppository. - components: - - type: SliceableFood - count: 2 - - type: Sprite - sprite: ADT/Objects/Misc/pill_ex.rsi - state: extezi_ent - scale: 0.6, 0.6 - - type: Item - size: Tiny - - type: Tag - tags: - - ADTPillExter - - type: SolutionContainerManager - solutions: - food: - maxVol: 30 - reagents: - - ReagentId: Stimulants - Quantity: 15 - - ReagentId: SpaceDrugs - Quantity: 15 - -#Stimulants SpaceDrugs Nocturine -# - type: SolutionContainerManager -# solutions: -# smokable: -# maxVol: 45 -# reagents: -# - ReagentId: Nicotine -# Quantity: 40 - # - ReagentId: Omnizine -# Quantity: 5 - # - type: SolutionContainerManager - # solutions: - # food: - # maxVol: 20 - # reagents: - # - ReagentId: Bicaridine - # Quantity: 10 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml deleted file mode 100644 index ae5bab86dd0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - name: Jana - parent: BaseItem - description: A sterile injector for rapid administration of drugs to patients. - id: JanaHypo - components: - - type: Sprite - sprite: ADT/Objects/Misc/Hyppo.rsi - state: hypo - - type: Item - sprite: ADT/Objects/Misc/Hyppo.rsi - size: Small - - type: SolutionContainerManager - solutions: - hypospray: - maxVol: 50 - - type: RefillableSolution - solution: hypospray - - type: ExaminableSolution - solution: hypospray - - type: Hypospray - - type: UseDelay - delay: 0 - - type: StaticPrice - price: 750 - - type: UnpoweredFlashlight - - type: PointLight - enabled: false - radius: 2 - softness: 5 - autoRot: true - color: "#be090e" - energy: 3 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/MercEncryptionKey.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/MercEncryptionKey.yml deleted file mode 100644 index 9ce86ff5ab3..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/MercEncryptionKey.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyMerc - name: Merc encryption key - description: The encryption key of the mercenaries radio channel. - components: - - type: EncryptionKey - channels: - - ADTMercChannel - defaultChannel: ADTMercChannel - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/MercHeadset.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/MercHeadset.yml deleted file mode 100644 index 305581e6631..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/MercHeadset.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetMerc - name: Merc headset - description: A headset for mercenary. - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeyMerc - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecEncryptionKey.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecEncryptionKey.yml deleted file mode 100644 index 3782f1bb6c6..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecEncryptionKey.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeySpec - name: Spec encryption key - description: Special Forces radio channel encryption key. - components: - - type: EncryptionKey - channels: - - ADTSpecChannel - defaultChannel: ADTSpecChannel - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label - -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyUSSP - name: USSP encryption key - description: USSP Forces radio channel encryption key. - components: - - type: EncryptionKey - channels: - - ADTUSSPChannel - - Common - defaultChannel: ADTUSSPChannel - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label - -- type: entity - parent: EncryptionKey - id: ADTEncryptionKeyTSF - name: Ключ шифрования ТСФ - description: Ключ шифрования войск ТСФ с доступом к их стандартным частотам. - suffix: TSF - components: - - type: EncryptionKey - channels: - - ADTTransSolar19482Channel - - ADTTransSolar19487Channel - - ADTTransSolar19489Channel - - Common - defaultChannel: Common - - type: Sprite - layers: - - state: crypt_silver - - state: nano_label diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecHeadset.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecHeadset.yml deleted file mode 100644 index 544d2c7778b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/SpecHeadset.yml +++ /dev/null @@ -1,172 +0,0 @@ -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetSpec - name: Special forces headset - description: A headset for special forces. - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeySpec - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetUSSP - name: USSP forces headset - description: A headset for USSP forces. - suffix: USSP - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeyUSSP - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetUSSPSpetznaz - name: USSP special forces headset - description: A headset for USSP special forces. - suffix: USSP - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeyUSSP - - ADTEncryptionKeySpec - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - -- type: entity - parent: ClothingHeadset - id: ADTClothingHeadsetTSF - name: TSF forces headset - description: A headset for TSF forces. - suffix: TSF - components: - - type: ContainerFill - containers: - key_slots: - - ADTEncryptionKeyTSF - - type: Sprite - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: Clothing - sprite: ADT/Clothing/Ears/Headsets/armyheadset.rsi - - type: RadioSpeaker - channels: - - ADTTransSolar19482Channel - - ADTTransSolar19487Channel - - ADTTransSolar19489Channel - -- type: entity - id: ADTRadioHandheldTSF - name: TSF handheld radio - description: A handy handheld radio. - components: - - type: ApcPowerReceiver - needsPower: false - powerLoad: 0 - - type: Electrified - enabled: false - usesApcPower: false - - type: RadioMicrophone - powerRequired: false - unobstructedRequired: true - listenRange: 2 - toggleOnInteract: false - - type: RadioSpeaker - toggleOnInteract: false - channels: - - ADTTransSolar19482Channel - - ADTTransSolar19487Channel - - ADTTransSolar19489Channel - - type: Intercom - supportedChannels: - - ADTTransSolar19482Channel - - ADTTransSolar19487Channel - - ADTTransSolar19489Channel - - type: Speech - speechVerb: Robotic - - type: Clickable - - type: InteractionOutline - - type: Appearance - - type: Sprite - sprite: ADT/Objects/Device/tsf_radio.rsi - layers: - - state: icon - - type: Clothing - sprite: ADT/Objects/Device/tsf_radio.rsi - quickEquip: false - slots: - - ears - - type: ActivatableUIRequiresPower - - type: ActivatableUI - key: enum.IntercomUiKey.Key - - type: UserInterface - interfaces: - - key: enum.IntercomUiKey.Key - type: IntercomBoundUserInterface - - type: Item - size: Small - - type: MovedByPressure - - type: EmitSoundOnCollide - sound: - collection: WeakHit - - type: EmitSoundOnLand - sound: - path: /Audio/Effects/drop.ogg - params: - volume: 2 - - type: DamageOnHighSpeedImpact - damage: - types: - Blunt: 5 - soundHit: - collection: MetalThud - - type: CollisionWake - - type: TileFrictionModifier - modifier: 0.5 - - type: Physics - bodyType: Dynamic - fixedRotation: false - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 20 - mask: - - ItemMask - restitution: 0.3 # fite me - friction: 0.2 - - type: Pullable - - type: DamageExaminable - -- type: entity - id: ADTRadioHandheldTSFBackpack - name: TSF backpack radio - description: A handy bacpack radio - parent: ADTRadioHandheldTSF - components: - - type: Clothing - sprite: ADT/Objects/Device/tsf_radio_backpack.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: Item - size: Ginormous - - type: Sprite - sprite: ADT/Objects/Device/tsf_radio_backpack.rsi - layers: - - state: icon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml index dacccd4fc3e..fc550f90a14 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/books.yml @@ -106,3 +106,21 @@ - type: Construction graph: SecretBook node: startspacelaw + +- type: entity + parent: BookBase + id: ADTBookInvestigator + name: Investigator. Standart Job Procedures + description: This big and very heavy book contain a SJP of Investigator. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + layers: + - state: book_space_law + - type: Paper + content: book-text-investigator + - type: MeleeWeapon + attackRate: 1 + damage: + types: + Blunt: 5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml deleted file mode 100644 index c88bb3281d9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Glass jug - description: A glass jug. Perfect container for lemonade - parent: DrinkGlassBase - id: ADTDrinkGlassJug - components: - - type: Sprite - sprite: ADT/Objects/Misc/glass_jug.rsi - layers: - - state: icon - map: [ "enum.SolutionContainerLayers.Base" ] - - state: fill1 - map: [ "enum.SolutionContainerLayers.Fill" ] - visible: false - - state: icon-front - map: [ "enum.SolutionContainerLayers.Overlay" ] - - type: Item - size: Normal - - type: Appearance - - type: SolutionContainerManager - solutions: - drink: - maxVol: 150 - - type: SolutionContainerVisuals - maxFillLevels: 6 - fillBaseName: fill diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml index c01e279fd65..3dbca21d25e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml @@ -163,3 +163,37 @@ # - key: enum.ChameleonUiKey.Key # type: ChameleonBoundUserInterface +- type: entity + parent: CentcomIDCard #SecurityIDCard + id: ADTSecurityCybIDCard + name: "security cyborg ID card" + components: + - type: Sprite + layers: + - state: default + - state: idsecurityofficer + - type: PresetIdCard + job: ADTSecurityCyborg + - type: Access + groups: + - AllAccessCentcom + tags: + - CentralCommand + +- type: entity + parent: IDCardStandard + id: TraderIDCard + name: TraderIDCard + description: TraderIDCard + components: + - type: Sprite + sprite: ADT/Objects/Misc/trader_id.rsi + layers: + - state: tsf + - state: idtrader_tsf + - type: IdCard + jobTitle: Торговец + - type: Access + tags: + - Trader + - External \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/implanters.yml index 597f9d35362..3ebd7c90366 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/implanters.yml @@ -1,9 +1,287 @@ -#TODO -#- type: entity -# id: ADTTrackingImplanter -# name: tracking implanter -# description: a single use implanter, the implant tracks -# parent: BaseImplantOnlyImplanter -# components: -# - type: Implanter -# implant: TrackingImplant +- type: entity + id: BaseTranslatorImplanter + parent: [ BaseItem ] + name: Basic translator implant + description: "Translates speech." + abstract: true + components: + - type: Sprite + sprite: Objects/Specific/Medical/implanter.rsi + state: implanter0 + layers: + - state: implanter1 + map: [ "implantFull" ] + visible: true + - state: implanter0 + map: [ "implantBroken" ] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ImplanterVisuals.Full: + implantFull: + True: {visible: true} + False: {visible: false} + implantBroken: + True: {visible: false} + False: {visible: true} + +- type: entity + id: BasicGalaticCommonTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Basic Galatic Common translator implant + description: "An implant giving the ability to understand Galatic Common." + components: + - type: TranslatorImplanter + understood: + - GalacticCommon + +- type: entity + id: AdvancedGalaticCommonTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Advanced Galatic Common translator implant + description: "An implant giving the ability to understand and speak Galatic Common." + components: + - type: TranslatorImplanter + spoken: + - GalacticCommon + understood: + - GalacticCommon + +- type: entity + id: BubblishTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Bubblish translator implant + description: "An implant giving the ability to understand and speak Bubblish." + components: + - type: TranslatorImplanter + spoken: + - Bubblish + understood: + - Bubblish + +- type: entity + id: NekomimeticTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Nekomimetic translator implant + description: "An implant giving the ability to understand and speak Nekomimetic, Nya~!" + components: + - type: TranslatorImplanter + spoken: + - Nekomimetic + understood: + - Nekomimetic + +- type: entity + id: DraconicTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Draconic translator implant + description: "An implant giving the ability to understand and speak Draconic." + components: + - type: TranslatorImplanter + spoken: + - Draconic + understood: + - Draconic + +- type: entity + id: CanilunztTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Canilunzt translator implant + description: "An implant giving the ability to understand and speak Canilunzt, Yeeps!" + components: + - type: TranslatorImplanter + spoken: + - Canilunzt + understood: + - Canilunzt + +- type: entity + id: SolCommonTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: SolCommon translator implant + description: "An implant giving the ability to understand and speak SolCommon, raaagh!" + components: + - type: TranslatorImplanter + spoken: + - SolCommon + understood: + - SolCommon + +- type: entity + id: RootSpeakTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: RootSpeak translator implant + description: "An implant giving the ability to understand and speak RootSpeak." + components: + - type: TranslatorImplanter + understood: + - RootSpeak + +- type: entity + id: MofficTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Moffic translator implant + description: "An implant giving the ability to understand and speak Moffic." + components: + - type: TranslatorImplanter + spoken: + - Moffic + understood: + - Moffic + +- type: entity + id: CodeSpeakImplanter + parent: [ BaseTranslatorImplanter ] + name: CodeSpeak Implanter + description: "\"CodeSpeak(tm) - Secure your communication with metaphors so elaborate, they seem randomly generated!\"" + components: + - type: TranslatorImplanter + spoken: + - CodeSpeak + understood: + - CodeSpeak + - type: StaticPrice + price: 150 + +- type: entity + id: SikTajTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: SikTaj translator implant + description: "An implant giving the ability to understand and speak SikTaj." + components: + - type: TranslatorImplanter + spoken: + - SikTaj + understood: + - SikTaj + +- type: entity + id: NianTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Nian translator implant + description: "An implant giving the ability to understand and speak Nian." + components: + - type: TranslatorImplanter + spoken: + - Nian + understood: + - Nian + +- type: entity + id: FireTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Nian translator implant + description: "An implant giving the ability to understand and speak Nian." + components: + - type: TranslatorImplanter + understood: + - Fire + +- type: entity + id: DraskTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Orluum translator implant + description: "An implant giving the ability to understand and speak Orluum." + components: + - type: TranslatorImplanter + spoken: + - Drask + understood: + - Drask + +- type: entity + id: UrsTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Urs translator implant + description: "An implant giving the ability to understand and speak Ursus language." + components: + - type: TranslatorImplanter + spoken: + - Urs + understood: + - Urs + +- type: entity + id: ArkaneTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Arkane translator implant + description: "An implant giving the ability to understand and speak Arcane language." + components: + - type: TranslatorImplanter + spoken: + - Arkane + understood: + - Arkane + +- type: entity + id: ShadowkinTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Shadowkin translator implant + description: "An implant giving the ability to understand and speak Shadowkin language." + components: + - type: TranslatorImplanter + spoken: + - Shadowkin + understood: + - Shadowkin + +- type: entity + id: BorgTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Borg translator implant + description: "An implant giving the ability to understand and speak Binary." + components: + - type: TranslatorImplanter + spoken: + - BorgTalk + understood: + - BorgTalk + +- type: entity + id: CintaTajTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: CintaTaj translator implant + description: "An implant giving the ability to understand and speak CintaTaj." + components: + - type: TranslatorImplanter + spoken: + - CintaTaj + understood: + - CintaTaj + + +- type: entity + id: SyndUniversalTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: universal translator implant + description: "An implant giving the ability to understand any racial language." + components: + - type: TranslatorImplanter + understood: + - RobotTalk + - Shadowkin + - Arkane + - Urs + - Drask + - Fire + - Nian + - SikTaj + - Moffic + - RootSpeak + - SolCommon + - Canilunzt + - Draconic + - Bubblish + - Nekomimetic + +- type: entity + id: DevTranslatorImplanter + parent: [ BaseTranslatorImplanter ] + name: Dev translator implant + description: "e" + components: + - type: TranslatorImplanter + spoken: + - Dev + understood: + - Dev diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/investigator_sjp.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/investigator_sjp.yml deleted file mode 100644 index 851e68b8de4..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/investigator_sjp.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - parent: BookBase - id: ADTBookInvestigator - name: Investigator. Standart Job Procedures - description: This big and very heavy book contain a SJP of Investigator. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_space_law - - type: Paper - content: book-text-investigator - - type: MeleeWeapon - attackRate: 1 - damage: - types: - Blunt: 5 - - -- type: entity - parent: BoxFolderBase - id: ADTInvestigatorBoxFolderBase - components: - - type: StorageFill - contents: - - id: PaperOffice - amount: 10 - -- type: entity - parent: BoxFolderRed - id: ADTInvestigatorBoxFolderRed - components: - - type: StorageFill - contents: - - id: PaperOffice - amount: 10 - -- type: entity - parent: BoxFolderBlue - id: ADTInvestigatorBoxFolderBlue - components: - - type: StorageFill - contents: - - id: PaperOffice - amount: 10 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml new file mode 100644 index 00000000000..ce8ccfc692b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml @@ -0,0 +1,105 @@ +#Посуда, всякие стаканы и столовые приборы +- type: entity + name: mixing-glass-name + parent: BaseBeaker + description: mixing-glass-desc + id: ADTMixingGlass + components: + - type: Spillable + solution: beaker + - type: Sprite + sprite: ADT/Objects/Misc/mixing_glass.rsi + layers: + - state: mixing_glass + - state: mixing_glass1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: mixing_glass-front + - type: Item + size: Small + sprite: ADT/Objects/Misc/mixing_glass.rsi + - type: SolutionContainerManager + solutions: + beaker: + maxVol: 90 + canMix: true + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 9 + fillBaseName: mixing_glass + - type: StaticPrice + price: 30 + - type: SolutionTransfer + canChangeTransferAmount: true + minTransferAmount: 1 + maxTransferAmount: 50 + transferAmount: 1 + #toggleState: 1 # draw + +- type: entity + parent: BaseItem + id: ADTJigger + name: jigger + description: a little cup. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 5 + - type: Drink + isOpen: true + - type: Item + size: Small + - type: FitsInDispenser + solution: drink + - type: DrawableSolution + solution: drink + - type: RefillableSolution + solution: drink + - type: DrainableSolution + solution: drink + - type: SolutionTransfer + canChangeTransferAmount: true + minTransferAmount: 1 + maxTransferAmount: 5 + transferAmount: 1 + #toggleState: 1 # draw + - type: Spillable + solution: drink + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/jigger.rsi + state: icon + - type: UserInterface + interfaces: + - key: enum.TransferAmountUiKey.Key + type: TransferAmountBoundUserInterface + - type: PhysicalComposition + materialComposition: + Steel: 10 + +- type: entity + name: Glass jug + description: A glass jug. Perfect container for lemonade + parent: DrinkGlassBase + id: ADTDrinkGlassJug + components: + - type: Sprite + sprite: ADT/Objects/Misc/glass_jug.rsi + layers: + - state: icon + map: [ "enum.SolutionContainerLayers.Base" ] + - state: fill1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - state: icon-front + map: [ "enum.SolutionContainerLayers.Overlay" ] + - type: Item + size: Normal + - type: Appearance + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: fill \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml deleted file mode 100644 index 7607bcd5706..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml +++ /dev/null @@ -1,40 +0,0 @@ -- type: entity - parent: BaseItem - id: ADTJigger - name: jigger - description: a little cup. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 5 - - type: Drink - isOpen: true - - type: Item - size: Small - - type: FitsInDispenser - solution: drink - - type: DrawableSolution - solution: drink - - type: RefillableSolution - solution: drink - - type: DrainableSolution - solution: drink - - type: SolutionTransfer - canChangeTransferAmount: true - minTransferAmount: 1 - maxTransferAmount: 5 - transferAmount: 1 - #toggleState: 1 # draw - - type: Spillable - solution: drink - - type: Sprite - sprite: ADT/Objects/Consumable/Drinks/jigger.rsi - state: icon - - type: UserInterface - interfaces: - - key: enum.TransferAmountUiKey.Key - type: TransferAmountBoundUserInterface - - type: PhysicalComposition - materialComposition: - Steel: 10 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml deleted file mode 100644 index da4aa9a5f9f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/mindshield_implant.yml +++ /dev/null @@ -1,16 +0,0 @@ -#- type: entity -# parent: BaseSubdermalImplant -# id: ADTMindShieldImplant -# name: mind shield implant -# description: Mindshield implant, protect fromo hypnosis by a enemy of NanoTrasen. -# noSpawn: true -# components: -# - type: SubdermalImplant - -#- type: entity -# id: ADTMindShieldImplanter -# name: mind shield implanter -# parent: BaseImplantOnlyImplanter -# components: -# - type: Implanter -# implant: ADTMindShieldImplant diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml index 81140183b57..6d82038fde6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/mini_fire_extinguisher.yml @@ -57,6 +57,4 @@ False: { state: fire_extinguisher_open } - type: Tag tags: - - MiniFireExtinguisher -- type: Tag - id: MiniFireExtinguisher + - MiniFireExtinguisher \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml deleted file mode 100644 index dea2b84aca7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: entity - name: mixing-glass-name - parent: BaseBeaker - description: mixing-glass-desc - id: ADTMixingGlass - components: - - type: Spillable - solution: beaker - - type: Sprite - sprite: ADT/Objects/Misc/mixing_glass.rsi - layers: - - state: mixing_glass - - state: mixing_glass1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - - state: mixing_glass-front - - type: Item - size: Small - sprite: ADT/Objects/Misc/mixing_glass.rsi - - type: SolutionContainerManager - solutions: - beaker: - maxVol: 90 - canMix: true - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 9 - fillBaseName: mixing_glass - - type: StaticPrice - price: 30 - - type: SolutionTransfer - canChangeTransferAmount: true - minTransferAmount: 1 - maxTransferAmount: 50 - transferAmount: 1 - #toggleState: 1 # draw diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/newyear.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyear.yml new file mode 100644 index 00000000000..da82896704d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/newyear.yml @@ -0,0 +1,216 @@ + +#Гирлянды + +- type: entity + name: goldenstar garland + parent: BaseItem + id: ADTGoldenStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTGoldenStarGarland + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: goldenstar_garland + - type: Item + #sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + size: Normal + +- type: entity + name: silverstar garland + parent: BaseItem + id: ADTSilverStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTSilverStarGarland + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: silverstar_garland + - type: Item + size: Normal + +- type: entity + name: base garland + parent: BaseItem + id: ADTBaseStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTBaseStarGarland + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: basestar_garland + - type: Item + size: Normal + +- type: entity + name: shiny garland + parent: BaseItem + id: ADTShinyGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTShinyGarland + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: shiny_garland + - type: Item + size: Normal + +#Новогодние шарики +- type: entity + name: red tree balls + parent: BaseItem + id: ADTTreeRedBalls + description: red tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedBalls + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: red_balls + - type: Item + size: Normal + +- type: entity + name: silver tree balls + parent: BaseItem + id: ADTTreeSilverBalls + description: silver tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverBalls + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: silver_balls + - type: Item + size: Normal + +- type: entity + name: golden tree balls + parent: BaseItem + id: ADTTreeGoldenBalls + description: silver tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenBalls + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: golden_balls + - type: Item + size: Normal + +#звезды + +- type: entity + name: golden tree star + parent: BaseItem + id: ADTTreeGoldenStar + description: golden tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenStar + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: golden_star + - type: Item + size: Small + +- type: entity + name: red tree star + parent: BaseItem + id: ADTTreeRedStar + description: red tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedStar + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: red_star + - type: Item + size: Small + +- type: entity + name: silver tree star + parent: BaseItem + id: ADTTreeSilverStar + description: silver tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverStar + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: silver_star + - type: Item + size: Small + +#мишура + +- type: entity + name: silver mishura + parent: BaseItem + id: ADTTreeSilverMishura + description: silver mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverMishura + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: silver_mishura + - type: Item + size: Small + +- type: entity + name: golden mishura + parent: BaseItem + id: ADTTreeGoldenMishura + description: golden mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenMishura + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: golden_mishura + - type: Item + size: Small + +- type: entity + name: red mishura + parent: BaseItem + id: ADTTreeRedMishura + description: red mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedMishura + - type: Sprite + sprite: ADT/Structures/Furniture/newyeartreetoys.rsi + state: red_mishura + - type: Item + size: Small diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml index b838ab97743..0a61f876322 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/paper.yml @@ -212,3 +212,508 @@ heldPrefix: pen size: Tiny +- type: entity + parent: BoxFolderBase + id: ADTInvestigatorBoxFolderBase + components: + - type: StorageFill + contents: + - id: PaperOffice + amount: 10 + +- type: entity + parent: BoxFolderRed + id: ADTInvestigatorBoxFolderRed + components: + - type: StorageFill + contents: + - id: PaperOffice + amount: 10 + +- type: entity + parent: BoxFolderBlue + id: ADTInvestigatorBoxFolderBlue + components: + - type: StorageFill + contents: + - id: PaperOffice + amount: 10 + +##Сами бумаги с формами для принтера +- type: entity + parent: Paper + id: ReportStation + name: Отчет о ситуации на станции + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ReportStation + +- type: entity + parent: Paper + id: ReporDepartment + name: Отчёт о работе отдела + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ReporDepartment + +- type: entity + parent: Paper + id: ReportEmployeePerformance + name: Отчёт о работе сотрудника + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ReportEmployeePerformance + +- type: entity + parent: Paper + id: ReportOnTheChaptersMeeting + name: Отчёт о собрании глав + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ReportOnTheChaptersMeeting + +- type: entity + parent: Paper + id: InternalAffairsAgentsReport + name: Отчёт Агента Внутренних Дел + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-InternalAffairsAgentsReport + +- type: entity + parent: Paper + id: ConditionReport + name: Отчёт о техническом состоянии + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ConditionReport + + +- type: entity + parent: Paper + id: ReportStudyObject + name: Отчёт об изучении объекта + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ReportStudyObject + +- type: entity + parent: Paper + id: DisposalReport + name: Отчёт об утилизации + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-DisposalReport + +- type: entity + parent: Paper + id: ApplicationAppointmentInterim + name: Заявление о назначении на ВрИО + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ApplicationAppointmentInterim + +- type: entity + parent: Paper + id: ApplicationEmployment + name: Заявление о трудоустройстве + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ApplicationEmployment + +- type: entity + parent: Paper + id: LetterResignation + name: Заявление об увольнении + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-LetterResignation + +- type: entity + parent: Paper + id: ApplicationAccess + name: Заявление на получение доступа + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ApplicationAccess + +- type: entity + parent: Paper + id: ApplicationEquipment + name: Заявление на получение снаряжения + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ApplicationEquipment + +- type: entity + parent: Paper + id: EvacuationShuttleRequest + name: Запрос эвакуационного шаттла + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-EvacuationShuttleRequest + +- type: entity + parent: Paper + id: ShuttleRegistrationRequest + name: Запрос регистрации шаттла + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ShuttleRegistrationRequest + +- type: entity + parent: Paper + id: RequestCallMembersCentralCommitteeDSO + name: Запрос на вызов членов ЦК, ДСО + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestCallMembersCentralCommitteeDSO + +- type: entity + parent: Paper + id: RequestChangeSalary + name: Запрос на изменение заработной платы + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestChangeSalary + +- type: entity + parent: Paper + id: RequestNonListedEmployment + name: Запрос внеперечневого трудоустройства + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestNonListedEmployment + +- type: entity + parent: Paper + id: RequestDocuments + name: Запрос предоставления документов + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestDocuments + +- type: entity + parent: Paper + id: RequestEuthanasia + name: Запрос на проведение эвтаназии + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestEuthanasia + +- type: entity + parent: Paper + id: RequestConstructionWork + name: Запрос на проведение строительных работ + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestConstructionWork + +- type: entity + parent: Paper + id: RequestModernization + name: Запрос на проведение модернизации + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-RequestModernization + +- type: entity + parent: Paper + id: ComplaintViolationLaborRules + name: Жалоба на нарушение трудового порядка + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ComplaintViolationLaborRules + +- type: entity + parent: Paper + id: ComplaintОffense + name: Жалоба на правонарушение + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ComplaintОffense + +- type: entity + parent: Paper + id: PermissionEquipment + name: Разрешение на использование снаряжения + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-PermissionEquipment + +- type: entity + parent: Paper + id: SearchPermission + name: Разрешение на обыск + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-SearchPermission + +- type: entity + parent: Paper + id: PermissionWeapons + name: Разрешение на ношение оружия + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-PermissionWeapons + +- type: entity + parent: Paper + id: PrescriptionDrugAuthorization + name: Разрешение на рецептурный препарат + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-PrescriptionDrugAuthorization + +- type: entity + parent: Paper + id: PermissionDisposeBody + name: Разрешение на утилизацию тела + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-PermissionDisposeBody + +- type: entity + parent: Paper + id: ConstructionPermit + name: Разрешение на строительство + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ConstructionPermit + +- type: entity + parent: Paper + id: OrderDismissal + name: Приказ об увольнении + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderDismissal + +- type: entity + parent: Paper + id: OrderDeprivationAccess + name: Приказ о лишении доступа + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderDeprivationAccess + +- type: entity + parent: Paper + id: OrderEncouragement + name: Приказ о поощрении + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderEncouragement + +- type: entity + parent: Paper + id: OrderParolePrisoner + name: Приказ об УДО заключенного + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderParolePrisoner + +- type: entity + parent: Paper + id: OrderRecognizingSentienceCreature + name: Приказ о признании разумности существа + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderRecognizingSentienceCreature + +- type: entity + parent: Paper + id: OrderMedicalIntervention + name: Распоряжение о медицинском вмешательстве + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderMedicalIntervention + +- type: entity + parent: Paper + id: ProductManufacturingOrder + name: Заказ на производство продукта + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-ProductManufacturingOrder + +- type: entity + parent: Paper + id: OrderPurchaseResourcesEquipment + name: Заказ на закупку ресурсов, снаряжения + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderPurchaseResourcesEquipment + +- type: entity + parent: Paper + id: OrderingSpecialEquipment + name: Заказ специального снаряжения + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderingSpecialEquipment + +- type: entity + parent: Paper + id: OrderPurchaseWeapons + name: Заказ на закупку вооружения + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-OrderPurchaseWeapons + +- type: entity + parent: Paper + id: Certificate + name: Грамота + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-Certificate + +- type: entity + parent: Paper + id: CertificateAdvancedTraining + name: Свидетельство о повышении квалификации + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-CertificateAdvancedTraining + +- type: entity + parent: Paper + id: CertificateOffense + name: Свидетельство о правонарушении + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-CertificateOffense + +- type: entity + parent: Paper + id: DeathCertificate + name: Свидетельство о смерти + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-DeathCertificate + +- type: entity + parent: Paper + id: MarriageCertificate + name: Свидетельство о заключении брака + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-MarriageCertificate + +- type: entity + parent: Paper + id: DivorceCertificate + name: Свидетельство о расторжении брака + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-DivorceCertificate + +- type: entity + parent: Paper + id: ClosingIndictment + name: Обвинительное заключение + description: Напечатано на принтере + components: + - type: Paper + content: ClosingIndictment + +- type: entity + parent: Paper + id: Sentence + name: Приговор + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-Sentence + +- type: entity + parent: Paper + id: StatementHealth + name: Заключение о состоянии здоровья + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-StatementHealth + +- type: entity + parent: Paper + id: NOTICEOFLIQUIDATION + name: УвЕдОмЛеНиЕ о ЛиКвИдАцИи + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-NOTICEOFLIQUIDATION + +- type: entity + parent: Paper + id: BUSINESSDEAL + name: ДеЛоВаЯ сДеЛкА + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-BUSINESSDEAL + +- type: entity + parent: Paper + id: NOTEBEGINNINGMILITARYACTIONS + name: НоТа О нАчАлЕ вОеНнЫх ДеЙсТвИй + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-NOTEBEGINNINGMILITARYACTIONS + +- type: entity + parent: Paper + id: REPORTACCOMPLISHMENTGOALS + name: ОтЧёТ о ВыПоЛнЕнИи ЦеЛеЙ + description: Напечатано на принтере + components: + - type: Paper + content: doc-text-printer-REPORTACCOMPLISHMENTGOALS diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/printerdocument.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/printerdocument.yml deleted file mode 100644 index 5411ba8e087..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/printerdocument.yml +++ /dev/null @@ -1,1058 +0,0 @@ -##Сами бумаги с формами -- type: entity - parent: Paper - id: ReportStation - name: Отчет о ситуации на станции - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ReportStation - -- type: entity - parent: Paper - id: ReporDepartment - name: Отчёт о работе отдела - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ReporDepartment - -- type: entity - parent: Paper - id: ReportEmployeePerformance - name: Отчёт о работе сотрудника - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ReportEmployeePerformance - -- type: entity - parent: Paper - id: ReportOnTheChaptersMeeting - name: Отчёт о собрании глав - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ReportOnTheChaptersMeeting - -- type: entity - parent: Paper - id: InternalAffairsAgentsReport - name: Отчёт Агента Внутренних Дел - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-InternalAffairsAgentsReport - -- type: entity - parent: Paper - id: ConditionReport - name: Отчёт о техническом состоянии - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ConditionReport - - -- type: entity - parent: Paper - id: ReportStudyObject - name: Отчёт об изучении объекта - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ReportStudyObject - -- type: entity - parent: Paper - id: DisposalReport - name: Отчёт об утилизации - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-DisposalReport - -- type: entity - parent: Paper - id: ApplicationAppointmentInterim - name: Заявление о назначении на ВрИО - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ApplicationAppointmentInterim - -- type: entity - parent: Paper - id: ApplicationEmployment - name: Заявление о трудоустройстве - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ApplicationEmployment - -- type: entity - parent: Paper - id: LetterResignation - name: Заявление об увольнении - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-LetterResignation - -- type: entity - parent: Paper - id: ApplicationAccess - name: Заявление на получение доступа - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ApplicationAccess - -- type: entity - parent: Paper - id: ApplicationEquipment - name: Заявление на получение снаряжения - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ApplicationEquipment - -- type: entity - parent: Paper - id: EvacuationShuttleRequest - name: Запрос эвакуационного шаттла - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-EvacuationShuttleRequest - -- type: entity - parent: Paper - id: ShuttleRegistrationRequest - name: Запрос регистрации шаттла - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ShuttleRegistrationRequest - -- type: entity - parent: Paper - id: RequestCallMembersCentralCommitteeDSO - name: Запрос на вызов членов ЦК, ДСО - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestCallMembersCentralCommitteeDSO - -- type: entity - parent: Paper - id: RequestChangeSalary - name: Запрос на изменение заработной платы - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestChangeSalary - -- type: entity - parent: Paper - id: RequestNonListedEmployment - name: Запрос внеперечневого трудоустройства - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestNonListedEmployment - -- type: entity - parent: Paper - id: RequestDocuments - name: Запрос предоставления документов - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestDocuments - -- type: entity - parent: Paper - id: RequestEuthanasia - name: Запрос на проведение эвтаназии - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestEuthanasia - -- type: entity - parent: Paper - id: RequestConstructionWork - name: Запрос на проведение строительных работ - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestConstructionWork - -- type: entity - parent: Paper - id: RequestModernization - name: Запрос на проведение модернизации - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-RequestModernization - -- type: entity - parent: Paper - id: ComplaintViolationLaborRules - name: Жалоба на нарушение трудового порядка - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ComplaintViolationLaborRules - -- type: entity - parent: Paper - id: ComplaintОffense - name: Жалоба на правонарушение - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ComplaintОffense - -- type: entity - parent: Paper - id: PermissionEquipment - name: Разрешение на использование снаряжения - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-PermissionEquipment - -- type: entity - parent: Paper - id: SearchPermission - name: Разрешение на обыск - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-SearchPermission - -- type: entity - parent: Paper - id: PermissionWeapons - name: Разрешение на ношение оружия - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-PermissionWeapons - -- type: entity - parent: Paper - id: PrescriptionDrugAuthorization - name: Разрешение на рецептурный препарат - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-PrescriptionDrugAuthorization - -- type: entity - parent: Paper - id: PermissionDisposeBody - name: Разрешение на утилизацию тела - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-PermissionDisposeBody - -- type: entity - parent: Paper - id: ConstructionPermit - name: Разрешение на строительство - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ConstructionPermit - -- type: entity - parent: Paper - id: OrderDismissal - name: Приказ об увольнении - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderDismissal - -- type: entity - parent: Paper - id: OrderDeprivationAccess - name: Приказ о лишении доступа - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderDeprivationAccess - -- type: entity - parent: Paper - id: OrderEncouragement - name: Приказ о поощрении - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderEncouragement - -- type: entity - parent: Paper - id: OrderParolePrisoner - name: Приказ об УДО заключенного - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderParolePrisoner - -- type: entity - parent: Paper - id: OrderRecognizingSentienceCreature - name: Приказ о признании разумности существа - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderRecognizingSentienceCreature - -- type: entity - parent: Paper - id: OrderMedicalIntervention - name: Распоряжение о медицинском вмешательстве - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderMedicalIntervention - -- type: entity - parent: Paper - id: ProductManufacturingOrder - name: Заказ на производство продукта - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-ProductManufacturingOrder - -- type: entity - parent: Paper - id: OrderPurchaseResourcesEquipment - name: Заказ на закупку ресурсов, снаряжения - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderPurchaseResourcesEquipment - -- type: entity - parent: Paper - id: OrderingSpecialEquipment - name: Заказ специального снаряжения - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderingSpecialEquipment - -- type: entity - parent: Paper - id: OrderPurchaseWeapons - name: Заказ на закупку вооружения - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-OrderPurchaseWeapons - -- type: entity - parent: Paper - id: Certificate - name: Грамота - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-Certificate - -- type: entity - parent: Paper - id: CertificateAdvancedTraining - name: Свидетельство о повышении квалификации - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-CertificateAdvancedTraining - -- type: entity - parent: Paper - id: CertificateOffense - name: Свидетельство о правонарушении - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-CertificateOffense - -- type: entity - parent: Paper - id: DeathCertificate - name: Свидетельство о смерти - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-DeathCertificate - -- type: entity - parent: Paper - id: MarriageCertificate - name: Свидетельство о заключении брака - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-MarriageCertificate - -- type: entity - parent: Paper - id: DivorceCertificate - name: Свидетельство о расторжении брака - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-DivorceCertificate - -- type: entity - parent: Paper - id: ClosingIndictment - name: Обвинительное заключение - description: Напечатано на принтере - components: - - type: Paper - content: ClosingIndictment - -- type: entity - parent: Paper - id: Sentence - name: Приговор - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-Sentence - -- type: entity - parent: Paper - id: StatementHealth - name: Заключение о состоянии здоровья - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-StatementHealth - -- type: entity - parent: Paper - id: NOTICEOFLIQUIDATION - name: УвЕдОмЛеНиЕ о ЛиКвИдАцИи - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-NOTICEOFLIQUIDATION - -- type: entity - parent: Paper - id: BUSINESSDEAL - name: ДеЛоВаЯ сДеЛкА - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-BUSINESSDEAL - -- type: entity - parent: Paper - id: NOTEBEGINNINGMILITARYACTIONS - name: НоТа О нАчАлЕ вОеНнЫх ДеЙсТвИй - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-NOTEBEGINNINGMILITARYACTIONS - -- type: entity - parent: Paper - id: REPORTACCOMPLISHMENTGOALS - name: ОтЧёТ о ВыПоЛнЕнИи ЦеЛеЙ - description: Напечатано на принтере - components: - - type: Paper - content: doc-text-printer-REPORTACCOMPLISHMENTGOALS - - -#Сам принтер -- type: entity - parent: BaseLathe - id: PrinterDoc - name: принтер документов - description: Уникальная разработка Nanotrasen. - components: - - type: Sprite - sprite: ADT/Structures/Machines/printer.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: idle - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Transform - noRot: false - - type: Machine - board: ADTFormPrinterMachineCircuitboard - - type: Lathe - producingSound: /Audio/Machines/scanning.ogg - idleState: icon - runningState: building - staticRecipes: - - ReportStationRecipe - - ReporDepartmentRecipe - - ReportEmployeePerformanceRecipe - - ReportOnTheChaptersMeetingRecipe - - InternalAffairsAgentsReportRecipe - - ConditionReportRecipe - - ReportStudyObjectRecipe - - DisposalReportRecipe - - ApplicationAppointmentInterimRecipe - - ApplicationEmploymentRecipe - - LetterResignationRecipe - - ApplicationAccessRecipe - - ApplicationEquipmentRecipe - - EvacuationShuttleRequestRecipe - - ShuttleRegistrationRequestRecipe - - RequestCallMembersCentralCommitteeDSORecipe - - RequestChangeSalaryRecipe - - RequestNonListedEmploymentRecipe - - RequestDocumentsRecipe - - RequestEuthanasiaRecipe - - RequestConstructionWorkRecipe - - RequestModernizationRecipe - - ComplaintViolationLaborRulesRecipe - - PermissionEquipmentRecipe - - SearchPermissionRecipe - - PermissionWeaponsRecipe - - PrescriptionDrugAuthorizationRecipe - - PermissionDisposeBodyRecipe - - ConstructionPermitRecipe - - OrderDismissalRecipe - - OrderDeprivationAccessRecipe - - OrderEncouragementRecipe - - OrderParolePrisonerRecipe - - OrderRecognizingSentienceCreatureRecipe - - OrderMedicalInterventionRecipe - - ProductManufacturingOrderRecipe - - OrderPurchaseResourcesEquipmentRecipe - - OrderingSpecialEquipmentRecipe - - OrderPurchaseWeaponsRecipe - - CertificateRecipe - - CertificateAdvancedTrainingRecipe - - CertificateOffenseRecipe - - DeathCertificateRecipe - - MarriageCertificateRecipe - - DivorceCertificateRecipe - - ClosingIndictmentRecipe - - SentenceRecipe - - StatementHealtheRecipe - - type: EmagLatheRecipes - emagStaticRecipes: - - NOTICEOFLIQUIDATIONRecipe - - BUSINESSDEALRecipe - - NOTEBEGINNINGMILITARYACTIONSRecipe - - REPORTACCOMPLISHMENTGOALSRecipe - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 25 - mask: - - TabletopMachineMask - layer: - - TabletopMachineLayer - - type: MaterialStorage - whitelist: - tags: - - Document - -#цена формы, результат -- type: latheRecipe - id: ReportStationRecipe - result: ReportStation - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ReporDepartmentRecipe - result: ReporDepartment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ReportEmployeePerformanceRecipe - result: ReportEmployeePerformance - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ReportOnTheChaptersMeetingRecipe - result: ReportOnTheChaptersMeeting - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: InternalAffairsAgentsReportRecipe - result: InternalAffairsAgentsReport - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ConditionReportRecipe - result: ConditionReport - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ReportStudyObjectRecipe - result: ReportStudyObject - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: DisposalReportRecipe - result: DisposalReport - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ApplicationAppointmentInterimRecipe - result: ApplicationAppointmentInterim - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ApplicationEmploymentRecipe - result: ApplicationEmployment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: LetterResignationRecipe - result: LetterResignation - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ApplicationAccessRecipe - result: ApplicationAccess - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ApplicationEquipmentRecipe - result: ApplicationEquipment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: EvacuationShuttleRequestRecipe - result: EvacuationShuttleRequest - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ShuttleRegistrationRequestRecipe - result: ShuttleRegistrationRequest - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestCallMembersCentralCommitteeDSORecipe - result: RequestCallMembersCentralCommitteeDSO - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestChangeSalaryRecipe - result: RequestChangeSalary - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestNonListedEmploymentRecipe - result: RequestNonListedEmployment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestDocumentsRecipe - result: RequestDocuments - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestEuthanasiaRecipe - result: RequestEuthanasia - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestConstructionWorkRecipe - result: RequestConstructionWork - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: RequestModernizationRecipe - result: RequestModernization - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ComplaintViolationLaborRulesRecipe - result: ComplaintViolationLaborRules - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ComplaintОffenseRecipe - result: ComplaintОffense - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: PermissionEquipmentRecipe - result: PermissionEquipment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: SearchPermissionRecipe - result: SearchPermission - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: PermissionWeaponsRecipe - result: PermissionWeapons - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: PrescriptionDrugAuthorizationRecipe - result: PrescriptionDrugAuthorization - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: PermissionDisposeBodyRecipe - result: PermissionDisposeBody - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ConstructionPermitRecipe - result: ConstructionPermit - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderDismissalRecipe - result: OrderDismissal - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderDeprivationAccessRecipe - result: OrderDeprivationAccess - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderEncouragementRecipe - result: OrderEncouragement - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderParolePrisonerRecipe - result: OrderParolePrisoner - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderRecognizingSentienceCreatureRecipe - result: OrderRecognizingSentienceCreature - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderMedicalInterventionRecipe - result: OrderMedicalIntervention - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ProductManufacturingOrderRecipe - result: ProductManufacturingOrder - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderPurchaseResourcesEquipmentRecipe - result: OrderPurchaseResourcesEquipment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderingSpecialEquipmentRecipe - result: OrderingSpecialEquipment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: OrderPurchaseWeaponsRecipe - result: OrderPurchaseWeapons - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: CertificateRecipe - result: Certificate - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: CertificateAdvancedTrainingRecipe - result: CertificateAdvancedTraining - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: CertificateOffenseRecipe - result: CertificateOffense - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: DeathCertificateRecipe - result: DeathCertificate - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: MarriageCertificateRecipe - result: MarriageCertificate - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: DivorceCertificateRecipe - result: DivorceCertificate - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: ClosingIndictmentRecipe - result: ClosingIndictment - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: SentenceRecipe - result: Sentence - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: StatementHealtheRecipe - result: StatementHealth - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: NOTICEOFLIQUIDATIONRecipe - result: NOTICEOFLIQUIDATION - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: BUSINESSDEALRecipe - result: BUSINESSDEAL - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: NOTEBEGINNINGMILITARYACTIONSRecipe - result: NOTEBEGINNINGMILITARYACTIONS - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - -- type: latheRecipe - id: REPORTACCOMPLISHMENTGOALSRecipe - result: REPORTACCOMPLISHMENTGOALS - completetime: 1 - applyMaterialDiscount: false - materials: - SheetPrinter: 100 - - - #плата принтера -- type: entity - id: ADTFormPrinterMachineCircuitboard - parent: BaseItem - name: form printer machine board - components: - - type: MachineBoard - prototype: PrinterDoc - requirements: - MatterBin: 1 - Manipulator: 2 - - type: Sprite - sprite: Objects/Misc/module.rsi - state: generic - - type: Tag - tags: - - WhitelistChameleon - - type: StaticPrice - price: 100 - - type: PhysicalComposition - materialComposition: - Glass: 400 - chemicalComposition: - Silicon: 20 - - -#плата принтера рецепт в протолате -- type: latheRecipe - id: ADTFormPrinterMachineCircuitboard - result: ADTFormPrinterMachineCircuitboard - completetime: 4 - materials: - Steel: 100 - Glass: 900 - - # Материал бумага -- type: material - id: SheetPrinter - stackEntity: Paper - name: бумага - icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } - color: "#ffffff" - price: 0.05 - - -# Стак бумаги. -- type: stack - id: Paper1 - name: paper - icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper } - spawn: Paper - maxCount: 1 - itemSize: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml new file mode 100644 index 00000000000..61f1db5dea5 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml @@ -0,0 +1,102 @@ +- type: entity + id: ADTRadioHandheldTSF + name: TSF handheld radio + description: A handy handheld radio. + components: + - type: ApcPowerReceiver + needsPower: false + powerLoad: 0 + - type: Electrified + enabled: false + usesApcPower: false + - type: RadioMicrophone + powerRequired: false + unobstructedRequired: true + listenRange: 2 + toggleOnInteract: false + - type: RadioSpeaker + toggleOnInteract: false + channels: + - ADTTransSolar19482Channel + - ADTTransSolar19487Channel + - ADTTransSolar19489Channel + - type: Intercom + supportedChannels: + - ADTTransSolar19482Channel + - ADTTransSolar19487Channel + - ADTTransSolar19489Channel + - type: Speech + speechVerb: Robotic + - type: Clickable + - type: InteractionOutline + - type: Appearance + - type: Sprite + sprite: ADT/Objects/Device/tsf_radio.rsi + layers: + - state: icon + - type: Clothing + sprite: ADT/Objects/Device/tsf_radio.rsi + quickEquip: false + slots: + - ears + - type: ActivatableUIRequiresPower + - type: ActivatableUI + key: enum.IntercomUiKey.Key + - type: UserInterface + interfaces: + - key: enum.IntercomUiKey.Key + type: IntercomBoundUserInterface + - type: Item + size: Small + - type: MovedByPressure + - type: EmitSoundOnCollide + sound: + collection: WeakHit + - type: EmitSoundOnLand + sound: + path: /Audio/Effects/drop.ogg + params: + volume: 2 + - type: DamageOnHighSpeedImpact + damage: + types: + Blunt: 5 + soundHit: + collection: MetalThud + - type: CollisionWake + - type: TileFrictionModifier + modifier: 0.5 + - type: Physics + bodyType: Dynamic + fixedRotation: false + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 # fite me + friction: 0.2 + - type: Pullable + - type: DamageExaminable + +- type: entity + name: handheld radio + description: A handy handheld radio. + parent: BaseItem + id: ADTWiretapping + components: + - type: RadioMicrophone + broadcastChannel: ADTWiretapping + listenRange: 8 + enabled: false + toggleOnInteract: true + - type: Sprite + sprite: ADT/Objects/Misc/wiretapping.rsi + layers: + - state: wiretapping + - type: Item + sprite: ADT/Objects/Misc/wiretapping.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/RingStorage.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Misc/RingStorage.yml rename to Resources/Prototypes/ADT/Entities/Objects/Misc/ring_box.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/schrodinger.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/schrodinger.yml deleted file mode 100644 index f806c0b2f7f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/schrodinger.yml +++ /dev/null @@ -1,179 +0,0 @@ -- type: entity - id: ADTBriefcaseBrownSchrodinger - name: Schrodinger`s briefcase - parent: ADTBriefcaseCentcomm - suffix: Filled - components: - - type: Storage - grid: - - 0,0,6,5 - #- type: Storage - # maxItemSize: Ginormous - # maxTotalWeight: 0 - # maxSlots: 50 #By this ignore maxTotalWeight - - type: StorageFill - contents: - - id: ClothingShoesBootsLaceup - - id: ClothingHandsGlovesCombat - - id: ClothingEyesGlassesSunglasses - - id: ClothingMaskGasCentcom - - id: ClothingUniformJumpsuitCentcomAgent - - id: ADTWeaponRevolverDeckardGold - - id: CentcomPDA - - id: ADTClothingNeckMantleCentComm - - id: ClothingHeadsetAltCentCom - - id: ADTClothingOuterCoatSchroCoat - - id: ADTClothingNeckNanoTrasenPinSchrodinger - -- type: entity - name: Deckard - parent: BaseWeaponRevolver - id: ADTWeaponRevolverDeckardGold - description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Revolvers/decard_gold.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-3 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Gun - selectedMode: FullAuto - fireRate: 2.6 - availableModes: - - SemiAuto - - FullAuto - - type: RevolverAmmoProvider - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - - type: MagazineVisuals - magState: mag - steps: 4 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 10000 - -# - type: entity -# name: N1984 -# parent: BaseWeaponPistol -# id: WeaponPistolN1984 # the spaces in description are for formatting. -# description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. -# components: -# - type: StaticPrice -# price: 10000 -# - type: Sprite -# sprite: Objects/Weapons/Guns/Pistols/N1984.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - state: mag-0 -# map: ["enum.GunVisualLayers.Mag"] -# - type: Clothing -# sprite: Objects/Weapons/Guns/Pistols/N1984.rsi -# - type: Gun -# minAngle: 1 -# maxAngle: 20 -# angleIncrease: 8 -# angleDecay: 9 -# fireRate: 4 -# availableModes: -# - SemiAuto -# soundGunshot: -# path: /Audio/Weapons/Guns/Gunshots/mk58.ogg -# - type: ItemSlots -# slots: -# gun_magazine: -# name: Magazine -# startingItem: MagazineMagnum -# insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg -# ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg -# priority: 2 -# whitelist: -# tags: -# - MagazineMagnum -# gun_chamber: -# name: Chamber -# startingItem: CartridgeMagnum -# priority: 1 -# whitelist: -# tags: -# - CartridgeMagnum - - -- type: entity - parent: ClothingNeckBase - id: ADTClothingNeckMantleCentComm - name: head of security's shoulder mantle - description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. - components: - - type: Sprite - sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi - - type: Clothing - sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi - -- type: entity - parent: ClothingOuterStorageBase - id: ADTClothingOuterCoatSchroCoat - name: Schrodinger`s Coat - description: This dark coat is heavier than look - components: - - type: Storage - grid: - - 0,0,4,2 - maxItemSize: Normal - - type: Sprite - sprite: ADT/Clothing/OuterClothing/Coats/schrodinger_coat.rsi - - type: Clothing - sprite: ADT/Clothing/OuterClothing/Coats/schrodinger_coat.rsi - - type: StorageFill - contents: - - id: ADTCigarSchrodingerCase - - id: FlippoSchrodingerLighter - - id: SpeedLoaderMagnum - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.7 - Heat: 0.8 - -- type: entity - id: ADTCigarSchrodingerCase - parent: CigarCase - name: case Melnicov - description: Case - components: - - type: StorageFill - contents: - - id: ADTSchrodingerCigar - amount: 8 - - type: Sprite - sprite: ADT/Objects/Consumable/Smokeables/melnikov_case.rsi - -- type: entity - id: ADTSchrodingerCigar - parent: CigarGold - name: Sigar Gold - description: Sigar - components: - - type: SolutionContainerManager - solutions: - smokable: - maxVol: 45 - reagents: - - ReagentId: Nicotine - Quantity: 40 - - ReagentId: Omnizine - Quantity: 5 - -- type: entity - id: ADTClothingNeckNanoTrasenPinSchrodinger - parent: ClothingNeckNanoTrasenPin - components: - - type: TypingIndicatorClothing - proto: lawyer #lawyer robot alien moth diff --git a/Resources/Prototypes/ADT/Entities/Structures/syndie.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/syndiebox.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/syndie.yml rename to Resources/Prototypes/ADT/Entities/Objects/Misc/syndiebox.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/weapon_case.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/weapon_case.yml new file mode 100644 index 00000000000..7dc8955059b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/weapon_case.yml @@ -0,0 +1,14 @@ +# Прототип кейса для хранения оружия. +- type: entity + parent: CrateBaseSecure + id: ADTCrateCaseSecurity + name: secgear crate + components: + - type: Icon + sprite: Structures/Storage/Crates/sec_gear.rsi + - type: Sprite + sprite: Structures/Storage/Crates/sec_gear.rsi + - type: AccessReader + access: [["Security"]] + - type: Item + size: Ginormous diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml deleted file mode 100644 index d8338013a06..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml +++ /dev/null @@ -1,104 +0,0 @@ -- type: radioChannel - id: ADTWiretapping - name: Засекреченная линия - keycode: '\' - frequency: 1672 - color: "#ff144b" - longRange: true - -- type: entity - parent: EncryptionKey - id: ADTWiretappingEncryptionKey - name: common encryption key - description: An encryption key used by anyone. - components: - - type: EncryptionKey - channels: - - ADTWiretapping - defaultChannel: ADTWiretapping - - type: Sprite - layers: - - state: crypt_gray - - state: sec_label - -- type: entity - parent: ClothingHeadset - id: ADTWiretappingClothingHeadset - name: cargo headset - description: A headset used by supply employees. - components: - - type: ContainerFill - containers: - key_slots: - - ADTWiretappingEncryptionKey - - type: Sprite - sprite: Clothing/Ears/Headsets/security.rsi - state: icon_alt - - type: Clothing - sprite: Clothing/Ears/Headsets/security.rsi - -- type: entity - name: handheld radio - description: A handy handheld radio. - parent: BaseItem - id: ADTWiretapping - components: - - type: RadioMicrophone - broadcastChannel: ADTWiretapping - listenRange: 8 - enabled: false - toggleOnInteract: true - - type: Sprite - sprite: ADT/Objects/Misc/wiretapping.rsi - layers: - - state: wiretapping - - type: Item - sprite: ADT/Objects/Misc/wiretapping.rsi - -- type: entity - parent: BaseItem - id: ADTWiretappingToy - name: WiretappingToy - abstract: true - components: - - type: Matchbox - - type: StorageFill - contents: - - id: ADTWiretapping - - type: Storage - grid: - - 0,0,1,0 - maxItemSize: Small - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface - - -- type: entity - parent: [ PlushieBee, ADTWiretappingToy ] - id: ADTWiretappingPlushieBee - name: bee plushie - description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. - -- type: entity - parent: [ PlushieSharkPink, ADTWiretappingToy ] - id: ADTWiretappingPlushieSharkPink - name: pink shark soft toy - description: Hehe shonk :) - -- type: entity - parent: [ PlushieCarp, ADTWiretappingToy ] - id: ADTWiretappingPlushieCarp - name: carp plushie - description: An adorable stuffed toy that resembles the monstrous space carp. - -- type: entity - parent: [ PlushieSlime, ADTWiretappingToy ] - id: ADTWiretappingPlushieSlime - name: slime plushie - description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/zipbag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/zipbag.yml new file mode 100644 index 00000000000..cb12307de31 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/zipbag.yml @@ -0,0 +1,35 @@ +- type: entity + id: ADTEvidanceBag + name: Evidance Bag + parent: BaseItem + description: Designed to store evidence, not drugs + components: + - type: Appearance + - type: Sprite + sprite: ADT/Objects/Misc/Evidance.rsi + state: icon + scale: 0.6, 0.6 + - type: ItemSlots + slots: + place: + name: Place + #startingItem: null + priority: 1 + whitelist: + tags: + - ADTPillExperimental + - ADTPillExter + - type: ItemMapper + mapLayers: + place_number: + whitelist: + tags: + - ADTPillExperimental + place_number2: + whitelist: + tags: + - ADTPillExter + sprite: ADT/Objects/Misc/Evidance.rsi + - type: ContainerContainer + containers: + place: !type:ContainerSlot \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml index e7bffbee7ba..7ccd0d7e7c1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Power/powercell.yml @@ -33,11 +33,6 @@ maxCharge: 3600 startingCharge: 0 - -#тэг для магазина лазгана -- type: Tag - id: ADTLasgunPowerCell - - type: entity name: lasgun power sell description: lasgun power sell @@ -129,5 +124,3 @@ - type: ProjectileBatteryAmmoProvider proto: ADTBulletLaserMK2 fireCost: 100 -- type: Tag - id: ADTLasgunRevolverCell diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ert_shield.yml b/Resources/Prototypes/ADT/Entities/Objects/Shields/shields.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ert_shield.yml rename to Resources/Prototypes/ADT/Entities/Objects/Shields/shields.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Chapel/cross.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Chapel/cross.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/buckwheat_seeds.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/buckwheat_seeds.yml deleted file mode 100644 index 5e7bda38cd0..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/buckwheat_seeds.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: SeedBase - name: packet of buckwheat seed - id: ADTBuckwheatSeeds - components: - - type: Seed - seedId: ADTbuckwheatplant - - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/buckwheat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/cocoa_seeds.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/cocoa_seeds.yml deleted file mode 100644 index 0df3dfe7d9a..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/cocoa_seeds.yml +++ /dev/null @@ -1,9 +0,0 @@ -#- type: entity -# parent: SeedBase -# name: seed of cocoa -# id: ADTCocoaSeeds -# components: -# - type: Seed -# seedId: ADTcocoatree -# - type: Sprite -# sprite: ADT/Objects/Specific/Hydroponics/cocoa.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml index 97ca416e11d..61dff9fc219 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds/seeds.yml @@ -16,4 +16,26 @@ - type: Seed seedId: ADTPapaverSomniferum - type: Sprite - sprite: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi \ No newline at end of file + sprite: ADT/Objects/Specific/Hydroponics/papaver_somniferum.rsi + +# пакет семян +- type: entity + parent: SeedBase + name: packet of mandarin seeds + id: ADTMandarinSeeds + suffix: NewYear + components: + - type: Seed + seedId: ADTmandarin + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + +- type: entity + parent: SeedBase + name: packet of buckwheat seed + id: ADTBuckwheatSeeds + components: + - type: Seed + seedId: ADTbuckwheatplant + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/buckwheat.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Bottles.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Bottles.yml index 11b8e5bd9cb..3161f080080 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Bottles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Bottles.yml @@ -237,3 +237,42 @@ reagents: - ReagentId: Omnizine Quantity: 30 + +- type: entity + id: ADTAmatoxinChemistryBottle + name: amatoxin bottle + parent: BaseChemistryBottleFilled + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Amatoxin + Quantity: 30 + +- type: entity + id: ADTLicoxideChemistryBottle + name: licoxide bottle + parent: BaseChemistryBottleFilled + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Licoxide + Quantity: 30 + +- type: entity + id: ADTLexorinChemistryBottle + name: licoxide bottle + parent: BaseChemistryBottleFilled + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Lexorin + Quantity: 30 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml index fe9e08ba98e..1685da0f82b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml @@ -330,3 +330,116 @@ - type: Hypospray - type: UseDelay delay: 1.0 + +- type: entity + name: Jana + parent: BaseItem + description: A sterile injector for rapid administration of drugs to patients. + id: JanaHypo + components: + - type: Sprite + sprite: ADT/Objects/Misc/Hyppo.rsi + state: hypo + - type: Item + sprite: ADT/Objects/Misc/Hyppo.rsi + size: Small + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 50 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + - type: UseDelay + delay: 0 + - type: StaticPrice + price: 750 + - type: UnpoweredFlashlight + - type: PointLight + enabled: false + radius: 2 + softness: 5 + autoRot: true + color: "#be090e" + energy: 3 + +- type: entity + name: гипоспрей Киберсан + parent: BaseItem + description: Великолепный медицинский девайс в удобном дизайне от Киберсан ! + id: ADTCyberHypospray + components: + - type: Sprite + sprite: ADT/Objects/Specific/cyberhypo.rsi + state: hypo + - type: Item + sprite: ADT/Objects/Specific/cyberhypo.rsi + size: Small + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 30 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + - type: UseDelay + delay: 0.5 + + +- type: entity + name: pill + parent: FoodInjectableBase + id: ADTPillExperimental + description: It's not a suppository. + components: + - type: SliceableFood + count: 2 + - type: Sprite + sprite: ADT/Objects/Misc/pill_ex.rsi + state: trava_ent + scale: 0.6, 0.6 + - type: Item + size: Tiny + - type: Tag + tags: + - ADTPillExperimental + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: SpaceDrugs + Quantity: 15 + - ReagentId: Nocturine + Quantity: 15 + +- type: entity + name: pill + parent: FoodInjectableBase + id: ADTPillExter + description: It's not a suppository. + components: + - type: SliceableFood + count: 2 + - type: Sprite + sprite: ADT/Objects/Misc/pill_ex.rsi + state: extezi_ent + scale: 0.6, 0.6 + - type: Item + size: Tiny + - type: Tag + tags: + - ADTPillExter + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Stimulants + Quantity: 15 + - ReagentId: SpaceDrugs + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Pills.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Pills.yml index bdf5e6c8eb6..def5a83e346 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Pills.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Pills.yml @@ -304,4 +304,4 @@ Quantity: 10 - type: Sprite sprite: Objects/Specific/Chemistry/pills.rsi - state: pill16 + state: pill16 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/ChemicalJugs.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/ChemicalJugs.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/perfume.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Service/perfume.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/zookeperhealthanalyzer.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Specific/zookeperhealthanalyzer.yml rename to Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml deleted file mode 100644 index 05cc38023f1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - name: гипоспрей Киберсан - parent: BaseItem - description: Великолепный медицинский девайс в удобном дизайне от Киберсан ! - id: ADTCyberHypospray - components: - - type: Sprite - sprite: ADT/Objects/Specific/cyberhypo.rsi - state: hypo - - type: Item - sprite: ADT/Objects/Specific/cyberhypo.rsi - size: Small - - type: SolutionContainerManager - solutions: - hypospray: - maxVol: 30 - - type: RefillableSolution - solution: hypospray - - type: ExaminableSolution - solution: hypospray - - type: Hypospray - - type: UseDelay - delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/FlippoLighter.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/FlippoLighter.yml index 27887d02e8f..7a48809fa4a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/FlippoLighter.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/FlippoLighter.yml @@ -30,6 +30,8 @@ activatedDamage: types: Heat: 1 + - type: IgnitionSource + ignited: false - type: ItemToggleSize activatedSize: Small - type: ItemToggleHot @@ -106,6 +108,8 @@ map: ["flame"] visible: false shader: unshaded + - type: IgnitionSource + ignited: false - type: ItemToggle predictable: false soundActivate: @@ -192,6 +196,8 @@ map: ["flame"] visible: false shader: unshaded + - type: IgnitionSource + ignited: false - type: ItemToggle predictable: false soundActivate: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml index c156d3a8f7a..84d6ce945dd 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml @@ -177,3 +177,24 @@ - type: Appearance - type: StaticPrice price: 40 + +- type: entity + name: Urog-Djax crowbar + parent: Crowbar + id: UrogCrowbarGold + components: + - type: Tag + tags: + - Crowbar + - type: Sprite + sprite: ADT/Memes/gold-crowbar.rsi + state: gold-icon + - type: Item + sprite: ADT/Memes/gold-crowbar.rsi + size: Normal + heldPrefix: gold + +- type: loadout + id: UrogDjaxLoadout + entity: UrogCrowbarGold + sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml deleted file mode 100644 index 414140ac33f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - name: Urog-Djax crowbar - parent: Crowbar - id: UrogCrowbarGold - components: - - type: Tag - tags: - - Crowbar - - type: Sprite - sprite: ADT/Memes/gold-crowbar.rsi - state: gold-icon - - type: Item - sprite: ADT/Memes/gold-crowbar.rsi - size: Normal - heldPrefix: gold - -- type: loadout - id: UrogDjaxLoadout - entity: UrogCrowbarGold - sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/pirate_jaws_of_life.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/jaws_of_life.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Tools/pirate_jaws_of_life.yml rename to Resources/Prototypes/ADT/Entities/Objects/Tools/jaws_of_life.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml deleted file mode 100644 index b1c586f2c5e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/bibis.yml +++ /dev/null @@ -1,150 +0,0 @@ -- type: Tag - id: ADTCartridgeBibis - -- type: Tag - id: ADTMagazineRifleBibis - -- type: entity - id: ADTBaseCartridgeStrikeball - name: bibis - parent: BaseCartridge - abstract: true - components: - - type: Tag - tags: - - Cartridge - - ADTCartridgeBibis - - type: CartridgeAmmo - deleteOnSpawn: true - - type: Sprite - noRot: false - sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi - layers: - - state: base - map: ["enum.AmmoVisualLayers.Base"] - - type: Appearance - - type: SpentAmmoVisuals - - type: StaticPrice - price: 1 - -- type: entity - id: ADTCartridgeStrikeballBibis - name: bibis - parent: ADTBaseCartridgeStrikeball - components: - - type: CartridgeAmmo - proto: ADTBulletBibis - -- type: entity - id: ADTBulletBibis - name: bibis ball - parent: BaseBulletRubber - noSpawn: true - components: - - type: Projectile - damage: - types: - Blunt: 0.1 - - type: StaminaDamageOnCollide - damage: 5 - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: depleted-uranium - -- type: entity - name: Lecter Strikeball - parent: BaseWeaponRifle - id: ADTWeaponRifleLecterBibis - description: A high end military grade assault rifle. Uses .20 rifle ammo. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - - type: Gun - fireRate: 10 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/airsoft.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineRifleBibis - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - ADTMagazineRifleBibis - gun_chamber: - name: Chamber - startingItem: ADTCartridgeStrikeballBibis - priority: 1 - whitelist: - tags: - - ADTCartridgeBibis - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - -# Empty mags -- type: entity - id: ADTBaseMagazineBibis - name: "magazine bibis" - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - ADTMagazineRifleBibis - - type: Item - size: Small - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - ADTCartridgeBibis - capacity: 200 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -# Magazines -- type: entity - id: ADTMagazineRifleBibis - name: "magazine bibis" - parent: ADTBaseMagazineBibis - components: - - type: BallisticAmmoProvider - proto: ADTCartridgeStrikeballBibis - - type: Sprite - layers: - - state: red - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/muchhurt.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.yml new file mode 100644 index 00000000000..f4be5b01f8e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/strikeball.yml @@ -0,0 +1,30 @@ +- type: entity + id: ADTBaseCartridgeStrikeball + name: bibis + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - ADTCartridgeBibis + - type: CartridgeAmmo + deleteOnSpawn: true + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Ammunition/airsoft_bibis.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + - type: StaticPrice + price: 1 + +- type: entity + id: ADTCartridgeStrikeballBibis + name: bibis + parent: ADTBaseCartridgeStrikeball + components: + - type: CartridgeAmmo + proto: ADTBulletBibis \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 78c03e036df..57e6e89088f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -1,6 +1,3 @@ -- type: Tag - id: ADTMagazinePistolPMM - - type: entity id: ADTMagazinePistolPMM name: PMM pistol magazine diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml similarity index 59% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index fe8d1f4dd35..17eee0308d4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle_ext.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -47,9 +47,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: Tag - id: ADTMagazineRifleAR12 - - type: entity id: ADTMagazineRifleAR12 name: AR-12 magazine @@ -72,3 +69,52 @@ magState: mag steps: 2 zeroVisible: false + +# Base mags +- type: entity + id: ADTBaseMagazineRifleFNFAL + name: "extended magazine (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - ADTMagazineRifleFNFAL + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 20 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +# Magazines FN_FAL +- type: entity + id: ADTMagazineRifleFNFAL + name: "extended magazine (.20 rifle)" + parent: ADTBaseMagazineRifleFNFAL + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml new file mode 100644 index 00000000000..557facea32b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/strikeball.yml @@ -0,0 +1,48 @@ +# Empty mags +- type: entity + id: ADTBaseMagazineBibis + name: "magazine bibis" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - ADTMagazineRifleBibis + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - ADTCartridgeBibis + capacity: 200 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +# Magazines +- type: entity + id: ADTMagazineRifleBibis + name: "magazine bibis" + parent: ADTBaseMagazineBibis + components: + - type: BallisticAmmoProvider + proto: ADTCartridgeStrikeballBibis + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/ussp.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/ussp.yml index 4e50954f7ce..25341a921aa 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/ussp.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/ussp.yml @@ -1,3 +1,5 @@ +# Разбирайтесь сами что и какие патроны куда,я без понятия + #Магазин для СВЧ - type: entity @@ -34,20 +36,8 @@ zeroVisible: false - type: Appearance -- type: Tag - id: ADTMagazineSniperSVCH - #Магазины для ПП -- type: Tag - id: ADTMagazineSR3M - -- type: Tag - id: ADTMagazineSR2M - -- type: Tag - id: ADTMagazineBizon - - type: entity id: ADTMagazineSR3M name: magazine SR3m @@ -152,12 +142,6 @@ #Магазины для пулеметов -- type: Tag - id: ADTMagazineUSSPLMG - -- type: Tag - id: ADTMagazineUSSPLMGDrum - - type: entity id: ADTMagazineUSSPLMG name: box of 7.62 for LMG @@ -228,9 +212,6 @@ #Магазин 6.5 мм под АК -- type: Tag - id: ADTMagazineUSSPAK74 - - type: entity id: ADTMagazineUSSPAK74 name: magazine ak74 @@ -267,9 +248,6 @@ #Бакелитовый под 7.62 -- type: Tag - id: ADTMagazineUSSPAKM - - type: entity id: ADTMagazineUSSPAKM name: magazine AKM bacelite diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/muchhurt.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rockets.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rockets.yml index 33c2f5783ff..bfbbf5dd3a0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rockets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rockets.yml @@ -61,12 +61,6 @@ #ракета для Шмеля -- type: Tag - id: ADTCartridgeRocketSchmelTermobar - -- type: Tag - id: ADTCartridgeRocketSapogHEAT - - type: entity id: ADTCartridgeRocketSchmelTermobar name: Schmel Termobar Rocket diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/pistol.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/pistol.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Syndicate.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Basic/whitecane.yml similarity index 98% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Syndicate.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Basic/whitecane.yml index 2ff844c9278..ca906728106 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Syndicate.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Basic/whitecane.yml @@ -32,4 +32,4 @@ ballistic-ammo: !type:Container ents: [] - type: StaticPrice - price: 4500 + price: 4500 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index cf72259562c..c95e32c33d0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -141,3 +141,49 @@ - ADTLasgunRevolverCell - type: Clothing sprite: ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi + +- type: entity + name: X-01 multiphas laser pistol + parent: BaseWeaponBatterySmall + id: ADtWeaponSecCyborg + description: new version of antique gun witout selfrcharge + components: + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 10 + - type: Sprite + sprite: ADT/Mobs/Silicon/Cyborg/cyb_gun.rsi + scale: 0.9, 0.9 + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + visible: false + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Appearance + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Clothing + sprite: ADT/Mobs/Silicon/Cyborg/cyb_gun.rsi + - type: Gun + fireRate: 1.7 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + personable: true + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 60 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletDisabler + fireCost: 70 + - proto: ADTEmitterBoltCyb + fireCost: 140 + - proto: ADTAnomalousParticleOmegaStrongCyb + fireCost: 200 + - type: Battery + maxCharge: 2220 + startingCharge: 2220 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/LMG/ussp.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/LMG/lmgs.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/LMG/ussp.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/LMG/lmgs.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/impacts.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/impacts.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/impact.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7bcd7935117..7b7bb5b22e1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -29,3 +29,20 @@ reagents: - ReagentId: TearGas Quantity: 50 + +- type: entity + id: ADTBulletBibis + name: bibis ball + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 0.1 + - type: StaminaDamageOnCollide + damage: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: depleted-uranium \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml deleted file mode 100644 index 955fad911e1..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml +++ /dev/null @@ -1,107 +0,0 @@ -- type: entity - name: BaseWeaponRevolver357 - parent: BaseItem - id: BaseWeaponRevolver357 - description: A rooty tooty point and shooty. - abstract: true - components: - - type: Sprite - state: icon - - type: Item - size: Small - shape: - - 0,0,1,0 - - 0,1,0,1 - - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - quickEquip: false - slots: - - suitStorage - - Belt - - type: Gun - selectedMode: SemiAuto - fireRate: 1.5 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/revolver.ogg - - type: ContainerContainer - containers: - revolver-ammo: !type:Container - - type: RevolverAmmoProvider - whitelist: - tags: - - Cartridge357 - - SpeedLoader357 - proto: Cartridge357 - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - soundEject: - path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg - soundInsert: - path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - - type: StaticPrice - price: 500 - -- type: entity - name: Python - parent: BaseWeaponRevolver357 - id: WeaponRevolverPython357 - description: A robust revolver favoured by Syndicate agents. Uses .357 magnum ammo. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Revolvers/python.rsi - - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/python.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 2 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/revolver.ogg - params: - volume: 2.25 - -- type: entity - name: Python - parent: WeaponRevolverPython357 - id: WeaponRevolverPython357AP # For the uplink. - suffix: armor-piercing - description: A robust revolver favoured by Syndicate agents. Uses .357 magnum ammo. - components: - - type: RevolverAmmoProvider - whitelist: - tags: - - Cartridge357 - - SpeedLoader357 - proto: Cartridge357AP - -- type: entity - name: Unica 6 - parent: BaseWeaponRevolver357 - id: WeaponRevolverUnica - description: Legendary weapon of death squad and angry HoS - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Revolvers/Unica.rsi - - type: Clothing - sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 2.0 - availableModes: - - SemiAuto - - FullAuto - - type: RevolverAmmoProvider - capacity: 7 - chambers: [ True, True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null, null ] - - type: MagazineVisuals - magState: mag - steps: 4 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 15000 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 9f23ff1af14..5b3fc1d803c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -24,3 +24,143 @@ - type: Appearance - type: StaticPrice price: 500 + +- type: entity + name: Deckard + parent: BaseWeaponRevolver + id: ADTWeaponRevolverDeckardGold + description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/decard_gold.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-3 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Gun + selectedMode: FullAuto + fireRate: 2.6 + availableModes: + - SemiAuto + - FullAuto + - type: RevolverAmmoProvider + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 10000 + +- type: entity + name: BaseWeaponRevolver357 + parent: BaseItem + id: BaseWeaponRevolver357 + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + state: icon + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + - type: Clothing + sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + selectedMode: SemiAuto + fireRate: 1.5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + - type: ContainerContainer + containers: + revolver-ammo: !type:Container + - type: RevolverAmmoProvider + whitelist: + tags: + - Cartridge357 + - SpeedLoader357 + proto: Cartridge357 + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + soundEject: + path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg + soundInsert: + path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: StaticPrice + price: 500 + +- type: entity + name: Python + parent: BaseWeaponRevolver357 + id: WeaponRevolverPython357 + description: A robust revolver favoured by Syndicate agents. Uses .357 magnum ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Revolvers/python.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Revolvers/python.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/revolver.ogg + params: + volume: 2.25 + +- type: entity + name: Python + parent: WeaponRevolverPython357 + id: WeaponRevolverPython357AP # For the uplink. + suffix: armor-piercing + description: A robust revolver favoured by Syndicate agents. Uses .357 magnum ammo. + components: + - type: RevolverAmmoProvider + whitelist: + tags: + - Cartridge357 + - SpeedLoader357 + proto: Cartridge357AP + +- type: entity + name: Unica 6 + parent: BaseWeaponRevolver357 + id: WeaponRevolverUnica + description: Legendary weapon of death squad and angry HoS + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Revolvers/Unica.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2.0 + availableModes: + - SemiAuto + - FullAuto + - type: RevolverAmmoProvider + capacity: 7 + chambers: [ True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null ] + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 15000 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml deleted file mode 100644 index db0f6b97aa7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml +++ /dev/null @@ -1,261 +0,0 @@ -- type: entity - name: AEK-974 - parent: BaseItem - id: ADTAbakanRifleAEK - description: Rifles - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/abakan.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/abakan.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: AmmoCounter - - type: Gun - fireRate: 6 - selectedMode: FullAuto - availableModes: - - FullAuto - #- SemiAuto - #- Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: Item - size: Large - -- type: entity - name: AN-97 - parent: BaseItem - id: ADTGunRifleAN - description: Rifles - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/an_97.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/an_97.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: AmmoCounter - - type: Gun - fireRate: 6 - selectedMode: Burst - availableModes: - #- FullAuto - #- SemiAuto - - Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: Item - size: Large - -- type: entity - name: АКSy-74 - parent: BaseItem - id: ADTRifleAKsy - description: Rifles - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: AmmoCounter - - type: Gun - minAngle: 5 - maxAngle: 7 - angleIncrease: 2 - angleDecay: 4 - fireRate: 5.2 - selectedMode: FullAuto - availableModes: - - FullAuto - - SemiAuto - #- Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: Item - size: Large - - type: GunWieldBonus - minAngle: -15 - maxAngle: -15 - -- type: entity - name: АКSy-74 - parent: BaseItem - id: ADTRifleAKsyIohana - description: Rifles - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: AmmoCounter - - type: Gun - minAngle: 5 - maxAngle: 7 - angleIncrease: 2 - angleDecay: 4 - fireRate: 5.7 - selectedMode: FullAuto - availableModes: - - FullAuto - - SemiAuto - #- Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: Item - size: Large - - type: GunWieldBonus - minAngle: -13 - maxAngle: -13 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml deleted file mode 100644 index 837710dc9f5..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/fmfal.yml +++ /dev/null @@ -1,128 +0,0 @@ -- type: entity - name: FN FAL - parent: BaseItem - id: ADTGunRifleFNFAL - description: Rifles - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineRifleFNFAL - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 1 - whitelist: - tags: - - ADTMagazineRifleFNFAL - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 500 - - type: AmmoCounter - - type: Gun - fireRate: 4.7 - minAngle: 5 - maxAngle: 7 - angleIncrease: 2 - angleDecay: 4 - selectedMode: Burst - availableModes: - #- FullAuto - - SemiAuto - - Burst - soundGunshot: - collection: FN_Fal_choot - - type: Item - size: Large - - type: GunWieldBonus - minAngle: -5 - maxAngle: -5 - - - - ## рандомизатор звуков для разнообразия звуков выстрела -- type: soundCollection - id: FN_Fal_choot - files: - - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg - - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg - - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg - - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg - -# Base mags -- type: entity - id: ADTBaseMagazineRifleFNFAL - name: "extended magazine (.20 rifle)" - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - ADTMagazineRifleFNFAL - - type: Item - size: Small - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeRifle - capacity: 20 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Ammunition/Magazine/fn_fal_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -# Magazines FN_FAL -- type: entity - id: ADTMagazineRifleFNFAL - name: "extended magazine (.20 rifle)" - parent: ADTBaseMagazineRifleFNFAL - components: - - type: BallisticAmmoProvider - proto: CartridgeRifle - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml index a8640611485..dd472a36a03 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/rifles.yml @@ -105,3 +105,489 @@ soundEmpty: path: /Audio/ADT/Weapons/Guns/Empty/ar12_empty.ogg fireRate: 5.5 + +- type: entity + name: Lecter Strikeball + parent: BaseWeaponRifle + id: ADTWeaponRifleLecterBibis + description: A high end military grade assault rifle. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + - type: Gun + fireRate: 10 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/airsoft.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineRifleBibis + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - ADTMagazineRifleBibis + gun_chamber: + name: Chamber + startingItem: ADTCartridgeStrikeballBibis + priority: 1 + whitelist: + tags: + - ADTCartridgeBibis + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: AEK-974 + parent: BaseItem + id: ADTAbakanRifleAEK + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/abakan.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/abakan.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + fireRate: 6 + selectedMode: FullAuto + availableModes: + - FullAuto + #- SemiAuto + #- Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: Item + size: Large + +- type: entity + name: AN-97 + parent: BaseItem + id: ADTGunRifleAN + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/an_97.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/an_97.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + fireRate: 6 + selectedMode: Burst + availableModes: + #- FullAuto + #- SemiAuto + - Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: Item + size: Large + +- type: entity + name: АКSy-74 + parent: BaseItem + id: ADTRifleAKsy + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + minAngle: 5 + maxAngle: 7 + angleIncrease: 2 + angleDecay: 4 + fireRate: 5.2 + selectedMode: FullAuto + availableModes: + - FullAuto + - SemiAuto + #- Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: Item + size: Large + - type: GunWieldBonus + minAngle: -15 + maxAngle: -15 + +- type: entity + name: АКSy-74 + parent: BaseItem + id: ADTRifleAKsyIohana + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + minAngle: 5 + maxAngle: 7 + angleIncrease: 2 + angleDecay: 4 + fireRate: 5.7 + selectedMode: FullAuto + availableModes: + - FullAuto + - SemiAuto + #- Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: Item + size: Large + - type: GunWieldBonus + minAngle: -13 + maxAngle: -13 + +#Фактически тот же парент винтовок, но убрал фулл авто и добавил полуавто и очереди +- type: entity + name: BaseWeaponBurstRifle + parent: BaseItem + id: BaseWeaponBurstRifle + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + - type: Item + size: Ginormous + - type: Clothing + sprite: Objects/Weapons/Guns/BurstRifles/abakan.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + fireRate: 10 + selectedMode: Burst + availableModes: + - SemiAuto + - Burst + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: StaticPrice + price: 500 + +- type: entity + name: xC67 + parent: BaseWeaponRifle + id: ADTWeaponRifleXC67 + description: A high end prototipe assault rifle. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/xc67.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/xc67.rsi + - type: Gun + #minAngle: 2 + #maxAngle: 8 + fireRate: 6.5 + #angleIncrease: 1 + #angleDecay: 12 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTExtMagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + - ADTExtMagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: FN FAL + parent: BaseItem + id: ADTGunRifleFNFAL + description: Rifles + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/Rifels/fn_fal.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineRifleFNFAL + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 1 + whitelist: + tags: + - ADTMagazineRifleFNFAL + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 500 + - type: AmmoCounter + - type: Gun + fireRate: 4.7 + minAngle: 5 + maxAngle: 7 + angleIncrease: 2 + angleDecay: 4 + selectedMode: Burst + availableModes: + #- FullAuto + - SemiAuto + - Burst + soundGunshot: + collection: FN_Fal_choot + - type: Item + size: Large + - type: GunWieldBonus + minAngle: -5 + maxAngle: -5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/xc67.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/xc67.yml deleted file mode 100644 index 280ad7ba3e7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/xc67.yml +++ /dev/null @@ -1,55 +0,0 @@ -- type: entity - name: xC67 - parent: BaseWeaponRifle - id: ADTWeaponRifleXC67 - description: A high end prototipe assault rifle. Uses .20 rifle ammo. - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/Rifels/xc67.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/Rifels/xc67.rsi - - type: Gun - #minAngle: 2 - #maxAngle: 8 - fireRate: 6.5 - #angleIncrease: 1 - #angleDecay: 12 - selectedMode: FullAuto - availableModes: - - SemiAuto - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTExtMagazineRifle - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineRifle - - ADTExtMagazineRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index ab4b5594792..2dae16b61f6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -98,3 +98,170 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: SR-3M + parent: BaseWeaponRifle + id: ADTWeaponSMGSR3M + description: Uses .30 rifle ammo. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/sr3m.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/sr3m.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/silenced.ogg + params: + volume: -14 + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineSR3M + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - ADTMagazineSR3M + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + +- type: entity + name: SR-2M + parent: BaseWeaponRifle + id: ADTWeaponSMGSR2M + description: Uses .35 rifle ammo. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/sr2m.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/sr2m.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Gun + fireRate: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/silenced.ogg + params: + volume: -14 + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineSR2M + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - ADTMagazineSR2M + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Item + size: Small + +- type: entity + name: Bizon + parent: BaseWeaponSubMachineGun + id: ADTWeaponSMGBizon + description: An excellent fully automatic Heavy SMG. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/SMGs/bizon.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/SMGs/bizon.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Gun + fireRate: 6 + selectedMode: FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/atreides.ogg + availableModes: + - FullAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineBizon + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - ADTMagazineBizon + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/ussp.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/ussp.yml deleted file mode 100644 index 0d4b33661c8..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/SMGs/ussp.yml +++ /dev/null @@ -1,166 +0,0 @@ -- type: entity - name: SR-3M - parent: BaseWeaponRifle - id: ADTWeaponSMGSR3M - description: Uses .30 rifle ammo. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/SMGs/sr3m.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/SMGs/sr3m.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: Gun - fireRate: 6 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/silenced.ogg - params: - volume: -14 - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineSR3M - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - ADTMagazineSR3M - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - -- type: entity - name: SR-2M - parent: BaseWeaponRifle - id: ADTWeaponSMGSR2M - description: Uses .35 rifle ammo. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/SMGs/sr2m.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/SMGs/sr2m.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: Gun - fireRate: 6 - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/silenced.ogg - params: - volume: -14 - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineSR2M - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - ADTMagazineSR2M - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: Item - size: Small - -- type: entity - name: Bizon - parent: BaseWeaponSubMachineGun - id: ADTWeaponSMGBizon - description: An excellent fully automatic Heavy SMG. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/SMGs/bizon.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/SMGs/bizon.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: Gun - fireRate: 6 - selectedMode: FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/atreides.ogg - availableModes: - - FullAuto - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineBizon - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - ADTMagazineBizon - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/ussp.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml similarity index 52% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/ussp.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 86bc91b257b..95fd817f350 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/ussp.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -1,3 +1,60 @@ +- type: entity + name: semi-aito Hristov + parent: BaseItem + id: ADTWeaponSniperHristovII + description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo upgraded by gorlax marodeurs. + components: + - type: Item + size: Huge + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/new_hristov.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: ADT/Objects/Weapons/Guns/new_hristov.rsi + slots: + - Back + quickEquip: false + - type: Wieldable + - type: GunWieldBonus + minAngle: -23 + maxAngle: -44 + - type: Gun + minAngle: 24 + maxAngle: 45 + fireRate: 0.7 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: ADTMagazineHriII + priority: 2 + whitelist: + tags: + - MagazineHristov + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineAmmoProvider + - type: MagazineVisuals + magState: mag + steps: 4 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 5000 + - type: entity name: SVCh Igla parent: BaseWeaponRifle diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/new_hristov.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/new_hristov.yml deleted file mode 100644 index f3bf29dfa89..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/snipers/new_hristov.yml +++ /dev/null @@ -1,56 +0,0 @@ -- type: entity - name: semi-aito Hristov - parent: BaseItem - id: ADTWeaponSniperHristovII - description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo upgraded by gorlax marodeurs. - components: - - type: Item - size: Huge - - type: Sprite - sprite: ADT/Objects/Weapons/Guns/new_hristov.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: ADT/Objects/Weapons/Guns/new_hristov.rsi - slots: - - Back - quickEquip: false - - type: Wieldable - - type: GunWieldBonus - minAngle: -23 - maxAngle: -44 - - type: Gun - minAngle: 24 - maxAngle: 45 - fireRate: 0.7 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/sniper.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/empty.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: ADTMagazineHriII - priority: 2 - whitelist: - tags: - - MagazineHristov - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineAmmoProvider - - type: MagazineVisuals - magState: mag - steps: 4 - zeroVisible: true - - type: Appearance - - type: StaticPrice - price: 5000 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml deleted file mode 100644 index 5cb8173e32b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml +++ /dev/null @@ -1,37 +0,0 @@ -- type: loadout - id: AstraKnifeLoadout - entity: ADTAstraKnife - sponsorOnly: true - -- type: entity - name: Astra Knife - parent: BaseKnife - id: ADTAstraKnife - description: A deadly knife intended for melee confrontations. - components: - - type: Tag - tags: - - CombatKnife - - Knife - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/astra-knife.rsi - size: 2 - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 10 - - type: Item - size: Small - sprite: ADT/Objects/Weapons/Melee/astra-knife.rsi - - type: DisarmMalus - malus: 0.225 - - type: DamageOtherOnHit - damage: - types: - Slash: 10 - - type: EmbeddableProjectile - sound: /Audio/Weapons/star_hit.ogg - - type: ThrowingAngle - angle: 225 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/BoneKnife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/BoneKnife.yml deleted file mode 100644 index eba375a32f3..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/BoneKnife.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: bone knife - parent: BaseKnife - id: ADTBoneKnife - description: A carelessly made bone blade, it seems, or it's already covered in blood.. - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/bone_knife.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: -135 - attackRate: 0.8 - damage: - types: - Slash: 13 - - type: EmbeddableProjectile - sound: /Audio/Weapons/star_hit.ogg - - type: DamageOtherOnHit - damage: - types: - Slash: 10 - - type: Item - sprite: ADT/Objects/Weapons/Melee/bone_knife.rsi - - type: DisarmMalus - malus: 0.225 - - type: Clothing - slots: - - Belt - - type: ThrowingAngle - angle: 225 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml deleted file mode 100644 index 71e5aaf494b..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - name: Kiirava sword - parent: BaseItem - id: ADTObjectWeaponsMeleeKiiravaSword - description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. - components: - - type: Sharp - - type: Tag - tags: - - SupremeSabre - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/kiirava-sword.rsi - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 25 - - type: Item - size: Large - sprite: ADT/Objects/Weapons/Melee/kiirava-sword.rsi - - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml deleted file mode 100644 index 577fac536b8..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml +++ /dev/null @@ -1,48 +0,0 @@ -- type: entity - name: arkalis - parent: BaseItem - id: ADTObjectWeaponsMeleeArkalis - description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. - components: - - type: Sharp - - type: Tag - tags: - - SupremeCommanderSabre - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/supreme-commander-sabre.rsi - state: icon - - type: MeleeWeapon - attackRate: 1.5 #Attack rate like a ScalpelShiv - damage: - types: - Cellular: 50 - Radiation: 50 - - type: Item - size: Huge - sprite: ADT/Objects/Weapons/Melee/supreme-commander-sabre.rsi - - type: DisarmMalus - -- type: entity - name: ninja katana - parent: BaseItem - id: ADTObjectWeaponsMeleeSupremeSabre - description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. - components: - - type: Sharp - - type: Tag - tags: - - SupremeSabre - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/supreme-sabre.rsi - state: icon - - type: MeleeWeapon - attackRate: 1.0 - damage: - types: - Slash: 20 - Radiation: 15 - Blunt: -1 - - type: Item - size: Huge - sprite: ADT/Objects/Weapons/Melee/supreme-sabre.rsi - - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml index 8ce85056af1..ae5dc609778 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml @@ -133,3 +133,105 @@ damage: types: Blunt: 0.1 + +- type: entity + name: Kiirava sword + parent: BaseItem + id: ADTObjectWeaponsMeleeKiiravaSword + description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. + components: + - type: Sharp + - type: Tag + tags: + - SupremeSabre + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/kiirava-sword.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 25 + - type: Item + size: Large + sprite: ADT/Objects/Weapons/Melee/kiirava-sword.rsi + - type: DisarmMalus + +- type: entity + name: arkalis + parent: BaseItem + id: ADTObjectWeaponsMeleeArkalis + description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. + components: + - type: Sharp + - type: Tag + tags: + - SupremeCommanderSabre + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/supreme-commander-sabre.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.5 #Attack rate like a ScalpelShiv + damage: + types: + Cellular: 50 + Radiation: 50 + - type: Item + size: Huge + sprite: ADT/Objects/Weapons/Melee/supreme-commander-sabre.rsi + - type: DisarmMalus + +- type: entity + name: ninja katana + parent: BaseItem + id: ADTObjectWeaponsMeleeSupremeSabre + description: Don't even try to use it like a razor. It's forget from bluespace steel. Lagand says it took the energy of several stars to create it. + components: + - type: Sharp + - type: Tag + tags: + - SupremeSabre + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/supreme-sabre.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 20 + Radiation: 15 + Blunt: -1 + - type: Item + size: Huge + sprite: ADT/Objects/Weapons/Melee/supreme-sabre.rsi + - type: DisarmMalus + +- type: entity + name: Pyotr's sabre + parent: BaseItem + id: ADTPyotrSabre + description: A ceremonial weapon belonging to the Pyotr Shahin. Heavier than stadart captain`s sabre. + components: + - type: Sharp + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/pyotr_sabre.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.2 + damage: + types: + Slash: 22 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + enabled: true + reflectProb: .5 + spread: 90 + - type: Item + size: Huge + sprite: ADT/Objects/Weapons/Melee/pyotr_sabre.rsi + - type: DisarmMalus + - type: Tag + tags: + - CaptainSabre + diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml deleted file mode 100644 index dbc04866000..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - name: folding knife - parent: BaseItem - id: ADTObjectsWeaponsMeleeFoldingKnife - description: Very loud and very dangerous energy sword that can reflect shots. Can be stored in pockets when turned off. - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/folding_knife.rsi - layers: - - state: base - map: [ "enum.ToggleVisuals.Layer" ] - - type: SwitchableWeapon - openSound: "/Audio/ADT/schelchok-vyiklyucheniya.ogg" - closeSound: "/Audio/ADT/schelchok-vyiklyucheniya.ogg" - bonkSound: "/Audio/Weapons/pierce.ogg" - damageOpen: - types: - Slash: 10 - damageFolded: - types: - Blunt: 0 - staminaDamageFolded: 0 - staminaDamageOpen: 0 - sizeOpened: Normal - sizeClosed: Small - - type: StaminaDamageOnHit - damage: 0 - - type: MeleeWeapon - damage: - types: - Slash: 10 - - type: Item - size: Small - sprite: ADT/Objects/Weapons/Melee/folding_knife.rsi - - type: UseDelay - delay: 1.0 - - type: DisarmMalus - malus: 0 - - type: Appearance - - type: GenericVisualizer - visuals: - enum.ToggleVisuals.Toggled: - enum.ToggleVisuals.Layer: - True: {state: icon} - False: {state: base} diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml new file mode 100644 index 00000000000..5f3d7983c6c --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/knife.yml @@ -0,0 +1,129 @@ +- type: entity + name: ussp knife "Barzai" + parent: CombatKnife + id: ADTUSSPCombatKnifeBarzai + description: A deadly knife intended for melee confrontations. + suffix: USSP + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/ussp_barzai_knife.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.7 + damage: + types: + Slash: 12 + Piercing: 4 + - type: Item + sprite: ADT/Objects/Weapons/Melee/ussp_barzai_knife.rsi + +- type: entity + name: Astra Knife + parent: BaseKnife + id: ADTAstraKnife + description: A deadly knife intended for melee confrontations. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/astra-knife.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 10 + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Melee/astra-knife.rsi + - type: DisarmMalus + malus: 0.225 + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: ThrowingAngle + angle: 225 + +- type: entity + name: bone knife + parent: BaseKnife + id: ADTBoneKnife + description: A carelessly made bone blade, it seems, or it's already covered in blood.. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/bone_knife.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 0.8 + damage: + types: + Slash: 13 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: DamageOtherOnHit + damage: + types: + Slash: 10 + - type: Item + sprite: ADT/Objects/Weapons/Melee/bone_knife.rsi + - type: DisarmMalus + malus: 0.225 + - type: Clothing + slots: + - Belt + - type: ThrowingAngle + angle: 225 + +- type: entity + name: folding knife + parent: BaseItem + id: ADTObjectsWeaponsMeleeFoldingKnife + description: Very loud and very dangerous energy sword that can reflect shots. Can be stored in pockets when turned off. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/folding_knife.rsi + layers: + - state: base + map: [ "enum.ToggleVisuals.Layer" ] + - type: SwitchableWeapon + openSound: "/Audio/ADT/schelchok-vyiklyucheniya.ogg" + closeSound: "/Audio/ADT/schelchok-vyiklyucheniya.ogg" + bonkSound: "/Audio/Weapons/pierce.ogg" + damageOpen: + types: + Slash: 10 + damageFolded: + types: + Blunt: 0 + staminaDamageFolded: 0 + staminaDamageOpen: 0 + sizeOpened: Normal + sizeClosed: Small + - type: StaminaDamageOnHit + damage: 0 + - type: MeleeWeapon + damage: + types: + Slash: 10 + - type: Item + size: Small + sprite: ADT/Objects/Weapons/Melee/folding_knife.rsi + - type: UseDelay + delay: 1.0 + - type: DisarmMalus + malus: 0 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: icon} + False: {state: base} diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml deleted file mode 100644 index e462b4bc8a9..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: entity - name: Pyotr's sabre - parent: BaseItem - id: ADTPyotrSabre - description: A ceremonial weapon belonging to the Pyotr Shahin. Heavier than stadart captain`s sabre. - components: - - type: Sharp - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/pyotr_sabre.rsi - state: icon - - type: MeleeWeapon - attackRate: 1.2 - damage: - types: - Slash: 22 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - - type: Reflect - enabled: true - reflectProb: .5 - spread: 90 - - type: Item - size: Huge - sprite: ADT/Objects/Weapons/Melee/pyotr_sabre.rsi - - type: DisarmMalus - - type: Tag - tags: - - CaptainSabre diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/security.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/security.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Syndicate.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/stun_baguette.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Syndicate.yml rename to Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/stun_baguette.yml diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ussp.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ussp.yml deleted file mode 100644 index b5c71ca2741..00000000000 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/ussp.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: ussp knife "Barzai" - parent: CombatKnife - id: ADTUSSPCombatKnifeBarzai - description: A deadly knife intended for melee confrontations. - suffix: USSP - components: - - type: Sprite - sprite: ADT/Objects/Weapons/Melee/ussp_barzai_knife.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: -135 - attackRate: 1.7 - damage: - types: - Slash: 12 - Piercing: 4 - - type: Item - sprite: ADT/Objects/Weapons/Melee/ussp_barzai_knife.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/vizhivalovo.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/vizhivalovo.yml index 5d06bf75c9f..047934282d9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/vizhivalovo.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/vizhivalovo.yml @@ -1,3 +1,4 @@ +#Хер его знает что это - type: entity name: volkoboi parent: BaseItem diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/christmas_fireplace.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/fireplace.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/Decorations/christmas_fireplace.yml rename to Resources/Prototypes/ADT/Entities/Structures/Decorations/fireplace.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Doors/access.yml b/Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/Doors/access.yml rename to Resources/Prototypes/ADT/Entities/Structures/Doors/Airlock/access.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/doublebed.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/beds.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/Furniture/doublebed.yml rename to Resources/Prototypes/ADT/Entities/Structures/Furniture/beds.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml similarity index 88% rename from Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml rename to Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml index 4b5c660b663..d83933ce28a 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml @@ -266,3 +266,36 @@ - type: Construction graph: Seat node: adtarmchairblue2 + +- type: entity + parent: Bed + id: ADTDeckChair + name: deckchair + description: A deckchair for the acquisition of an even tan under the light of the nearest star. + components: + - type: Sprite + sprite: ADT/Structures/Furniture/deckchair.rsi + state: deckchair + - type: Construction + graph: bed + node: adtdeckchair + #- type: GuideHelp + # guides: + # - Medical Doctor + +- type: entity + name: oktoberfest chair + id: ADTOktoberfestChair + parent: SeatBase + description: It looks comfy. + suffix: Oktoberfest + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: ADT/Structures/Furniture/oktoberfest_chair.rsi + state: oct_chair_orange \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/christmas_tree.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/christmas_tree.yml index d67dca327c3..91d76bbab33 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/christmas_tree.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/christmas_tree.yml @@ -1,42 +1,3 @@ -- type: Tag - id: ADTGoldenStarGarland - -- type: Tag - id: ADTSilverStarGarland - -- type: Tag - id: ADTBaseStarGarland - -- type: Tag - id: ADTShinyGarland - -- type: Tag - id: ADTTreeGoldenStar - -- type: Tag - id: ADTTreeRedStar - -- type: Tag - id: ADTTreeSilverStar - -- type: Tag - id: ADTTreeRedBalls - -- type: Tag - id: ADTTreeGoldenBalls - -- type: Tag - id: ADTTreeSilverBalls - -- type: Tag - id: ADTTreeRedMishura - -- type: Tag - id: ADTTreeGoldenMishura - -- type: Tag - id: ADTTreeSilverMishura - - type: entity id: ADTChristmasPlasticTree parent: BaseStructure @@ -212,221 +173,4 @@ - type: Physics bodyType: Static - type: Anchorable - - type: Appearance - - -#Гирлянды - -- type: entity - name: goldenstar garland - parent: BaseItem - id: ADTGoldenStarGarland - description: A light emitting device that would look like from ancient castle. - suffix: New Year - components: - - type: Tag - tags: - - ADTGoldenStarGarland - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: goldenstar_garland - - type: Item - #sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - size: Normal - -- type: entity - name: silverstar garland - parent: BaseItem - id: ADTSilverStarGarland - description: A light emitting device that would look like from ancient castle. - suffix: New Year - components: - - type: Tag - tags: - - ADTSilverStarGarland - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: silverstar_garland - - type: Item - size: Normal - -- type: entity - name: base garland - parent: BaseItem - id: ADTBaseStarGarland - description: A light emitting device that would look like from ancient castle. - suffix: New Year - components: - - type: Tag - tags: - - ADTBaseStarGarland - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: basestar_garland - - type: Item - size: Normal - -- type: entity - name: shiny garland - parent: BaseItem - id: ADTShinyGarland - description: A light emitting device that would look like from ancient castle. - suffix: New Year - components: - - type: Tag - tags: - - ADTShinyGarland - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: shiny_garland - - type: Item - size: Normal - -#Новогодние шарики -- type: entity - name: red tree balls - parent: BaseItem - id: ADTTreeRedBalls - description: red tree balls - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeRedBalls - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: red_balls - - type: Item - size: Normal - -- type: entity - name: silver tree balls - parent: BaseItem - id: ADTTreeSilverBalls - description: silver tree balls - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeSilverBalls - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: silver_balls - - type: Item - size: Normal - -- type: entity - name: golden tree balls - parent: BaseItem - id: ADTTreeGoldenBalls - description: silver tree balls - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeGoldenBalls - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: golden_balls - - type: Item - size: Normal - -#звезды - -- type: entity - name: golden tree star - parent: BaseItem - id: ADTTreeGoldenStar - description: golden tree star - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeGoldenStar - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: golden_star - - type: Item - size: Small - -- type: entity - name: red tree star - parent: BaseItem - id: ADTTreeRedStar - description: red tree star - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeRedStar - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: red_star - - type: Item - size: Small - -- type: entity - name: silver tree star - parent: BaseItem - id: ADTTreeSilverStar - description: silver tree star - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeSilverStar - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: silver_star - - type: Item - size: Small - -#мишура - -- type: entity - name: silver mishura - parent: BaseItem - id: ADTTreeSilverMishura - description: silver mishura - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeSilverMishura - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: silver_mishura - - type: Item - size: Small - -- type: entity - name: golden mishura - parent: BaseItem - id: ADTTreeGoldenMishura - description: golden mishura - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeGoldenMishura - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: golden_mishura - - type: Item - size: Small - -- type: entity - name: red mishura - parent: BaseItem - id: ADTTreeRedMishura - description: red mishura - suffix: New Year - components: - - type: Tag - tags: - - ADTTreeRedMishura - - type: Sprite - sprite: ADT/Structures/Furniture/newyeartreetoys.rsi - state: red_mishura - - type: Item - size: Small + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/deckchair.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/deckchair.yml deleted file mode 100644 index e79261de3e8..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/deckchair.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: Bed - id: ADTDeckChair - name: deckchair - description: A deckchair for the acquisition of an even tan under the light of the nearest star. - components: - - type: Sprite - sprite: ADT/Structures/Furniture/deckchair.rsi - state: deckchair - - type: Construction - graph: bed - node: adtdeckchair - #- type: GuideHelp - # guides: - # - Medical Doctor diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml index ef591456359..905d7e0f220 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/halloween.yml @@ -92,60 +92,6 @@ - type: Sprite state: plant2 -- type: entity - parent: MarkerBase - id: ADTHelloweenPlantRandom - name: random helloween decor spawner - #decription: random helloween decor spawner - suffix: Helloween - components: - - type: Sprite - layers: - - state: red - - sprite: ADT/Structures/Furniture/potted_plant_helloween.rsi - state: plant1 - - type: RandomSpawner - offset: 0 - prototypes: - - ADTHalloweenPumpkinLight1 - - ADTHalloweenPumpkinLight2 - - ADTHalloweenPumpkinLight3 - - ADTHalloweenPumpkinLight4 - - ADTHalloweenPumpkinLight5 - - ADTHalloweenPottedPlant1 - - ADTHalloweenPottedPlant2 - chance: 1 - -#- type: construction -# name: pumpkin light -# id: ADTPumpkinLight1 -# graph: pumpkin_light1 -# startNode: start -# targetNode: pumpkinlight1 -# category: construction-category-furniture -# description: Light from a pumpkin. -# icon: -# sprite: ADT/Structures/Furniture/pumpkin_light.rsi -# state: pumpkin_light1 -# objectType: Item -# #canBuildInImpassable: false -# #conditions: -# # - !type:TileNotBlocked - -#- type: constructionGraph -# id: pumpkin_light1 -# start: start -# graph: -# - node: start -# edges: -# - to: pumpkinlight1 -# steps: -# - material: ADTFoodPumpkin -# - material: LightBulb -# doAfter: 2 -# - node: pumpkinlight1 -# entity: ADTHalloweenPumpkinLight1 - - type: entity parent: BaseSign id: ADTHalloweenSignNanotrasen1 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/oktoberfest_table.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/oktoberfest_table.yml deleted file mode 100644 index 81a5c0070db..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/oktoberfest_table.yml +++ /dev/null @@ -1,94 +0,0 @@ -- type: entity - id: ADTTableOktoberfest - parent: TableBase - name: wood oktoberfest table - description: Do not apply fire to this. Rumour says it burns easily. - suffix: Oktoberfest - components: - - type: Sprite - sprite: ADT/Structures/Furniture/oktoberfest_table.rsi - - type: Icon - sprite: ADT/Structures/Furniture/oktoberfest_table.rsi - - type: Damageable - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/woodhit.ogg - - !type:SpawnEntitiesBehavior - spawn: - MaterialWoodPlank: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Tag - tags: - - Wooden - -- type: entity - id: ADTTableOktoberfestOrange - parent: TableBase - name: wood orange oktoberfest table - description: Do not apply fire to this. Rumour says it burns easily. - suffix: Oktoberfest - components: - - type: Sprite - sprite: ADT/Structures/Furniture/oktoberfest_table_orange.rsi - - type: Icon - sprite: ADT/Structures/Furniture/oktoberfest_table_orange.rsi - - type: Damageable - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/woodhit.ogg - - !type:SpawnEntitiesBehavior - spawn: - MaterialWoodPlank: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Tag - tags: - - Wooden - -- type: entity - name: oktoberfest chair - id: ADTOktoberfestChair - parent: SeatBase - description: It looks comfy. - suffix: Oktoberfest - components: - - type: Transform - anchored: true - - type: Physics - bodyType: Static - - type: Anchorable - - type: Rotatable - - type: Sprite - sprite: ADT/Structures/Furniture/oktoberfest_chair.rsi - state: oct_chair_orange diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/party.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml rename to Resources/Prototypes/ADT/Entities/Structures/Furniture/party.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml deleted file mode 100644 index 5cc84115362..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml +++ /dev/null @@ -1,140 +0,0 @@ -- type: entity - id: ADTRoundTablePlastic - parent: BaseStructure - name: plastic round table - description: Do not apply fire to this. Rumour says it burns easily. - suffix: One Year - components: - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/metal_break1.ogg - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: PlaceableSurface - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.5,-0.5,0.5,0.5" - density: 55 - mask: # tables should collide with other tables - - TableMask - layer: - - TableLayer - - type: Sprite - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_plastic - - type: Icon - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_plastic - - type: Climbable - - type: Bonkable - bonkDamage: - types: - Blunt: 4 - bonkSound: !type:SoundCollectionSpecifier - collection: TrayHit - - type: Clickable - - type: Construction - graph: ADTRoundTable - node: plasticRoundTable - - type: Anchorable - - type: Rotatable - - type: InteractionOutline - - type: Physics - bodyType: Static - -- type: entity - id: ADTRoundTableWood - parent: ADTRoundTablePlastic - name: wood round table - description: Do not apply fire to this. Rumour says it burns easily. - suffix: One Year - components: - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/woodhit.ogg - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Sprite - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_wood - - type: Icon - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_wood - - type: Construction - graph: ADTRoundTable - node: woodRoundTable - -- type: entity - id: ADTRoundTableGlass - parent: ADTRoundTablePlastic - name: glass round table - description: Do not apply fire to this. Rumour says it burns easily. - suffix: One Year - components: - - type: GlassTable - climberDamage: - types: - Slash: 30 - tableDamage: - types: - Blunt: 100 - tableMassLimit: 60 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/glass_break2.ogg - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Sprite - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_glass - - type: Icon - sprite: ADT/Structures/Furniture/roundtable.rsi - state: round_glass - - type: Construction - graph: ADTRoundTable - node: glassRoundTable diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/sink.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Fun/moonshine_still.yml rename to Resources/Prototypes/ADT/Entities/Structures/Furniture/sink.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml index 900371159c7..8dd8e6e09f4 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml @@ -191,3 +191,222 @@ - type: Construction graph: ADTTable node: whiteWoodTableFrame + +- type: entity + id: ADTRoundTablePlastic + parent: BaseStructure + name: plastic round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metal_break1.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PlaceableSurface + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + density: 55 + mask: # tables should collide with other tables + - TableMask + layer: + - TableLayer + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_plastic + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_plastic + - type: Climbable + - type: Bonkable + bonkDamage: + types: + Blunt: 4 + bonkSound: !type:SoundCollectionSpecifier + collection: TrayHit + - type: Clickable + - type: Construction + graph: ADTRoundTable + node: plasticRoundTable + - type: Anchorable + - type: Rotatable + - type: InteractionOutline + - type: Physics + bodyType: Static + +- type: entity + id: ADTRoundTableWood + parent: ADTRoundTablePlastic + name: wood round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_wood + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_wood + - type: Construction + graph: ADTRoundTable + node: woodRoundTable + +- type: entity + id: ADTRoundTableGlass + parent: ADTRoundTablePlastic + name: glass round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: GlassTable + climberDamage: + types: + Slash: 30 + tableDamage: + types: + Blunt: 100 + tableMassLimit: 60 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/glass_break2.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_glass + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_glass + - type: Construction + graph: ADTRoundTable + node: glassRoundTable + +- type: entity + id: ADTTableOktoberfest + parent: TableBase + name: wood oktoberfest table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Structures/Furniture/oktoberfest_table.rsi + - type: Icon + sprite: ADT/Structures/Furniture/oktoberfest_table.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + +- type: entity + id: ADTTableOktoberfestOrange + parent: TableBase + name: wood orange oktoberfest table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Structures/Furniture/oktoberfest_table_orange.rsi + - type: Icon + sprite: ADT/Structures/Furniture/oktoberfest_table_orange.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/Computers/computers.yml new file mode 100644 index 00000000000..e9292b247ca --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/Computers/computers.yml @@ -0,0 +1,30 @@ +- type: entity + parent: BaseComputerShuttle + id: ADTComputerShuttleCentCom + name: консоль управления шаттлом ЦК + description: Управляйте шаттлом ЦК не выходя из дома! + components: + - type: Sprite + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: shuttle + - map: ["computerLayerKeys"] + state: generic_keys + - type: Tag + tags: + - ADTNanoTrasen + # - type: DroneConsole + # components: + # - type: CentComShuttle + # - type: RadarConsole + # maxRange: 300 + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#c94242" + - type: Computer + board: ADTCentComShuttleConsoleCircuitboard \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/centcommeConsoleShuttle.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/centcommeConsoleShuttle.yml index a5d63d6c6fa..e69de29bb2d 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/centcommeConsoleShuttle.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/centcommeConsoleShuttle.yml @@ -1,55 +0,0 @@ -- type: entity - parent: BaseComputerShuttle - id: ADTComputerShuttleCentCom - name: консоль управления шаттлом ЦК - description: Управляйте шаттлом ЦК не выходя из дома! - components: - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: shuttle - - map: ["computerLayerKeys"] - state: generic_keys - - type: Tag - tags: - - ADTNanoTrasen - # - type: DroneConsole - # components: - # - type: CentComShuttle - # - type: RadarConsole - # maxRange: 300 - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#c94242" - - type: Computer - board: ADTCentComShuttleConsoleCircuitboard - -- type: entity - parent: BaseComputerCircuitboard - id: ADTCentComShuttleConsoleCircuitboard - name: консоль управления шаттлом ЦК - description: Плата консоли, используемая для постройки консоли управления ЦК шаттлом. - components: - - type: ComputerBoard - prototype: ADTComputerShuttleCentCom - -- type: entity - id: ADTFTLPointCentCom - parent: MarkerBase - name: Central Command FTL point - components: - # - whitelist: - # tags: - # - ADTNanoTrasen - - whitelist: - tags: - - ADTNanoTrasen - type: FTLDestination - #- type: FTLDestination - - type: Sprite - state: pink diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/non_electrical_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/furnance.yml similarity index 88% rename from Resources/Prototypes/ADT/Entities/Structures/Machines/non_electrical_machines.yml rename to Resources/Prototypes/ADT/Entities/Structures/Machines/furnance.yml index 9a876067316..f147bdb673a 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/non_electrical_machines.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/furnance.yml @@ -41,21 +41,6 @@ needsPower: false powerLoad: 0 -- type: entity - parent: BaseMachineCircuitboard - id: ADTFurnanceMachineCircuitboard - name: ore furnance machine board - components: - - type: Sprite - state: supply - - type: MachineBoard - prototype: ADTFurnance - requirements: - MatterBin: 1 - Manipulator: 3 - materialRequirements: - Glass: 1 - - type: entity name: water well id: ADTWaterWell @@ -109,21 +94,6 @@ - type: Machine board: ADTFoodFurnanceMachineCircuitboard -- type: entity - parent: BaseMachineCircuitboard - id: ADTFoodFurnanceMachineCircuitboard - name: food furnance machine board - components: - - type: Sprite - state: supply - - type: MachineBoard - prototype: ADTFoodFurnance - requirements: - MatterBin: 1 - Manipulator: 3 - materialRequirements: - Glass: 1 - - type: entity id: ADTForerunnersSphere name: Forerunners Sphere diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/lathe.yml new file mode 100644 index 00000000000..285edda9f48 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/lathe.yml @@ -0,0 +1,98 @@ +#Сам принтер +- type: entity + parent: BaseLathe + id: PrinterDoc + name: принтер документов + description: Уникальная разработка Nanotrasen. + components: + - type: Sprite + sprite: ADT/Structures/Machines/printer.rsi + snapCardinals: true + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: idle + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Transform + noRot: false + - type: Machine + board: ADTFormPrinterMachineCircuitboard + - type: Lathe + producingSound: /Audio/Machines/scanning.ogg + idleState: icon + runningState: building + staticRecipes: + - ReportStationRecipe + - ReporDepartmentRecipe + - ReportEmployeePerformanceRecipe + - ReportOnTheChaptersMeetingRecipe + - InternalAffairsAgentsReportRecipe + - ConditionReportRecipe + - ReportStudyObjectRecipe + - DisposalReportRecipe + - ApplicationAppointmentInterimRecipe + - ApplicationEmploymentRecipe + - LetterResignationRecipe + - ApplicationAccessRecipe + - ApplicationEquipmentRecipe + - EvacuationShuttleRequestRecipe + - ShuttleRegistrationRequestRecipe + - RequestCallMembersCentralCommitteeDSORecipe + - RequestChangeSalaryRecipe + - RequestNonListedEmploymentRecipe + - RequestDocumentsRecipe + - RequestEuthanasiaRecipe + - RequestConstructionWorkRecipe + - RequestModernizationRecipe + - ComplaintViolationLaborRulesRecipe + - PermissionEquipmentRecipe + - SearchPermissionRecipe + - PermissionWeaponsRecipe + - PrescriptionDrugAuthorizationRecipe + - PermissionDisposeBodyRecipe + - ConstructionPermitRecipe + - OrderDismissalRecipe + - OrderDeprivationAccessRecipe + - OrderEncouragementRecipe + - OrderParolePrisonerRecipe + - OrderRecognizingSentienceCreatureRecipe + - OrderMedicalInterventionRecipe + - ProductManufacturingOrderRecipe + - OrderPurchaseResourcesEquipmentRecipe + - OrderingSpecialEquipmentRecipe + - OrderPurchaseWeaponsRecipe + - CertificateRecipe + - CertificateAdvancedTrainingRecipe + - CertificateOffenseRecipe + - DeathCertificateRecipe + - MarriageCertificateRecipe + - DivorceCertificateRecipe + - ClosingIndictmentRecipe + - SentenceRecipe + - StatementHealtheRecipe + - type: EmagLatheRecipes + emagStaticRecipes: + - NOTICEOFLIQUIDATIONRecipe + - BUSINESSDEALRecipe + - NOTEBEGINNINGMILITARYACTIONSRecipe + - REPORTACCOMPLISHMENTGOALSRecipe + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 25 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer + - type: MaterialStorage + whitelist: + tags: + - Document \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml deleted file mode 100644 index e32ffc5e8e7..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-female.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: entity - name: Female Mannequin - description: A female doll for your clothes. - id: ADTMannequinFemale - parent: ADTMannequinBase - components: - - type: Icon - sprite: ADT/Structures/Mannequin/MannequinFemale.rsi ##########################3 - state: full_mannequin_female - - type: Sprite - noRot: true - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - sprite: ADT/Structures/Mannequin/MannequinFemale.rsi - state: full_mannequin_female - - map: ["enum.HumanoidVisualLayers.Chest"] - - map: ["enum.HumanoidVisualLayers.Head"] - - map: ["enum.HumanoidVisualLayers.Snout"] - - map: ["enum.HumanoidVisualLayers.Eyes"] - - map: ["enum.HumanoidVisualLayers.RArm"] - - map: ["enum.HumanoidVisualLayers.LArm"] - - map: ["enum.HumanoidVisualLayers.RLeg"] - - map: ["enum.HumanoidVisualLayers.LLeg"] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: unisex_full - visible: false - - map: [ "underwearb" ] #Sirena - - map: [ "underweart" ] #Sirena - - map: ["enum.HumanoidVisualLayers.LFoot"] - - map: ["enum.HumanoidVisualLayers.RFoot"] - - map: ["socks"] - - map: ["underpants"] - - map: ["undershirt"] - - map: ["jumpsuit"] - - map: ["enum.HumanoidVisualLayers.LHand"] - - map: ["enum.HumanoidVisualLayers.RHand"] - - map: ["enum.HumanoidVisualLayers.Handcuffs"] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: ["id"] - - map: ["gloves"] - - map: ["shoes"] - - map: ["ears"] - - map: ["outerClothing"] - - map: ["eyes"] - - map: ["belt"] - - map: ["neck"] - - map: ["back"] - - map: ["enum.HumanoidVisualLayers.FacialHair"] - - map: ["enum.HumanoidVisualLayers.Hair"] - - map: ["enum.HumanoidVisualLayers.HeadSide"] - - map: ["enum.HumanoidVisualLayers.HeadTop"] - - map: ["mask"] - - map: ["head"] - - map: ["pocket1"] - - map: ["pocket2"] - - map: ["enum.HumanoidVisualLayers.Tail"] - # - map: ["enum.HumanoidVisualLayers.Wings"] - - map: ["clownedon"] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml b/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml deleted file mode 100644 index 77dda84094f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-male.yml +++ /dev/null @@ -1,71 +0,0 @@ -- type: entity - name: Male Mannequin - description: A male doll for your clothes. - id: ADTMannequinMale - parent: ADTMannequinBase - components: - - type: Icon - sprite: ADT/Structures/Mannequin/MannequinMale.rsi - state: full_mannequin_male - - type: Sprite - noRot: true - drawdepth: Mobs - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - sprite: ADT/Structures/Mannequin/MannequinMale.rsi - state: full_mannequin_male - - map: ["enum.HumanoidVisualLayers.Chest"] - - map: ["enum.HumanoidVisualLayers.Head"] - - map: ["enum.HumanoidVisualLayers.Snout"] - - map: ["enum.HumanoidVisualLayers.Eyes"] - - map: ["enum.HumanoidVisualLayers.RArm"] - - map: ["enum.HumanoidVisualLayers.LArm"] - - map: ["enum.HumanoidVisualLayers.RLeg"] - - map: ["enum.HumanoidVisualLayers.LLeg"] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: unisex_full - visible: false - - map: [ "underwearb" ] #Sirena - - map: [ "underweart" ] #Sirena - - map: ["enum.HumanoidVisualLayers.LFoot"] - - map: ["enum.HumanoidVisualLayers.RFoot"] - - map: ["socks"] - - map: ["underpants"] - - map: ["undershirt"] - - map: ["jumpsuit"] - - map: ["enum.HumanoidVisualLayers.LHand"] - - map: ["enum.HumanoidVisualLayers.RHand"] - - map: ["enum.HumanoidVisualLayers.Handcuffs"] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: ["id"] - - map: ["gloves"] - - map: ["shoes"] - - map: ["ears"] - - map: ["outerClothing"] - - map: ["eyes"] - - map: ["belt"] - - map: ["neck"] - - map: ["back"] - - map: ["enum.HumanoidVisualLayers.FacialHair"] - - map: ["enum.HumanoidVisualLayers.Hair"] - - map: ["enum.HumanoidVisualLayers.HeadSide"] - - map: ["enum.HumanoidVisualLayers.HeadTop"] - - map: ["mask"] - - map: ["head"] - - map: ["pocket1"] - - map: ["pocket2"] - - map: ["enum.HumanoidVisualLayers.Tail"] - # - map: ["enum.HumanoidVisualLayers.Wings"] - - map: ["clownedon"] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false - diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/pacman_hard.yml b/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/generator.yml similarity index 76% rename from Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/pacman_hard.yml rename to Resources/Prototypes/ADT/Entities/Structures/Power/Generation/generator.yml index 32d4aceca32..67776e201d6 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/Circuitboards/pacman_hard.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/generator.yml @@ -1,18 +1,3 @@ -- type: entity - id: ADTPortableGeneratorSuperPacmanMachineCircuitboardHard - parent: BaseMachineCircuitboard - name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator machine board - suffix: Hard - components: - - type: Sprite - state: engineering - - type: MachineBoard - prototype: ADTPortableGeneratorSuperPacman - requirements: - Capacitor: 20 - materialRequirements: - CableHV: 100 - - type: entity name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator description: |- @@ -57,4 +42,4 @@ - type: MaterialStorage storageLimit: 3000 materialWhiteList: [Uranium] - - type: PortableGenerator + - type: PortableGenerator \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Power/industrial.yml b/Resources/Prototypes/ADT/Entities/Structures/Power/smes.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/Power/industrial.yml rename to Resources/Prototypes/ADT/Entities/Structures/Power/smes.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml similarity index 54% rename from Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml rename to Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml index 2bd452b9c16..535a3c198c1 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Mannequin/mannequin-base.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml @@ -223,3 +223,145 @@ # - map: [ "head" ] # - map: [ "pocket1" ] # - map: [ "pocket2" ] + +- type: entity + name: Female Mannequin + description: A female doll for your clothes. + id: ADTMannequinFemale + parent: ADTMannequinBase + components: + - type: Icon + sprite: ADT/Structures/Mannequin/MannequinFemale.rsi ##########################3 + state: full_mannequin_female + - type: Sprite + noRot: true + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: ADT/Structures/Mannequin/MannequinFemale.rsi + state: full_mannequin_female + - map: ["enum.HumanoidVisualLayers.Chest"] + - map: ["enum.HumanoidVisualLayers.Head"] + - map: ["enum.HumanoidVisualLayers.Snout"] + - map: ["enum.HumanoidVisualLayers.Eyes"] + - map: ["enum.HumanoidVisualLayers.RArm"] + - map: ["enum.HumanoidVisualLayers.LArm"] + - map: ["enum.HumanoidVisualLayers.RLeg"] + - map: ["enum.HumanoidVisualLayers.LLeg"] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi + state: l_leg + - shader: StencilMask + map: ["enum.HumanoidVisualLayers.StencilMask"] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false + - map: [ "underwearb" ] #Sirena + - map: [ "underweart" ] #Sirena + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["socks"] + - map: ["underpants"] + - map: ["undershirt"] + - map: ["jumpsuit"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: ["id"] + - map: ["gloves"] + - map: ["shoes"] + - map: ["ears"] + - map: ["outerClothing"] + - map: ["eyes"] + - map: ["belt"] + - map: ["neck"] + - map: ["back"] + - map: ["enum.HumanoidVisualLayers.FacialHair"] + - map: ["enum.HumanoidVisualLayers.Hair"] + - map: ["enum.HumanoidVisualLayers.HeadSide"] + - map: ["enum.HumanoidVisualLayers.HeadTop"] + - map: ["mask"] + - map: ["head"] + - map: ["pocket1"] + - map: ["pocket2"] + - map: ["enum.HumanoidVisualLayers.Tail"] + # - map: ["enum.HumanoidVisualLayers.Wings"] + - map: ["clownedon"] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false + +- type: entity + name: Male Mannequin + description: A male doll for your clothes. + id: ADTMannequinMale + parent: ADTMannequinBase + components: + - type: Icon + sprite: ADT/Structures/Mannequin/MannequinMale.rsi + state: full_mannequin_male + - type: Sprite + noRot: true + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: ADT/Structures/Mannequin/MannequinMale.rsi + state: full_mannequin_male + - map: ["enum.HumanoidVisualLayers.Chest"] + - map: ["enum.HumanoidVisualLayers.Head"] + - map: ["enum.HumanoidVisualLayers.Snout"] + - map: ["enum.HumanoidVisualLayers.Eyes"] + - map: ["enum.HumanoidVisualLayers.RArm"] + - map: ["enum.HumanoidVisualLayers.LArm"] + - map: ["enum.HumanoidVisualLayers.RLeg"] + - map: ["enum.HumanoidVisualLayers.LLeg"] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi + state: l_leg + - shader: StencilMask + map: ["enum.HumanoidVisualLayers.StencilMask"] + sprite: Mobs/Customization/masking_helpers.rsi + state: unisex_full + visible: false + - map: [ "underwearb" ] #Sirena + - map: [ "underweart" ] #Sirena + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["socks"] + - map: ["underpants"] + - map: ["undershirt"] + - map: ["jumpsuit"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: ["id"] + - map: ["gloves"] + - map: ["shoes"] + - map: ["ears"] + - map: ["outerClothing"] + - map: ["eyes"] + - map: ["belt"] + - map: ["neck"] + - map: ["back"] + - map: ["enum.HumanoidVisualLayers.FacialHair"] + - map: ["enum.HumanoidVisualLayers.Hair"] + - map: ["enum.HumanoidVisualLayers.HeadSide"] + - map: ["enum.HumanoidVisualLayers.HeadTop"] + - map: ["mask"] + - map: ["head"] + - map: ["pocket1"] + - map: ["pocket2"] + - map: ["enum.HumanoidVisualLayers.Tail"] + # - map: ["enum.HumanoidVisualLayers.Wings"] + - map: ["clownedon"] # Dynamically generated + sprite: "Effects/creampie.rsi" + state: "creampie_human" + visible: false diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml index 6fce72d33fa..4bcf456d2ee 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml @@ -30,3 +30,157 @@ reagents: - ReagentId: SpaceCleaner Quantity: 1500 + +#пивные бочонки +- type: entity + parent: StorageTank + id: ADTBeerTank + name: beer tank + description: beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Beer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: beer + +- type: entity + parent: StorageTank + id: ADTBeerTankGoldenAle + name: golden ale tank + description: golden ale tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTGoldenAle + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: goldenale + +- type: entity + parent: StorageTank + id: ADTBeerTankSausage + name: sausage beer tank + description: sausage beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTSausageBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: sausagebeer + +- type: entity + parent: StorageTank + id: ADTBeerTankTechno + name: techno beer tank + description: techno beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTTechnoBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: technobeer + +- type: entity + parent: StorageTank + id: ADTBeerTankClassicPaulaner + name: paulaner beer tank + description: paulaner beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTClassicPaulanerBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: paulanerbeer + +- type: entity + parent: StorageTank + id: ADTBeerTankLivsey + name: livsey beer tank + description: livsey beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTLivseyBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: livseybeer + +- type: entity + parent: StorageTank + id: ADTBeerTankLuckyJonny + name: lucky jonny beer tank + description: lucky jonny beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTLuckyJonnyBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: luckyjonnybeer + +- type: entity + parent: StorageTank + id: ADTBeerTankSecUnfiltered + name: sec unfiltered beer tank + description: sec unfiltered beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTSecUnfilteredBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: secunfilteredbeer + +- type: entity + parent: StorageTank + id: ADTBeerTankGlyphidStout + name: glyphid stout tank + description: glyphid stout tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTGlyphidStoutBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: glyphidstout diff --git a/Resources/Prototypes/ADT/Entities/Structures/ADTWallInvisible.yml b/Resources/Prototypes/ADT/Entities/Structures/Walls/ADTWallInvisible.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Structures/ADTWallInvisible.yml rename to Resources/Prototypes/ADT/Entities/Structures/Walls/ADTWallInvisible.yml diff --git a/Resources/Prototypes/ADT/Entities/Structures/Walls/miningwallgirder.yml b/Resources/Prototypes/ADT/Entities/Structures/Walls/miningwallgirder.yml new file mode 100644 index 00000000000..33261bd54a8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Walls/miningwallgirder.yml @@ -0,0 +1,9 @@ +- type: entity + id: ADTMiningGirder + parent: Girder + name: girder + description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. + components: + - type: Construction + graph: MiningGirder + node: mining_girder \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index 39e6d491df7..988571e11e1 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -230,3 +230,14 @@ id: ADTHerringUnderFurcoat flavorType: Complex description: flavor-complex-herring + +- type: flavor + id: adtconsideredmilk + flavorType: Complex + description: flavor-complex-adtconsideredmilk + +#на вкус как.. Отсутствие сортировки +- type: flavor + id: ADTmandarin + flavorType: Base + description: flavor-base-mandarin \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Hydroponics/seeds.yml b/Resources/Prototypes/ADT/Hydroponics/seeds.yml index 273607fef2c..88f3192b127 100644 --- a/Resources/Prototypes/ADT/Hydroponics/seeds.yml +++ b/Resources/Prototypes/ADT/Hydroponics/seeds.yml @@ -74,3 +74,30 @@ Min: 1 Max: 5 PotencyDivisor: 20 + +- type: seed + id: ADTmandarin + name: seeds-mandarin-name + noun: seeds-noun-seeds + displayName: seeds-mandarin-display-name + suffix: NewYear + plantRsi: ADT/Objects/Specific/Hydroponics/mandarin.rsi + packetPrototype: ADTMandarinSeeds + productPrototypes: + - ADTFoodMandarin + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 8 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/inventory.yml b/Resources/Prototypes/ADT/InventoryTemplates/securitycyborg.yml similarity index 99% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/inventory.yml rename to Resources/Prototypes/ADT/InventoryTemplates/securitycyborg.yml index d82d79314c2..8141672d900 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/inventory.yml +++ b/Resources/Prototypes/ADT/InventoryTemplates/securitycyborg.yml @@ -1,4 +1,4 @@ -#Инвентарь + - type: inventoryTemplate id: ADTCyborgSecInventory slots: diff --git a/Resources/Prototypes/ADT/Polymorphs/polymorphs.yml b/Resources/Prototypes/ADT/Polymorphs/polymorphs.yml index 7927e5e4561..5dd0ca824c5 100644 --- a/Resources/Prototypes/ADT/Polymorphs/polymorphs.yml +++ b/Resources/Prototypes/ADT/Polymorphs/polymorphs.yml @@ -1,4 +1,5 @@ -#ADTP - Polymorph +#ADTP - Polymorph. +#By:1Stepka1 мужик так никто нормально не называет,надо полное название ADTPolymorph #человек и дворф - type: polymorph id: ADTPMonkey @@ -359,3 +360,14 @@ revertOnCrit: true revertOnDeath: true duration: 30 + +- type: polymorph + id: ADTWizardForcedVulpkanin + configuration: + entity: MobVulpkanin + forced: true + inventory: None + transferName: true + transferDamage: true + revertOnCrit: false + revertOnDeath: true \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml index e69de29bb2d..e6a103a5a97 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,641 @@ +- type: reagent + id: ADTVodkaAntivirus + name: vodka-antivirus-name + parent: BaseAlcohol + desc: vodka-antivirus-desc + physicalDesc: reagent-physical-desc-overpowering + flavor: ADTVodkaAntivirusFlavor + color: "#d1d1d155" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/vodka_antivirusglass.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.9 + +- type: reagent + id: ADTCherryExquisiteWine + name: cherry-exq-wine-name + parent: BaseAlcohol + desc: cherry-exq-wine-desc + physicalDesc: reagent-physical-desc-translucent + flavor: ADTCherryExquisiteWineFlavor + color: "#A33E43" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/cherryexquisitewineglass.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.05 + +# Коктели кекса + +- type: reagent + id: ADTSugarKnight + name: sugar-knight-name + parent: BaseAlcohol + desc: sugar-knight-desc + physicalDesc: reagent-physical-desc-sugary + flavor: ADTSugarKnightFlavor + color: "#D36E70" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/sugarknight.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: ADTGrapeLady + name: grape-lady-name + parent: ADTSugarKnight + desc: grape-lady-desc + physicalDesc: reagent-physical-desc-dark-red + flavor: ADTGrapeLadyFlavor + color: "#8C4852" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/grapelady.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: ADTSaturdayBaron + name: saturday-baron-name + parent: ADTSugarKnight + desc: saturday-baron-desc + physicalDesc: reagent-physical-desc-tart + flavor: ADTSaturdayBaronFlavor + color: "#EFA94A" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/saturdaybaron.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: ADTArcticLatte + name: artic-latte-name + parent: ADTSugarKnight + desc: artic-latte-desc + physicalDesc: reagent-physical-desc-refreshing + flavor: ADTArcticLatteFlavor + color: "#916631" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticlatte.rsi + state: icon_empty + metamorphicMaxFillLevels: 4 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: ADTSpecialTeaOolong + name: special-teaoolong-name + parent: ADTSugarKnight + desc: special-teaoolong-desc + physicalDesc: reagent-physical-desc-overpowering + flavor: ADTSpecialTeaOolongFlavor + color: "#8c492a" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/teaoolong.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + +- type: reagent + id: ADTAzureBlue + name: azure-blue-name + parent: ADTSugarKnight + desc: azure-blue-desc + physicalDesc: reagent-physical-desc-tropical + flavor: ADTAzureBlueFlavor + color: "#6498e3" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/azureblue.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: ADTPenetrationDrink + name: penetration-drink-name + parent: ADTSugarKnight + desc: penetration-drink-desc + physicalDesc: reagent-physical-desc-overpowering + flavor: ADTPenetrationDrinkFlavor + color: "#6ddb6b" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/penetration.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: ADTEclipsedEclispe + name: eclipsed-eclipse-name + parent: ADTSugarKnight + desc: eclipsed-eclipse-desc + physicalDesc: reagent-physical-desc-overpowering + flavor: ADTEclipsedEclispeFlavor + color: "#592506" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/eclipsedeclipse.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.6 + +- type: reagent + id: ADTSpaceBush + name: space-bush-name + parent: ADTSugarKnight + desc: space-bush-desc + physicalDesc: reagent-physical-desc-fizzy + flavor: ADTSpaceBushFlavor + color: "#85de8e" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/spacebush.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: ADTBusinessConversation + name: business-conversation-name + parent: ADTSugarKnight + desc: business-conversation-desc + physicalDesc: reagent-physical-desc-overpowering + flavor: ADTBusinessConversationFlavor + color: "#a8140a" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/buisinessconservation.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Bicaridine + amount: 0.2 + +- type: reagent + id: ADTAppleLiqueur + name: apple-liqueur-name + parent: ADTSugarKnight + desc: apple-liqueur-desc + physicalDesc: reagent-physical-desc-cloudy + flavor: ADTAppleLiqueurFlavor + color: "#47941b" + recognizable: true + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.05 + +- type: reagent + id: ADTAppleMartini + name: apple-martini-name + parent: ADTSugarKnight + desc: apple-martini-desc + physicalDesc: reagent-physical-desc-strong-smelling + flavor: ADTAppleMartiniFlavor + color: "#664300" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/applemartini.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: ADTBacardiApple + name: bacardi-apple-name + parent: ADTSugarKnight + desc: bacardi-apple-desc + physicalDesc: reagent-physical-desc-refreshing + flavor: ADTBacardiAppleFlavor + color: "#d4f2a7" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/bacardiapple.rsi + state: icon_empty + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +#Непонятно для чего закоменченые строки +#День Святого Валентина +#комментим, дабы посмотреть ошибки. + +#- type: reagent +# id: ADTSerumLove +# name: reagent-name-serum-love +# parent: BaseAlcohol +# desc: reagent-desc-serum-love +# physicalDesc: reagent-physical-desc-refreshing +# flavor: alcohol +# color: "#ffb570" +# metamorphicSprite: +# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi +# state: serum_love +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.1 + +#- type: reagent +# id: ADTRossini +# name: reagent-name-rossini +# parent: BaseAlcohol +# desc: reagent-desc-rossini +# physicalDesc: reagent-physical-desc-refreshing +# flavor: alcohol +# color: "#ff5331" +# metamorphicSprite: +# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi +# state: rossini +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.1 + +#- type: reagent +# id: ADTKirRoyal +# name: reagent-name-kirroyal +# parent: BaseAlcohol +# desc: reagent-desc-kirroyal +# physicalDesc: reagent-physical-desc-refreshing +# flavor: alcohol +# color: "#ffcb9b" +# metamorphicSprite: +# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi +# state: kirroyal +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.15 + +#- type: reagent +# id: ADTCosmopolitan +# name: reagent-name-cosmopolitan +# parent: BaseAlcohol +# desc: reagent-desc-cosmopolitan +# physicalDesc: reagent-physical-desc-refreshing +# flavor: alcohol +# color: "#ffcb9b" +# metamorphicSprite: +# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi +# state: cosmopolitan +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.2 + +- type: reagent + id: ADTMulledWineCold + name: reagent-name-mulled-wine-cold + parent: BaseAlcohol + desc: reagent-desc-mulled-wine-cold + physicalDesc: reagent-physical-desc-cloudy + flavor: cold + color: "#743636" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine_cold + +- type: reagent + id: ADTSbitenCinnamonLemon + name: reagent-name-sbiten-cinnamon-lemon + parent: BaseAlcohol + desc: reagent-desc-sbiten-cinnamon-lemon + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTSbitenCinnamonLemon + color: "#5a3a28" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon + +- type: reagent + id: ADTChampagneMandarin + name: reagent-name-champagne-mandarin + parent: Champagne + desc: reagent-desc-champagne-mandarin + recognizable: true + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: champagne_mandarin + +- type: reagent + id: ADTGoldenAle + name: golden-ale-name + parent: BaseAlcohol + desc: golden-ale-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTGoldenAleFlavor + color: "#663100" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:HealthChange + damage: + groups: + Brute: -1.5 + types: + Poison: -0.7 ##Should be about what it was when it healed the toxin group + Heat: -0.7 + Shock: -0.7 + Cold: -0.7 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: goldenale + + +- type: reagent + id: ADTSausageBeer + name: sausage-beer-name + parent: BaseAlcohol + desc: sausage-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTSausageBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: sausagebeer + +- type: reagent + id: ADTTechnoBeer + name: techo-beer-name + parent: BaseAlcohol + desc: techo-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTTechnoBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + Medicine: + effects: + - !type:AdjustTemperature + conditions: + - !type:Temperature + max: 350.15 + amount: 10000 # thermal energy, not temperature! + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: technobeer + +- type: reagent + id: ADTClassicPaulanerBeer + name: classic-paulaner-name + parent: BaseAlcohol + desc: classic-paulaner-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTClassicPaulanerBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: classicpaulaner + +- type: reagent + id: ADTLivseyBeer + name: livsey-beer-name + parent: BaseAlcohol + desc: livsey-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTLivseyBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + Medicine: + effects: + - !type:AdjustTemperature + conditions: + - !type:Temperature + min: 263.15 + amount: -10000 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: livseybeer + +- type: reagent + id: ADTLuckyJonnyBeer + name: lucky-jonny-name + parent: BaseAlcohol + desc: lucky-jonny-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTLuckyJonnyBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + - !type:MovespeedModifier + walkSpeedModifier: 1.1 + sprintSpeedModifier: 1.1 + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: luckyjonny + +- type: reagent + id: ADTSecUnfilteredBeer + name: sec-unfiltered-name + parent: BaseAlcohol + desc: sec-unfiltered-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTSecUnfilteredBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + - !type:MovespeedModifier + walkSpeedModifier: 0.85 + sprintSpeedModifier: 0.85 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: secunfiltered + +- type: reagent + id: ADTGlyphidStoutBeer + name: glyphid-stout-name + parent: BaseAlcohol + desc: glyphid-stout-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: ADTGlyphidStoutBeerFlavor + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.35 + - !type:HealthChange + damage: + types: + Poison: -0.9 ##Should be about what it was when it healed the toxin group + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi + state: glyphidstout diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cherry_exquisite_wine.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cherry_exquisite_wine.yml deleted file mode 100644 index 4b8a0ee073b..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cherry_exquisite_wine.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: reagent - id: ADTCherryExquisiteWine - name: cherry-exq-wine-name - parent: BaseAlcohol - desc: cherry-exq-wine-desc - physicalDesc: reagent-physical-desc-translucent - flavor: ADTCherryExquisiteWineFlavor - color: "#A33E43" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/cherryexquisitewineglass.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.05 diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml deleted file mode 100644 index b097be6d87e..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cocktails.yml +++ /dev/null @@ -1,494 +0,0 @@ -# безалкогольные - -- type: reagent - id: ADTSummerShade - name: summer-shade-name - parent: BaseDrink - desc: summer-shade-desc - physicalDesc: reagent-physical-desc-refreshing - flavor: ADTSummerShadeFlavor - color: "#FF2B2B" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 5 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/summershade.rsi - state: icon_empty - metamorphicMaxFillLevels: 5 - metamorphicFillBaseName: fill- - metamorphicChangeColor: false - -- type: reagent - id: ADTWinterSun - name: winter-sun-name - parent: ADTSummerShade - desc: winter-sun-desc - physicalDesc: reagent-physical-desc-milky - flavor: ADTWinterSunFlavor - color: "#edccab" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/wintersun.rsi - state: icon_empty - -- type: reagent - id: ADTHungoverAngel - name: hungover-angel-name - parent: ADTSummerShade - desc: hungover-angel-desc - physicalDesc: reagent-physical-desc-exhilarating - flavor: ADTHungoverAngelFlavor - color: "#FBEC5D" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 3 - Medicine: - effects: - - !type:HealthChange - damage: - groups: - Toxin: -1 - - !type:PopupMessage - type: Local - visualType: Small - messages: [ "medicine-effect-hungover" ] - probability: 0.04 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/hungoverangel.rsi - state: icon_empty - -- type: reagent - id: ADTCitrusBalance - name: citrus-balance-name - parent: ADTSummerShade - desc: citrus-balance-desc - physicalDesc: reagent-physical-desc-citric - flavor: ADTCitrusBalanceFlavor - color: "#F8D568" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 3 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/citrucbalance.rsi - state: icon_empty - -- type: reagent - id: ADTDobryiDrink - name: dobryi-drink-name - parent: ADTSummerShade - desc: dobryi-drink-desc - physicalDesc: reagent-physical-desc-sour - flavor: ADTDobryiDrinkFlavor - color: "#955F20" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/dobryi.rsi - state: icon_empty - -- type: reagent - id: ADTMilkEclipse - name: milk-eclipse-name - parent: ADTSummerShade - desc: milk-eclipse-desc - physicalDesc: reagent-physical-desc-refreshing - flavor: ADTMilkEclipseFlavor - color: "#D8DEBA" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 4 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/milkeclipse.rsi - state: icon_empty - -- type: reagent - id: ADTArcticExplosion - name: arctic-explosion-name - parent: ADTSummerShade - desc: arctic-explosion-desc - physicalDesc: reagent-physical-desc-refreshing - flavor: ADTArcticExplosionFlavor - color: "#c5e3e2" - recognizable: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticexplosion.rsi - state: icon_empty - -# алкогольные - -- type: reagent - id: ADTSugarKnight - name: sugar-knight-name - parent: BaseAlcohol - desc: sugar-knight-desc - physicalDesc: reagent-physical-desc-sugary - flavor: ADTSugarKnightFlavor - color: "#D36E70" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/sugarknight.rsi - state: icon_empty - metamorphicMaxFillLevels: 5 - metamorphicFillBaseName: fill- - metamorphicChangeColor: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.1 - -- type: reagent - id: ADTGrapeLady - name: grape-lady-name - parent: ADTSugarKnight - desc: grape-lady-desc - physicalDesc: reagent-physical-desc-dark-red - flavor: ADTGrapeLadyFlavor - color: "#8C4852" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/grapelady.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.1 - -- type: reagent - id: ADTSaturdayBaron - name: saturday-baron-name - parent: ADTSugarKnight - desc: saturday-baron-desc - physicalDesc: reagent-physical-desc-tart - flavor: ADTSaturdayBaronFlavor - color: "#EFA94A" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/saturdaybaron.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: ADTArcticLatte - name: artic-latte-name - parent: ADTSugarKnight - desc: artic-latte-desc - physicalDesc: reagent-physical-desc-refreshing - flavor: ADTArcticLatteFlavor - color: "#916631" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticlatte.rsi - state: icon_empty - metamorphicMaxFillLevels: 4 - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.1 - -- type: reagent - id: ADTSpecialTeaOolong - name: special-teaoolong-name - parent: ADTSugarKnight - desc: special-teaoolong-desc - physicalDesc: reagent-physical-desc-overpowering - flavor: ADTSpecialTeaOolongFlavor - color: "#8c492a" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/teaoolong.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.3 - -- type: reagent - id: ADTAzureBlue - name: azure-blue-name - parent: ADTSugarKnight - desc: azure-blue-desc - physicalDesc: reagent-physical-desc-tropical - flavor: ADTAzureBlueFlavor - color: "#6498e3" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/azureblue.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: ADTPenetrationDrink - name: penetration-drink-name - parent: ADTSugarKnight - desc: penetration-drink-desc - physicalDesc: reagent-physical-desc-overpowering - flavor: ADTPenetrationDrinkFlavor - color: "#6ddb6b" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/penetration.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: ADTEclipsedEclispe - name: eclipsed-eclipse-name - parent: ADTSugarKnight - desc: eclipsed-eclipse-desc - physicalDesc: reagent-physical-desc-overpowering - flavor: ADTEclipsedEclispeFlavor - color: "#592506" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/eclipsedeclipse.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.6 - -- type: reagent - id: ADTSpaceBush - name: space-bush-name - parent: ADTSugarKnight - desc: space-bush-desc - physicalDesc: reagent-physical-desc-fizzy - flavor: ADTSpaceBushFlavor - color: "#85de8e" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/spacebush.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: ADTBusinessConversation - name: business-conversation-name - parent: ADTSugarKnight - desc: business-conversation-desc - physicalDesc: reagent-physical-desc-overpowering - flavor: ADTBusinessConversationFlavor - color: "#a8140a" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/buisinessconservation.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 - - !type:AdjustReagent - reagent: Bicaridine - amount: 0.2 - -- type: reagent - id: ADTAppleLiqueur - name: apple-liqueur-name - parent: ADTSugarKnight - desc: apple-liqueur-desc - physicalDesc: reagent-physical-desc-cloudy - flavor: ADTAppleLiqueurFlavor - color: "#47941b" - recognizable: true - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/apple_liqueur_glass.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.05 - -- type: reagent - id: ADTAppleMartini - name: apple-martini-name - parent: ADTSugarKnight - desc: apple-martini-desc - physicalDesc: reagent-physical-desc-strong-smelling - flavor: ADTAppleMartiniFlavor - color: "#664300" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/applemartini.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: ADTBacardiApple - name: bacardi-apple-name - parent: ADTSugarKnight - desc: bacardi-apple-desc - physicalDesc: reagent-physical-desc-refreshing - flavor: ADTBacardiAppleFlavor - color: "#d4f2a7" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/bacardiapple.rsi - state: icon_empty - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -#День Святого Валентина -#комментим, дабы посмотреть ошибки. - -#- type: reagent -# id: ADTSerumLove -# name: reagent-name-serum-love -# parent: BaseAlcohol -# desc: reagent-desc-serum-love -# physicalDesc: reagent-physical-desc-refreshing -# flavor: alcohol -# color: "#ffb570" -# metamorphicSprite: -# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi -# state: serum_love -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 2 -# - !type:AdjustReagent -# reagent: Ethanol -# amount: 0.1 - -#- type: reagent -# id: ADTRossini -# name: reagent-name-rossini -# parent: BaseAlcohol -# desc: reagent-desc-rossini -# physicalDesc: reagent-physical-desc-refreshing -# flavor: alcohol -# color: "#ff5331" -# metamorphicSprite: -# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi -# state: rossini -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 2 -# - !type:AdjustReagent -# reagent: Ethanol -# amount: 0.1 - -#- type: reagent -# id: ADTKirRoyal -# name: reagent-name-kirroyal -# parent: BaseAlcohol -# desc: reagent-desc-kirroyal -# physicalDesc: reagent-physical-desc-refreshing -# flavor: alcohol -# color: "#ffcb9b" -# metamorphicSprite: -# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi -# state: kirroyal -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 2 -# - !type:AdjustReagent -# reagent: Ethanol -# amount: 0.15 - -#- type: reagent -# id: ADTCosmopolitan -# name: reagent-name-cosmopolitan -# parent: BaseAlcohol -# desc: reagent-desc-cosmopolitan -# physicalDesc: reagent-physical-desc-refreshing -# flavor: alcohol -# color: "#ffcb9b" -# metamorphicSprite: -# sprite: ADT/Objects/Consumable/Drinks/valentine_cocktails.rsi -# state: cosmopolitan -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 2 -# - !type:AdjustReagent -# reagent: Ethanol -# amount: 0.2 diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cup_tea.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cup_tea.yml deleted file mode 100644 index bbc656213fc..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/cup_tea.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: reagent - id: Chamotea - name: reagent-name-chamomile-tea - parent: BaseDrink - desc: reagent-desc-chamomile-tea - physicalDesc: reagent-physical-desc-aromatic - flavor: sweet - color: "#C8FF03" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/glass_chamomile.rsi - state: icon - -- type: reagent - id: Karkadetea - name: reagent-name-karkade-tea - parent: BaseDrink - desc: reagent-desc-karkade-tea - physicalDesc: reagent-physical-desc-aromatic - flavor: sweet - color: "#FF215C" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/glass_karkade.rsi - state: icon - -- type: reagent - id: Lemontea - name: reagent-name-lemon-tea - parent: BaseDrink - desc: reagent-desc-lemon-tea - physicalDesc: reagent-physical-desc-aromatic - flavor: sour - color: "#EBFF36" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/glass_lemon.rsi - state: icon \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml new file mode 100644 index 00000000000..04153732f32 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -0,0 +1,329 @@ +# безалкогольные + +- type: reagent + id: ADTSummerShade + name: summer-shade-name + parent: BaseDrink + desc: summer-shade-desc + physicalDesc: reagent-physical-desc-refreshing + flavor: ADTSummerShadeFlavor + color: "#FF2B2B" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 5 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/summershade.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTWinterSun + name: winter-sun-name + parent: ADTSummerShade + desc: winter-sun-desc + physicalDesc: reagent-physical-desc-milky + flavor: ADTWinterSunFlavor + color: "#edccab" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/wintersun.rsi + state: icon_empty + +- type: reagent + id: ADTHungoverAngel + name: hungover-angel-name + parent: ADTSummerShade + desc: hungover-angel-desc + physicalDesc: reagent-physical-desc-exhilarating + flavor: ADTHungoverAngelFlavor + color: "#FBEC5D" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Toxin: -1 + - !type:PopupMessage + type: Local + visualType: Small + messages: [ "medicine-effect-hungover" ] + probability: 0.04 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/hungoverangel.rsi + state: icon_empty + +- type: reagent + id: ADTCitrusBalance + name: citrus-balance-name + parent: ADTSummerShade + desc: citrus-balance-desc + physicalDesc: reagent-physical-desc-citric + flavor: ADTCitrusBalanceFlavor + color: "#F8D568" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/citrucbalance.rsi + state: icon_empty + +- type: reagent + id: ADTDobryiDrink + name: dobryi-drink-name + parent: ADTSummerShade + desc: dobryi-drink-desc + physicalDesc: reagent-physical-desc-sour + flavor: ADTDobryiDrinkFlavor + color: "#955F20" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/dobryi.rsi + state: icon_empty + +- type: reagent + id: ADTMilkEclipse + name: milk-eclipse-name + parent: ADTSummerShade + desc: milk-eclipse-desc + physicalDesc: reagent-physical-desc-refreshing + flavor: ADTMilkEclipseFlavor + color: "#D8DEBA" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/milkeclipse.rsi + state: icon_empty + +- type: reagent + id: ADTArcticExplosion + name: arctic-explosion-name + parent: ADTSummerShade + desc: arctic-explosion-desc + physicalDesc: reagent-physical-desc-refreshing + flavor: ADTArcticExplosionFlavor + color: "#c5e3e2" + recognizable: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/justkekc_cocktails/arcticexplosion.rsi + state: icon_empty + +- type: reagent + id: ADTChocolateDrink + name: chocolate-drink-name + parent: BaseDrink + desc: chocolate-drink-desc + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTChocolateDrinkFlavor + color: "#8a5a3a" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateHunger + factor: 0.3 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.1 + - !type:SatiateThirst + factor: 0.5 + metamorphicSprite: + sprite: Objects/Consumable/Drinks/chocolateglass.rsi + state: icon + +- type: reagent + id: Chamotea + name: reagent-name-chamomile-tea + parent: BaseDrink + desc: reagent-desc-chamomile-tea + physicalDesc: reagent-physical-desc-aromatic + flavor: sweet + color: "#C8FF03" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/glass_chamomile.rsi + state: icon + +- type: reagent + id: Karkadetea + name: reagent-name-karkade-tea + parent: BaseDrink + desc: reagent-desc-karkade-tea + physicalDesc: reagent-physical-desc-aromatic + flavor: sweet + color: "#FF215C" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/glass_karkade.rsi + state: icon + +- type: reagent + id: Lemontea + name: reagent-name-lemon-tea + parent: BaseDrink + desc: reagent-desc-lemon-tea + physicalDesc: reagent-physical-desc-aromatic + flavor: sour + color: "#EBFF36" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/glass_lemon.rsi + state: icon + +- type: reagent + id: ADTMulledWine + name: reagent-name-mulled-wine + parent: BaseDrink + desc: reagent-desc-mulled-wine + physicalDesc: reagent-physical-desc-cloudy + flavor: ADTHoliday + color: "#743636" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine + +- type: reagent + id: ADTChristmasMilkshake + name: reagent-name-christmas-milkshake + parent: BaseSoda + desc: reagent-desc-christmas-milkshake + physicalDesc: reagent-physical-desc-creamy + flavor: ADTMilkshake + color: "#c7c5c1" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: christmas_milkshake + +- type: reagent + id: ADTTeaCinnamonLemon + name: reagent-name-tea-cinnamon-lemon + parent: BaseDrink + desc: reagent-desc-tea-cinnamon-lemon + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTTeaCinnamonLemon + color: "#5b3b15" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: warm_tea_cinnamon_lemon + +- type: reagent + id: ADTHotCocoa + name: reagent-name-hot-cocoa + parent: BaseDrink + desc: reagent-desc-hot-cocoa + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTCocoaDrinkFlavor + color: "#b29b7b" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_cocoa + +- type: reagent + id: ADTHotChocolate + name: reagent-name-hot-chocolate + parent: BaseDrink + desc: reagent-desc-hot-chocolate + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTChocolateDrinkFlavor + color: "#9c9289" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + +- type: reagent + id: ADTHotChocolateAllergic + name: reagent-name-hot-chocolate-allergic + parent: BaseDrink + desc: reagent-desc-hot-chocolate-allergic + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTChocolateDrinkFlavor + color: "#9c9289" + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + +- type: reagent + id: ADTCarnation #гвоздика, чисто нужна для напитков. + name: reagent-name-carnation + parent: BaseDrink + desc: reagent-desc-carnation + physicalDesc: reagent-physical-desc-cloudy + flavor: savory + color: "#673d0c" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + +- type: reagent + id: ADTСinnamon #корица, тоже для напитков. + name: reagent-name-cinnamon + parent: BaseDrink + desc: reagent-desc-cinnamon + physicalDesc: reagent-physical-desc-cloudy + flavor: sweet + color: "#9f5525" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + +- type: reagent + id: ADTCocoaDrink + name: cocoa-drink-name + parent: BaseDrink + desc: cocoa-drink-desc + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTCocoaDrinkFlavor + color: "#664300" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juice.yml new file mode 100644 index 00000000000..083617ba17d --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juice.yml @@ -0,0 +1,18 @@ +- type: reagent + id: ADTJuicePumpkin + name: reagent-name-juice-pumpkin + parent: BaseDrink + desc: reagent-desc-juice-pumpkin + physicalDesc: reagent-physical-desc-sweet + flavor: adt_pumpkin + color: "#e08f0a" + +#сок +- type: reagent + id: ADTJuiceMandarin + name: reagent-name-juice-mandarin + parent: BaseDrink + desc: reagent-desc-juice-mandarin + physicalDesc: reagent-physical-desc-citric + flavor: ADTmandarin + color: "#E78108" \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juices.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juices.yml deleted file mode 100644 index 5997b44eccf..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/juices.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: reagent - id: ADTJuicePumpkin - name: reagent-name-juice-pumpkin - parent: BaseDrink - desc: reagent-desc-juice-pumpkin - physicalDesc: reagent-physical-desc-sweet - flavor: adt_pumpkin - color: "#e08f0a" diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_chocolate.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_chocolate.yml deleted file mode 100644 index ba07a65802c..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_chocolate.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: reagent - id: ADTChocolateDrink - name: chocolate-drink-name - parent: BaseDrink - desc: chocolate-drink-desc - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTChocolateDrinkFlavor - color: "#8a5a3a" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateHunger - factor: 0.3 - - !type:AdjustReagent - reagent: Theobromine - amount: 0.1 - - !type:SatiateThirst - factor: 0.5 - metamorphicSprite: - sprite: Objects/Consumable/Drinks/chocolateglass.rsi - state: icon diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_cocoa.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_cocoa.yml deleted file mode 100644 index 8e23e888cf2..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/liquid_cocoa.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: reagent - id: ADTCocoaDrink - name: cocoa-drink-name - parent: BaseDrink - desc: cocoa-drink-desc - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTCocoaDrinkFlavor - color: "#664300" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi - state: icon_empty - metamorphicMaxFillLevels: 5 - metamorphicFillBaseName: fill- - metamorphicChangeColor: false \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml deleted file mode 100644 index b5c4650b856..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/new_year.yml +++ /dev/null @@ -1,141 +0,0 @@ -- type: reagent - id: ADTChampagneMandarin - name: reagent-name-champagne-mandarin - parent: Champagne - desc: reagent-desc-champagne-mandarin - recognizable: true - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: champagne_mandarin - -- type: reagent - id: ADTMulledWineCold - name: reagent-name-mulled-wine-cold - parent: BaseAlcohol - desc: reagent-desc-mulled-wine-cold - physicalDesc: reagent-physical-desc-cloudy - flavor: cold - color: "#743636" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: mulled_wine_cold - -- type: reagent - id: ADTMulledWine - name: reagent-name-mulled-wine - parent: BaseDrink - desc: reagent-desc-mulled-wine - physicalDesc: reagent-physical-desc-cloudy - flavor: ADTHoliday - color: "#743636" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: mulled_wine - -- type: reagent - id: ADTChristmasMilkshake - name: reagent-name-christmas-milkshake - parent: BaseSoda - desc: reagent-desc-christmas-milkshake - physicalDesc: reagent-physical-desc-creamy - flavor: ADTMilkshake - color: "#c7c5c1" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: christmas_milkshake - -- type: reagent - id: ADTTeaCinnamonLemon - name: reagent-name-tea-cinnamon-lemon - parent: BaseDrink - desc: reagent-desc-tea-cinnamon-lemon - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTTeaCinnamonLemon - color: "#5b3b15" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: warm_tea_cinnamon_lemon - -- type: reagent - id: ADTSbitenCinnamonLemon - name: reagent-name-sbiten-cinnamon-lemon - parent: BaseAlcohol - desc: reagent-desc-sbiten-cinnamon-lemon - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTSbitenCinnamonLemon - color: "#5a3a28" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: sbiten_cinnamon_lemon - -- type: reagent - id: ADTHotCocoa - name: reagent-name-hot-cocoa - parent: BaseDrink - desc: reagent-desc-hot-cocoa - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTCocoaDrinkFlavor - color: "#b29b7b" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_cocoa - -- type: reagent - id: ADTHotChocolate - name: reagent-name-hot-chocolate - parent: BaseDrink - desc: reagent-desc-hot-chocolate - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTChocolateDrinkFlavor - color: "#9c9289" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_chocolate - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Theobromine - amount: 0.05 - -- type: reagent - id: ADTHotChocolateAllergic - name: reagent-name-hot-chocolate-allergic - parent: BaseDrink - desc: reagent-desc-hot-chocolate-allergic - physicalDesc: reagent-physical-desc-aromatic - flavor: ADTChocolateDrinkFlavor - color: "#9c9289" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/new_year.rsi - state: hot_chocolate - -- type: reagent - id: ADTCarnation #гвоздика, чисто нужна для напитков. - name: reagent-name-carnation - parent: BaseDrink - desc: reagent-desc-carnation - physicalDesc: reagent-physical-desc-cloudy - flavor: savory - color: "#673d0c" - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 0.5 - -- type: reagent - id: ADTСinnamon #корица, тоже для напитков. - name: reagent-name-cinnamon - parent: BaseDrink - desc: reagent-desc-cinnamon - physicalDesc: reagent-physical-desc-cloudy - flavor: sweet - color: "#9f5525" - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml deleted file mode 100644 index 81c617c74e0..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/oktoberfest_beer.yml +++ /dev/null @@ -1,213 +0,0 @@ -- type: reagent - id: ADTGoldenAle - name: golden-ale-name - parent: BaseAlcohol - desc: golden-ale-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTGoldenAleFlavor - color: "#663100" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 - - !type:HealthChange - damage: - groups: - Brute: -1.5 - types: - Poison: -0.7 ##Should be about what it was when it healed the toxin group - Heat: -0.7 - Shock: -0.7 - Cold: -0.7 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: goldenale - - -- type: reagent - id: ADTSausageBeer - name: sausage-beer-name - parent: BaseAlcohol - desc: sausage-beer-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTSausageBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 - - !type:AdjustReagent - reagent: Nutriment - amount: 0.2 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: sausagebeer - -- type: reagent - id: ADTTechnoBeer - name: techo-beer-name - parent: BaseAlcohol - desc: techo-beer-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTTechnoBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.25 - Medicine: - effects: - - !type:AdjustTemperature - conditions: - - !type:Temperature - max: 350.15 - amount: 10000 # thermal energy, not temperature! - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: technobeer - -- type: reagent - id: ADTClassicPaulanerBeer - name: classic-paulaner-name - parent: BaseAlcohol - desc: classic-paulaner-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTClassicPaulanerBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - - !type:AdjustReagent - reagent: Nutriment - amount: 0.1 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: classicpaulaner - -- type: reagent - id: ADTLivseyBeer - name: livsey-beer-name - parent: BaseAlcohol - desc: livsey-beer-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTLivseyBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.25 - Medicine: - effects: - - !type:AdjustTemperature - conditions: - - !type:Temperature - min: 263.15 - amount: -10000 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: livseybeer - -- type: reagent - id: ADTLuckyJonnyBeer - name: lucky-jonny-name - parent: BaseAlcohol - desc: lucky-jonny-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTLuckyJonnyBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.25 - - !type:MovespeedModifier - walkSpeedModifier: 1.1 - sprintSpeedModifier: 1.1 - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 5 - refresh: false - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: luckyjonny - -- type: reagent - id: ADTSecUnfilteredBeer - name: sec-unfiltered-name - parent: BaseAlcohol - desc: sec-unfiltered-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTSecUnfilteredBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.3 - - !type:MovespeedModifier - walkSpeedModifier: 0.85 - sprintSpeedModifier: 0.85 - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: secunfiltered - -- type: reagent - id: ADTGlyphidStoutBeer - name: glyphid-stout-name - parent: BaseAlcohol - desc: glyphid-stout-desc - physicalDesc: reagent-physical-desc-bubbly - flavor: ADTGlyphidStoutBeerFlavor - color: "#cfa85f" - recognizable: true - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.35 - - !type:HealthChange - damage: - types: - Poison: -0.9 ##Should be about what it was when it healed the toxin group - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/oktoberfest_beer.rsi - state: glyphidstout diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/vodka_antivirus.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/vodka_antivirus.yml deleted file mode 100644 index bc0bf3b9fd5..00000000000 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/vodka_antivirus.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: reagent - id: ADTVodkaAntivirus - name: vodka-antivirus-name - parent: BaseAlcohol - desc: vodka-antivirus-desc - physicalDesc: reagent-physical-desc-overpowering - flavor: ADTVodkaAntivirusFlavor - color: "#d1d1d155" - metamorphicSprite: - sprite: ADT/Objects/Consumable/Drinks/vodka_antivirusglass.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.9 diff --git a/Resources/Prototypes/ADT/Entities/Structures/miningwallgirder.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/minninggeiger.yml similarity index 86% rename from Resources/Prototypes/ADT/Entities/Structures/miningwallgirder.yml rename to Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/minninggeiger.yml index af424a06de3..b1f83ee5d08 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/miningwallgirder.yml +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/structures/minninggeiger.yml @@ -1,14 +1,3 @@ -- type: entity - id: ADTMiningGirder - parent: Girder - name: girder - description: A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall. - components: - - type: Construction - graph: MiningGirder - node: mining_girder - - - type: constructionGraph id: MiningGirder start: start diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml index 7a01b1b2fc3..dbd90008c3f 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipe.yml @@ -268,3 +268,121 @@ solids: ADTFoodBoiledBuckwheat: 1 ADTFoodSausageRaw: 2 + +- type: microwaveMealRecipe + id: ADTFoodSawdustSoupRecipe + name: sawdust soup recipe + result: ADTFoodSoupSawdust + time: 15 + reagents: + Water: 10 + TableSalt: 10 + solids: + FoodBowlBig: 1 + MaterialWoodPlank1: 1 + +- type: microwaveMealRecipe + id: ADTRecipePumpkinPie + name: pumpkin pie + result: ADTFoodPiePumpkin + time: 15 + solids: + FoodDoughPie: 1 + ADTFoodPumpkin: 1 + FoodPlateTin: 1 + +- type: microwaveMealRecipe + id: ADTRecipePumpkinSoup + name: pumpkin soup recipe + result: ADTFoodSoupPumpkin + time: 10 + reagents: + Water: 5 + solids: + FoodBowlBig: 1 + ADTFoodPumkinSlice: 2 + FoodCarrot: 1 + FoodPotato: 1 + +#рецепты + +- type: microwaveMealRecipe + id: ADTFoodOlivierSaladRecipe + name: olivier salad recipe + result: ADTFoodOlivierSalad + time: 15 + reagents: + Mayo: 5 + solids: + FoodBowlBig: 1 + FoodPotato: 2 + FoodMeat: 1 + FoodCarrot: 1 + FoodEgg: 1 + +- type: microwaveMealRecipe + id: ADTFoodJelliedMeatRecipe + name: jellied meat recipe + result: ADTFoodJelliedMeat + time: 20 + reagents: + Water: 15 + UncookedAnimalProteins: 9 + Fat: 9 + solids: + FoodMeat: 1 + FoodPlateSmall: 1 + +- type: microwaveMealRecipe + id: ADTFoodHerringUnderFurcoatRecipe + name: herring under furcoat recipe + result: ADTFoodHerringUnderFurcoat + time: 15 + reagents: + Mayo: 5 + solids: + FoodCarrot: 2 + FoodEgg: 1 + FoodMeatFish: 1 + FoodPlateSmall: 1 + +- type: microwaveMealRecipe + id: ADTFoodMeatHamRecipe + name: ham with mead recipe + result: ADTFoodMeatHam + time: 25 + reagents: + Blackpepper: 5 + TableSalt: 5 + solids: + FoodMeat: 2 + FoodPlate: 1 + +- type: microwaveMealRecipe + id: ADTFoodCakePuddingRecipe + name: puding recipe + result: ADTFoodCakePudding + time: 10 + reagents: + Water: 15 + Milk: 10 + Flour: 10 + Sugar: 15 + Egg: 6 + solids: + FoodPlateSmall: 1 + +- type: microwaveMealRecipe + id: ADTFoodCakePuddingChristmasRecipe + name: christmas puding recipe + result: ADTFoodCakePuddingChristmas + time: 10 + reagents: + Water: 15 + Milk: 10 + Flour: 10 + Sugar: 15 + Egg: 6 + solids: + FoodPlateSmall: 1 + ADTFoodSnackCandyStick: 2 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml b/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml new file mode 100644 index 00000000000..7e99c062415 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/electronics.yml @@ -0,0 +1,8 @@ +#плата принтера рецепт в протолате +- type: latheRecipe + id: ADTFormPrinterMachineCircuitboard + result: ADTFormPrinterMachineCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/printer.yml b/Resources/Prototypes/ADT/Recipes/Lathes/printer.yml new file mode 100644 index 00000000000..56bde026d90 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/printer.yml @@ -0,0 +1,424 @@ +#цена формы, результат +- type: latheRecipe + id: ReportStationRecipe + result: ReportStation + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ReporDepartmentRecipe + result: ReporDepartment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ReportEmployeePerformanceRecipe + result: ReportEmployeePerformance + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ReportOnTheChaptersMeetingRecipe + result: ReportOnTheChaptersMeeting + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: InternalAffairsAgentsReportRecipe + result: InternalAffairsAgentsReport + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ConditionReportRecipe + result: ConditionReport + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ReportStudyObjectRecipe + result: ReportStudyObject + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: DisposalReportRecipe + result: DisposalReport + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ApplicationAppointmentInterimRecipe + result: ApplicationAppointmentInterim + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ApplicationEmploymentRecipe + result: ApplicationEmployment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: LetterResignationRecipe + result: LetterResignation + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ApplicationAccessRecipe + result: ApplicationAccess + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ApplicationEquipmentRecipe + result: ApplicationEquipment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: EvacuationShuttleRequestRecipe + result: EvacuationShuttleRequest + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ShuttleRegistrationRequestRecipe + result: ShuttleRegistrationRequest + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestCallMembersCentralCommitteeDSORecipe + result: RequestCallMembersCentralCommitteeDSO + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestChangeSalaryRecipe + result: RequestChangeSalary + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestNonListedEmploymentRecipe + result: RequestNonListedEmployment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestDocumentsRecipe + result: RequestDocuments + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestEuthanasiaRecipe + result: RequestEuthanasia + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestConstructionWorkRecipe + result: RequestConstructionWork + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: RequestModernizationRecipe + result: RequestModernization + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ComplaintViolationLaborRulesRecipe + result: ComplaintViolationLaborRules + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ComplaintОffenseRecipe + result: ComplaintОffense + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: PermissionEquipmentRecipe + result: PermissionEquipment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: SearchPermissionRecipe + result: SearchPermission + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: PermissionWeaponsRecipe + result: PermissionWeapons + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: PrescriptionDrugAuthorizationRecipe + result: PrescriptionDrugAuthorization + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: PermissionDisposeBodyRecipe + result: PermissionDisposeBody + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ConstructionPermitRecipe + result: ConstructionPermit + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderDismissalRecipe + result: OrderDismissal + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderDeprivationAccessRecipe + result: OrderDeprivationAccess + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderEncouragementRecipe + result: OrderEncouragement + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderParolePrisonerRecipe + result: OrderParolePrisoner + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderRecognizingSentienceCreatureRecipe + result: OrderRecognizingSentienceCreature + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderMedicalInterventionRecipe + result: OrderMedicalIntervention + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ProductManufacturingOrderRecipe + result: ProductManufacturingOrder + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderPurchaseResourcesEquipmentRecipe + result: OrderPurchaseResourcesEquipment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderingSpecialEquipmentRecipe + result: OrderingSpecialEquipment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: OrderPurchaseWeaponsRecipe + result: OrderPurchaseWeapons + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: CertificateRecipe + result: Certificate + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: CertificateAdvancedTrainingRecipe + result: CertificateAdvancedTraining + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: CertificateOffenseRecipe + result: CertificateOffense + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: DeathCertificateRecipe + result: DeathCertificate + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: MarriageCertificateRecipe + result: MarriageCertificate + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: DivorceCertificateRecipe + result: DivorceCertificate + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: ClosingIndictmentRecipe + result: ClosingIndictment + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: SentenceRecipe + result: Sentence + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: StatementHealtheRecipe + result: StatementHealth + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: NOTICEOFLIQUIDATIONRecipe + result: NOTICEOFLIQUIDATION + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: BUSINESSDEALRecipe + result: BUSINESSDEAL + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: NOTEBEGINNINGMILITARYACTIONSRecipe + result: NOTEBEGINNINGMILITARYACTIONS + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 + +- type: latheRecipe + id: REPORTACCOMPLISHMENTGOALSRecipe + result: REPORTACCOMPLISHMENTGOALS + completetime: 1 + applyMaterialDiscount: false + materials: + SheetPrinter: 100 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/SoundCollections/emotes.yml b/Resources/Prototypes/ADT/SoundCollections/emotes.yml index 3440ad71a1b..e55a5df0822 100644 --- a/Resources/Prototypes/ADT/SoundCollections/emotes.yml +++ b/Resources/Prototypes/ADT/SoundCollections/emotes.yml @@ -103,3 +103,47 @@ id: FelinidPurrs files: - /Audio/ADT/Felinid/cat_purr1.ogg + +- type: speechSounds + id: Metrocop + saySound: + path: /Audio/ADT/Footsteps/say/off2.ogg + askSound: + path: /Audio/ADT/Footsteps/say/off1.ogg + exclaimSound: + path: /Audio/ADT/Footsteps/say/off3.ogg + +- type: speechSounds + id: Combine + saySound: + path: /Audio/ADT/Footsteps/off2.ogg + askSound: + path: /Audio/ADT/Footsteps/off3.ogg + exclaimSound: + path: /Audio/ADT/Footsteps/off1.ogg + +- type: soundCollection + id: Metrocop + files: + - /Audio/ADT/Footsteps/say/off1.ogg + - /Audio/ADT/Footsteps/say/off2.ogg + - /Audio/ADT/Footsteps/say/off3.ogg + - /Audio/ADT/Footsteps/say/off4.ogg + +- type: soundCollection + id: SoldierDeath + files: + - /Audio/ADT/Footsteps/combine/die1.ogg + - /Audio/ADT/Footsteps/combine/die2.ogg + - /Audio/ADT/Footsteps/combine/die3.ogg + - /Audio/ADT/Footsteps/combine/die4.ogg + +- type: soundCollection + id: FootstepSoldier + files: + - /Audio/ADT/Footsteps/gear1.ogg + - /Audio/ADT/Footsteps/gear2.ogg + - /Audio/ADT/Footsteps/gear3.ogg + - /Audio/ADT/Footsteps/gear4.ogg + - /Audio/ADT/Footsteps/gear5.ogg + - /Audio/ADT/Footsteps/gear6.ogg diff --git a/Resources/Prototypes/ADT/SoundCollections/gun_sound.yml b/Resources/Prototypes/ADT/SoundCollections/gun_sound.yml new file mode 100644 index 00000000000..fd9a73b1eae --- /dev/null +++ b/Resources/Prototypes/ADT/SoundCollections/gun_sound.yml @@ -0,0 +1,9 @@ + + ## рандомизатор звуков для разнообразия звуков выстрела +- type: soundCollection + id: FN_Fal_choot + files: + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot1.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot2.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot3.ogg + - /Audio/ADT/Weapons/fnfal/FN-FAL_shoot4.ogg \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml b/Resources/Prototypes/ADT/Species/securitycyborg.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml rename to Resources/Prototypes/ADT/Species/securitycyborg.yml diff --git a/Resources/Prototypes/ADT/radio_channels.yml b/Resources/Prototypes/ADT/radio_channels.yml index 5a45f167d78..59a3d4f9097 100644 --- a/Resources/Prototypes/ADT/radio_channels.yml +++ b/Resources/Prototypes/ADT/radio_channels.yml @@ -44,3 +44,75 @@ keycode: 'x' color: "#e56000" longRange: true + +- type: radioChannel + id: Trader + name: chat-radio-trader + keycode: 'ф' + frequency: 1673 + color: "#b88646" + longRange: true + +- type: radioChannel + id: ADTWiretapping + name: Засекреченная линия + keycode: '\' + frequency: 1672 + color: "#ff144b" + longRange: true + +- type: radioChannel + id: ADTLawyerChannel + name: Юридический + keycode: 'ю' + frequency: 1305 + color: "#c6d2f5" + longRange: true + +- type: radioChannel + id: ADTMercChannel + name: Наёмнический + keycode: 'ч' + frequency: 1306 + color: "#ff144b" + longRange: true + +- type: radioChannel + id: ADTSpecChannel + name: Спецназовский + keycode: 'е' + frequency: 1307 + color: "#00fa9a" + longRange: true + +- type: radioChannel + id: ADTUSSPChannel + name: СССП + keycode: 'я' + frequency: 1304 + color: "#7ecc8e" + longRange: true + +- type: radioChannel + id: ADTTransSolar19482Channel + name: ТСФ 1948.2 + keycode: '2' + frequency: 1947 + color: "#75c1ff" + longRange: true + +- type: radioChannel + id: ADTTransSolar19487Channel + name: ТСФ 1948.7 + keycode: '7' + frequency: 1948 + color: "#75c1ff" + longRange: true + +- type: radioChannel + id: ADTTransSolar19489Channel + name: ТСФ 1948.9 + keycode: '9' + frequency: 1949 + color: "#75c1ff" + longRange: true diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/laws.yml b/Resources/Prototypes/ADT/silicon-laws.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/laws.yml rename to Resources/Prototypes/ADT/silicon-laws.yml diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 75624f1509a..eb746ef6855 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -85,3 +85,99 @@ - type: Tag id: ADTMechEquipmentSec +- type: Tag + id: ADTCardPlay + +- type: Tag + id: ADTPillExperimental + +- type: Tag + id: ADTPillExter + +- type: Tag + id: ADTWinterPlanet + +- type: Tag + id: ADTCartridgeBibis + +- type: Tag + id: ADTMagazineRifleBibis + +- type: Tag + id: ADTMagazineSR3M + +- type: Tag + id: ADTMagazineSR2M + +- type: Tag + id: ADTMagazineBizon + +- type: Tag + id: ADTMagazineUSSPLMG + +- type: Tag + id: ADTMagazineUSSPLMGDrum + +- type: Tag + id: ADTMagazineUSSPAK74 + +- type: Tag + id: ADTMagazineUSSPAKM + +- type: Tag + id: MiniFireExtinguisher + +- type: Tag + id: ADTMagazinePistolPMM + +- type: Tag + id: ADTGoldenStarGarland + +- type: Tag + id: ADTSilverStarGarland + +- type: Tag + id: ADTBaseStarGarland + +- type: Tag + id: ADTShinyGarland + +- type: Tag + id: ADTTreeGoldenStar + +- type: Tag + id: ADTTreeRedStar + +- type: Tag + id: ADTTreeSilverStar + +- type: Tag + id: ADTTreeRedBalls + +- type: Tag + id: ADTTreeGoldenBalls + +- type: Tag + id: ADTTreeSilverBalls + +- type: Tag + id: ADTTreeRedMishura + +- type: Tag + id: ADTTreeGoldenMishura + +- type: Tag + id: ADTTreeSilverMishura + +#тэг для магазина лазгана +- type: Tag + id: ADTLasgunPowerCell + +- type: Tag + id: ADTLasgunRevolverCell + +- type: Tag + id: ADTMagazineSniperSVCH + +- type: Tag + id: ADTMagazineRifleAR12 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml deleted file mode 100644 index 3600059a4a8..00000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml +++ /dev/null @@ -1,94 +0,0 @@ -#Фактически тот же парент винтовок, но убрал фулл авто и добавил полуавто и очереди -- type: entity - name: BaseWeaponBurstRifle - parent: BaseItem - id: BaseWeaponBurstRifle - description: A rooty tooty point and shooty. - abstract: true - components: - - type: Sprite - - type: Item - size: Ginormous - - type: Clothing - sprite: Objects/Weapons/Guns/BurstRifles/abakan.rsi - quickEquip: false - slots: - - Back - - suitStorage - - type: AmmoCounter - - type: Gun - fireRate: 10 - selectedMode: Burst - availableModes: - - SemiAuto - - Burst - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: StaticPrice - price: 500 - -# - type: entity Вызывает ошибки и уже добавлена итоговая версия. @Friskis -# name: Абакан -# parent: BaseWeaponBurstRifle -# id: AbakanRifle -# description: Тут должно быть описание Абакана. -# components: -# - type: Sprite -# sprite: Objects/Weapons/Guns/BurstRifles/abakan.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - state: mag-0 -# map: ["enum.GunVisualLayers.Mag"] -# - type: Clothing -# sprite: Objects/Weapons/Guns/Rifles/carbine.rsi -# - type: ItemSlots -# slots: -# gun_magazine: -# name: Magazine -# startingItem: MagazineRifle -# insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg -# ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg -# priority: 2 -# whitelist: -# tags: -# - MagazineRifle -# gun_chamber: -# name: Chamber -# startingItem: CartridgeRifle -# priority: 1 -# whitelist: -# tags: -# - CartridgeRifle -# - type: ContainerContainer -# containers: -# gun_magazine: !type:ContainerSlot -# gun_chamber: !type:ContainerSlot -# - type: MagazineVisuals -# magState: mag -# steps: 1 -# zeroVisible: true -# - type: Appearance From 17d7d5614fa70a1d7232c0803793514973098402 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Mon, 20 May 2024 21:51:57 +0300 Subject: [PATCH 02/13] resolve --- Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml new file mode 100644 index 00000000000..a0abdbed42f --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml @@ -0,0 +1 @@ +#For delete \ No newline at end of file From 2841d2e2f044597e6555850df9f752002a2501f3 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Mon, 20 May 2024 21:53:40 +0300 Subject: [PATCH 03/13] resolve --- Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml deleted file mode 100644 index a0abdbed42f..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/AshWalker.yml +++ /dev/null @@ -1 +0,0 @@ -#For delete \ No newline at end of file From 9b0378d60cc99d89113a883778f86010a7aa89c0 Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Mon, 20 May 2024 22:03:30 +0300 Subject: [PATCH 04/13] fix missing tags --- Resources/Prototypes/ADT/tags.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index eb746ef6855..cb35100c06d 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -180,4 +180,10 @@ id: ADTMagazineSniperSVCH - type: Tag - id: ADTMagazineRifleAR12 \ No newline at end of file + id: ADTMagazineRifleAR12 + +- type: Tag + id: ADTCartridgeRocketSchmelTermobar + +- type: Tag + id: ADTCartridgeRocketSapogHEAT From b16007bf68464fa23ae241a8e492396b95106ac3 Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Mon, 20 May 2024 22:09:45 +0300 Subject: [PATCH 05/13] Update backpack.yml --- .../Fills/Backpacks/StarterGear/backpack.yml | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 82ba00b6c96..94e942b4762 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -149,6 +149,33 @@ #рюкзак следователя +- type: entity + #noSpawn: true + parent: ClothingBackpackSecurity + id: ADTClothingBackpackInvestigatorFilled + components: + #- type: Storage + # maxItemSize: Huge + # maxTotalWeight: 0 + # maxSlots: 50 #By this ignore maxTotalWeight + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: Pen + amount: 2 + #- id: PaperOffice + # amount: 20 + - id: ADTInvestigatorBoxFolderBase + amount: 1 + - id: ADTInvestigatorBoxFolderRed + amount: 2 + - id: ADTInvestigatorBoxFolderBlue + amount: 1 + - id: ADTBookInvestigator + - id: ADTRubberStampinvestigator + - id: SpaceCash500 + - type: entity #noSpawn: true parent: ClothingBackpackDuffelSecurity @@ -372,4 +399,4 @@ - id: GrenadeFlashBang - id: GrenadeFlashBang - id: ADTSecurityCybPDA - #- id: WelderIndustrialAdvanced \ No newline at end of file + #- id: WelderIndustrialAdvanced From 325e62e6b10239e5dc6af6cde39b46efc2d0a8f7 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Mon, 20 May 2024 22:45:12 +0300 Subject: [PATCH 06/13] trader miss --- .../traider.yml => Entities/Markers/Spawners/Random/crates.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/ADT/{Catalog/Fills/Crates/traider.yml => Entities/Markers/Spawners/Random/crates.yml} (100%) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/crates.yml similarity index 100% rename from Resources/Prototypes/ADT/Catalog/Fills/Crates/traider.yml rename to Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/crates.yml From b78d2855b96ec426179648a5bd2f6377eee1ae53 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 09:37:26 +0300 Subject: [PATCH 07/13] resolve stupid things --- .../Prototypes/ADT/Actions/abomination.yml | 50 ++++++ .../Prototypes/ADT/Damage/ADTmodifiers.yml | 65 ++++++++ .../Mobs/NPCs/anomally_abomination.yml | 147 +++--------------- .../Entities/Mobs/anomally_abomination.yml | 1 + 4 files changed, 140 insertions(+), 123 deletions(-) create mode 100644 Resources/Prototypes/ADT/Actions/abomination.yml create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml diff --git a/Resources/Prototypes/ADT/Actions/abomination.yml b/Resources/Prototypes/ADT/Actions/abomination.yml new file mode 100644 index 00000000000..79ca70d913b --- /dev/null +++ b/Resources/Prototypes/ADT/Actions/abomination.yml @@ -0,0 +1,50 @@ +- type: entity + id: CompActionShootAbomination + name: action-shoot + description: action-shoot-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 10 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + state: icon + event: !type:CompProjectileActionEvent + +- type: entity + id: CompActionHealAbomination + name: action-heal + description: action-heal-desc + noSpawn: true + components: + - type: InstantAction + icon: + sprite: Interface/Actions/actions_ling.rsi + state: fleshmend + itemIconStyle: BigAction + checkCanInteract: false + event: !type:CompHealActionEvent + useDelay: 120 + +- type: entity + id: CompActionJumpAbomination + name: action-jump + description: action-jump-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 35 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: Clothing/Shoes/Boots/combatboots.rsi + state: icon + event: !type:CompJumpActionEvent diff --git a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml index 6d281a0cbcf..70af738b1b5 100644 --- a/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml +++ b/Resources/Prototypes/ADT/Damage/ADTmodifiers.yml @@ -123,3 +123,68 @@ 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 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml index 11113dddd04..40eacec7a54 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/anomally_abomination.yml @@ -1,5 +1,23 @@ - type: entity parent: BaseMobFlesh + id: ADTBaseMobAbomination + name: abomination + description: A shambling mass of flesh and abomination, animated through anomalous energy. + abstract: true + components: + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - TemporaryBlindness + - Pacified + - StaminaModifier + +- type: entity + parent: ADTBaseMobAbomination id: ADTMobDistorted name: distorted description: distorted @@ -39,7 +57,7 @@ 100: Dead - type: entity - parent: BaseMobFlesh + parent: ADTBaseMobAbomination id: ADTMobEcho name: echo description: echo @@ -81,7 +99,7 @@ jumpAction: CompActionJumpAbomination - type: entity - parent: BaseMobFlesh + parent: ADTBaseMobAbomination id: ADTMobGrant name: grant description: grant @@ -122,7 +140,7 @@ 200: Dead - type: entity - parent: BaseMobFlesh + parent: ADTBaseMobAbomination id: ADTMobHunter name: hunter description: hunter @@ -164,7 +182,7 @@ jumpAction: CompActionJumpAbomination - type: entity - parent: BaseMobFlesh + parent: ADTBaseMobAbomination id: ADTMobSoldier name: soldier description: soldier @@ -209,7 +227,7 @@ prototype: BulletAcid - type: entity - parent: BaseMobFlesh + parent: ADTBaseMobAbomination id: ADTMobWrecker name: wrecker description: wrecker @@ -251,121 +269,4 @@ healAction: CompActionHealAbomination - type: ProjectileAct projAction: CompActionShootAbomination - prototype: BulletAcid - -- 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 - -- type: entity - id: CompActionShootAbomination - name: action-shoot - description: action-shoot-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 10 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - state: icon - event: !type:CompProjectileActionEvent - -- type: entity - id: CompActionHealAbomination - name: action-heal - description: action-heal-desc - noSpawn: true - components: - - type: InstantAction - icon: - sprite: Interface/Actions/actions_ling.rsi - state: fleshmend - itemIconStyle: BigAction - checkCanInteract: false - event: !type:CompHealActionEvent - useDelay: 120 - -- type: entity - id: CompActionJumpAbomination - name: action-jump - description: action-jump-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 35 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: Clothing/Shoes/Boots/combatboots.rsi - state: icon - event: !type:CompJumpActionEvent + prototype: BulletAcid \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml new file mode 100644 index 00000000000..936b6a3061e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml @@ -0,0 +1 @@ +#For deletion \ No newline at end of file From e5a6b36cd88b13473fe2b8ad2d482485dd0c63a0 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 09:38:27 +0300 Subject: [PATCH 08/13] resolve stupid things --- Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml deleted file mode 100644 index 936b6a3061e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml +++ /dev/null @@ -1 +0,0 @@ -#For deletion \ No newline at end of file From bbe52d87cbaede2cc0c6c47d8522297b3070994c Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 09:40:02 +0300 Subject: [PATCH 09/13] =?UTF-8?q?=D0=B4=D0=B0=20=D0=B2=D1=8B=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B5=D0=B1=D0=B0=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Mobs/anomally_abomination.yml | 389 ++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml new file mode 100644 index 00000000000..f1de4702cd0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml @@ -0,0 +1,389 @@ +- type: entity + parent: BaseMobFlesh + id: ADTBaseMobAbomination + name: abomination + description: A shambling mass of flesh and abomination, animated through anomalous energy. + abstract: true + components: + - type: StatusEffects + allowed: + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - TemporaryBlindness + - Pacified + - StaminaModifier + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobDistorted + name: distorted + description: distorted + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abomination.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: distorted + - type: DamageStateVisuals + states: + Alive: + Base: distorted + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 4 + - type: Damageable + damageContainer: Biological + damageModifierSet: distorted + - type: MovementSpeedModifier + baseWalkSpeed: 2.4 + baseSprintSpeed: 4.4 + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobEcho + name: echo + description: echo + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abomination.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: echo + - type: DamageStateVisuals + states: + Alive: + Base: echo + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 4 + - type: Damageable + damageContainer: Biological + damageModifierSet: echo + - type: MovementSpeedModifier + baseWalkSpeed: 3.0 + baseSprintSpeed: 4.7 + - type: MobThresholds + thresholds: + 0: Alive + 95: Dead + - type: JumpAct + jumpAction: CompActionJumpAbomination + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobGrant + name: grant + description: grant + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abomination.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: grant + - type: DamageStateVisuals + states: + Alive: + Base: grant + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 8 + Poison: 5 + - type: Damageable + damageContainer: Biological + damageModifierSet: grant + - type: MovementSpeedModifier + baseWalkSpeed: 2.2 + baseSprintSpeed: 3.7 + - type: MobThresholds + thresholds: + 0: Alive + 200: Dead + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobHunter + name: hunter + description: hunter + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abom_wrecker.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: hunter + - type: DamageStateVisuals + states: + Alive: + Base: hunter + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 8 + - type: Damageable + damageContainer: Biological + damageModifierSet: hunter + - type: MovementSpeedModifier + baseWalkSpeed: 3.2 + baseSprintSpeed: 4.75 + - type: MobThresholds + thresholds: + 0: Alive + 300: Dead + - type: JumpAct + jumpAction: CompActionJumpAbomination + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobSoldier + name: soldier + description: soldier + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abomination.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: soldier + - type: DamageStateVisuals + states: + Alive: + Base: soldier + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 4 + - type: Damageable + damageContainer: Biological + damageModifierSet: soldier + - type: MovementSpeedModifier + baseWalkSpeed: 2.7 + baseSprintSpeed: 4.3 + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + - type: HealAct + healAction: CompActionHealAbomination + - type: ProjectileAct + projAction: CompActionShootAbomination + prototype: BulletAcid + +- type: entity + parent: ADTBaseMobAbomination + id: ADTMobWrecker + name: wrecker + description: wrecker + suffix: DO NOT MAP + components: + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/abom_wrecker.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: wrecker + - type: DamageStateVisuals + states: + Alive: + Base: wrecker + Critical: + Base: dead + Dead: + Base: dead + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Slash: 15 + - type: Damageable + damageContainer: Biological + damageModifierSet: wrecker + - type: MovementSpeedModifier + baseWalkSpeed: 2.2 + baseSprintSpeed: 3.5 + - type: MobThresholds + thresholds: + 0: Alive + 600: Dead + - type: HealAct + healAction: CompActionHealAbomination + - type: ProjectileAct + projAction: CompActionShootAbomination + prototype: BulletAcid + +- 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 + +- type: entity + id: CompActionShootAbomination + name: action-shoot + description: action-shoot-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 10 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + state: icon + event: !type:CompProjectileActionEvent + +- type: entity + id: CompActionHealAbomination + name: action-heal + description: action-heal-desc + noSpawn: true + components: + - type: InstantAction + icon: + sprite: Interface/Actions/actions_ling.rsi + state: fleshmend + itemIconStyle: BigAction + checkCanInteract: false + event: !type:CompHealActionEvent + useDelay: 120 + +- type: entity + id: CompActionJumpAbomination + name: action-jump + description: action-jump-desc + noSpawn: true + components: + - type: WorldTargetAction + useDelay: 35 + range: 16 # default examine-range. + # ^ should probably add better validation that the clicked location is on the users screen somewhere, + itemIconStyle: BigAction + checkCanAccess: false + repeat: true + icon: + sprite: Clothing/Shoes/Boots/combatboots.rsi + state: icon + event: !type:CompJumpActionEvent From 422ae8b910aa838480d7129271e7b785c08fd2c9 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 09:40:47 +0300 Subject: [PATCH 10/13] pon --- .../Entities/Mobs/anomally_abomination.yml | 390 +----------------- 1 file changed, 1 insertion(+), 389 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml index f1de4702cd0..936b6a3061e 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml @@ -1,389 +1 @@ -- type: entity - parent: BaseMobFlesh - id: ADTBaseMobAbomination - name: abomination - description: A shambling mass of flesh and abomination, animated through anomalous energy. - abstract: true - components: - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - Stutter - - Electrocution - - TemporaryBlindness - - Pacified - - StaminaModifier - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobDistorted - name: distorted - description: distorted - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abomination.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: distorted - - type: DamageStateVisuals - states: - Alive: - Base: distorted - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 4 - - type: Damageable - damageContainer: Biological - damageModifierSet: distorted - - type: MovementSpeedModifier - baseWalkSpeed: 2.4 - baseSprintSpeed: 4.4 - - type: MobThresholds - thresholds: - 0: Alive - 100: Dead - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobEcho - name: echo - description: echo - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abomination.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: echo - - type: DamageStateVisuals - states: - Alive: - Base: echo - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 4 - - type: Damageable - damageContainer: Biological - damageModifierSet: echo - - type: MovementSpeedModifier - baseWalkSpeed: 3.0 - baseSprintSpeed: 4.7 - - type: MobThresholds - thresholds: - 0: Alive - 95: Dead - - type: JumpAct - jumpAction: CompActionJumpAbomination - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobGrant - name: grant - description: grant - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abomination.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: grant - - type: DamageStateVisuals - states: - Alive: - Base: grant - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 8 - Poison: 5 - - type: Damageable - damageContainer: Biological - damageModifierSet: grant - - type: MovementSpeedModifier - baseWalkSpeed: 2.2 - baseSprintSpeed: 3.7 - - type: MobThresholds - thresholds: - 0: Alive - 200: Dead - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobHunter - name: hunter - description: hunter - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abom_wrecker.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: hunter - - type: DamageStateVisuals - states: - Alive: - Base: hunter - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 8 - - type: Damageable - damageContainer: Biological - damageModifierSet: hunter - - type: MovementSpeedModifier - baseWalkSpeed: 3.2 - baseSprintSpeed: 4.75 - - type: MobThresholds - thresholds: - 0: Alive - 300: Dead - - type: JumpAct - jumpAction: CompActionJumpAbomination - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobSoldier - name: soldier - description: soldier - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abomination.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: soldier - - type: DamageStateVisuals - states: - Alive: - Base: soldier - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 4 - - type: Damageable - damageContainer: Biological - damageModifierSet: soldier - - type: MovementSpeedModifier - baseWalkSpeed: 2.7 - baseSprintSpeed: 4.3 - - type: MobThresholds - thresholds: - 0: Alive - 100: Dead - - type: HealAct - healAction: CompActionHealAbomination - - type: ProjectileAct - projAction: CompActionShootAbomination - prototype: BulletAcid - -- type: entity - parent: ADTBaseMobAbomination - id: ADTMobWrecker - name: wrecker - description: wrecker - suffix: DO NOT MAP - components: - - type: Sprite - drawdepth: Mobs - sprite: ADT/Mobs/Aliens/abom_wrecker.rsi - layers: - - map: [ "enum.DamageStateVisualLayers.Base" ] - state: wrecker - - type: DamageStateVisuals - states: - Alive: - Base: wrecker - Critical: - Base: dead - Dead: - Base: dead - - type: MeleeWeapon - soundHit: - path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 - animation: WeaponArcClaw - damage: - types: - Slash: 15 - - type: Damageable - damageContainer: Biological - damageModifierSet: wrecker - - type: MovementSpeedModifier - baseWalkSpeed: 2.2 - baseSprintSpeed: 3.5 - - type: MobThresholds - thresholds: - 0: Alive - 600: Dead - - type: HealAct - healAction: CompActionHealAbomination - - type: ProjectileAct - projAction: CompActionShootAbomination - prototype: BulletAcid - -- 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 - -- type: entity - id: CompActionShootAbomination - name: action-shoot - description: action-shoot-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 10 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - state: icon - event: !type:CompProjectileActionEvent - -- type: entity - id: CompActionHealAbomination - name: action-heal - description: action-heal-desc - noSpawn: true - components: - - type: InstantAction - icon: - sprite: Interface/Actions/actions_ling.rsi - state: fleshmend - itemIconStyle: BigAction - checkCanInteract: false - event: !type:CompHealActionEvent - useDelay: 120 - -- type: entity - id: CompActionJumpAbomination - name: action-jump - description: action-jump-desc - noSpawn: true - components: - - type: WorldTargetAction - useDelay: 35 - range: 16 # default examine-range. - # ^ should probably add better validation that the clicked location is on the users screen somewhere, - itemIconStyle: BigAction - checkCanAccess: false - repeat: true - icon: - sprite: Clothing/Shoes/Boots/combatboots.rsi - state: icon - event: !type:CompJumpActionEvent +#For deletion \ No newline at end of file From f6235246c2beff7df0d39c36e6fb04e2b72d07c4 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 09:42:12 +0300 Subject: [PATCH 11/13] fucking abomination --- Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml b/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml deleted file mode 100644 index 936b6a3061e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/anomally_abomination.yml +++ /dev/null @@ -1 +0,0 @@ -#For deletion \ No newline at end of file From 442b674da2e3c29a1006f2ad6c62b051a5f264b1 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 16:40:49 +0300 Subject: [PATCH 12/13] resolve stupid things --- Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml | 8 +++++++- Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml index ffa46eddf8f..18f69d01cc5 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/carp.yml @@ -1,5 +1,5 @@ - type: entity - name: Carpkat + name: Karpkat parent: BaseMobCarp id: MobCarpNukie description: This poor carp is homestucked. @@ -7,6 +7,12 @@ - type: NpcFactionMember factions: - Syndicate + - type: Sprite + drawdepth: Mobs + sprite: ADT/Mobs/Aliens/CarpCat.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: alive - type: entity name: CarpCat Spawner diff --git a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml b/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml new file mode 100644 index 00000000000..936b6a3061e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml @@ -0,0 +1 @@ +#For deletion \ No newline at end of file From 384ca8d5fb52f89da9f9cf9a2a436ae1b87eefdf Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Wed, 22 May 2024 16:42:12 +0300 Subject: [PATCH 13/13] resolve stupid thing --- Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml diff --git a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml b/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml deleted file mode 100644 index 936b6a3061e..00000000000 --- a/Resources/Prototypes/ADT/Entities/Mobs/nukiecarp.yml +++ /dev/null @@ -1 +0,0 @@ -#For deletion \ No newline at end of file