git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
	Mon, 10 Apr 2023 04:38:20 +0000 (00:38 -0400)
committer	GitHub <noreply@github.com>
	Mon, 10 Apr 2023 04:38:20 +0000 (23:38 -0500)
commit	57f2a768a07ac12dd30458557070852965d64d4d
tree	383f6f1509b8d1d8aa1befcd50cb6c235d23571f	tree \| snapshot
parent	69c1317d1c8b5e7661139342fdd53566a4d2b2c1	commit \| diff

Material Reclaimer (#14969)

* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary

111 files changed:

Content.Client/Materials/MaterialReclaimerSystem.cs	[new file with mode: 0644]	blob
Content.Client/Recycling/RecyclerVisualizer.cs	[deleted file]	blob \| history
Content.IntegrationTests/Tests/MaterialArbitrageTest.cs		diff \| blob \| history
Content.Server/Cargo/Systems/PricingSystem.cs		diff \| blob \| history
Content.Server/Materials/MaterialReclaimerSystem.cs	[new file with mode: 0644]	blob
Content.Server/Materials/MaterialStorageSystem.cs		diff \| blob \| history
Content.Server/Physics/Controllers/ConveyorController.cs		diff \| blob \| history
Content.Server/Recycling/Components/RecyclableComponent.cs	[deleted file]	blob \| history
Content.Server/Recycling/Components/RecyclerComponent.cs	[deleted file]	blob \| history
Content.Server/Recycling/RecyclerSystem.cs	[deleted file]	blob \| history
Content.Shared/Lathe/LatheComponent.cs		diff \| blob \| history
Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Materials/CollideMaterialReclaimerComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Materials/MaterialReclaimerComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Materials/MaterialStorageComponent.cs		diff \| blob \| history
Content.Shared/Materials/PhysicalCompositionComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Materials/SharedMaterialReclaimerSystem.cs	[new file with mode: 0644]	blob
Content.Shared/Materials/SharedMaterialStorageSystem.cs		diff \| blob \| history
Content.Shared/Recycling/SharedRecyclerComponent.cs	[deleted file]	blob \| history
Resources/Audio/Ambience/Objects/attributions.yml		diff \| blob \| history
Resources/Audio/Ambience/Objects/crushing.ogg	[new file with mode: 0644]	blob
Resources/Locale/en-US/materials/materials.ftl		diff \| blob \| history
Resources/Prototypes/Body/Parts/silicon.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Research/technologies.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/misc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/welding.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Masks/masks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/silicon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Species/base.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Decoration/present.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Fun/crayons.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Fun/toys.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/shards.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/box.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/paper.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/utensils.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Power/lights.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Shields/shields.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/atmos.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/bucket.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/flare.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/glowstick.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/matches.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/tools.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/welders.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Machines/lathe.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Entities/Structures/Machines/recycler.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Windows/window.yml		diff \| blob \| history
Resources/Prototypes/Reagents/Materials/materials.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Lathes/electronics.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Lathes/janitorial.yml		diff \| blob \| history
Resources/Prototypes/tags.yml		diff \| blob \| history
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-1.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-2.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-3.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-4.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-5.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/fill-6.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/gear-active.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/gear-idle.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/panel.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Machines/material_reclaimer.rsi/unlit.png	[new file with mode: 0644]	blob

Форк Space Station 14 с переводами на русский

RSS Atom