diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml index 3c14993e84..591b11bf3b 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/door_remote.yml @@ -14,3 +14,20 @@ - type: Access groups: - AllAccess + +- type: entity + parent: DoorRemoteDefault + id: DoorRemoteCC + name: Пульт ЦК + suffix: Cenctom + components: + - type: Sprite + layers: + - state: door_remotebase + - state: door_remotelightscolour + color: "#2eba22" + - state: door_remotescreencolour + color: "#22871a" + - type: Access + groups: + - CentCom diff --git a/Resources/Prototypes/_LostParadise/Research/arsenal.yml b/Resources/Prototypes/_LostParadise/Research/arsenal.yml new file mode 100644 index 0000000000..d9da52b1d9 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Research/arsenal.yml @@ -0,0 +1,18 @@ +- type: technology + id: LPPRoboticsSecurity + name: research-technology-robotics-security + icon: + sprite: Objects/Misc/handcuffs.rsi + state: handcuff + discipline: Arsenal + tier: 1 + cost: 7000 + recipeUnlocks: + - LPPBorgModuleAresst + - LPPBattleBorgModule + - LPPLeftArmBorgSecurity + - LPPRightArmBorgSecurity + - LPPLeftLegBorgSecurity + - LPPRightLegBorgSecurity + - LPPHeadBorgSecurity + - LPPTorsoBorgSecurity diff --git a/Resources/Prototypes/_LostParadise/Research/civilianservices.yml b/Resources/Prototypes/_LostParadise/Research/civilianservices.yml new file mode 100644 index 0000000000..fdc43dfcdd --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Research/civilianservices.yml @@ -0,0 +1,19 @@ +# Tier 1 + +- type: technology + id: LPPRoboticsCivilanServices + name: research-technology-robotics-erotic + icon: + sprite: _LostParadise/Objects/Fun/ERP/whips.rsi + state: icon + discipline: CivilianServices + tier: 2 + cost: 15000 + recipeUnlocks: + - LPPLeftArmBorgErotic + - LPPRightArmBorgErotic + - LPPLeftLegBorgErotic + - LPPRightLegBorgErotic + - LPPHeadBorgErotic + - LPPTorsoBorgErotic + - LPPERPModuleBorg \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Research/experimental.yml b/Resources/Prototypes/_LostParadise/Research/experimental.yml index 4870cec1a9..0cdb633002 100644 --- a/Resources/Prototypes/_LostParadise/Research/experimental.yml +++ b/Resources/Prototypes/_LostParadise/Research/experimental.yml @@ -9,6 +9,12 @@ tier: 2 cost: 12000 recipeUnlocks: + - LPPLeftArmBorgScience + - LPPRightArmBorgScience + - LPPLeftLegBorgScience + - LPPRightLegBorgScience + - LPPHeadBorgScience + - LPPTorsoBorgScience - BorgModuleArtifact - BorgModuleAnomaly diff --git a/Resources/Prototypes/_LostParadise/Research/industrial.yml b/Resources/Prototypes/_LostParadise/Research/industrial.yml index a3887f5ee4..918dcd9771 100644 --- a/Resources/Prototypes/_LostParadise/Research/industrial.yml +++ b/Resources/Prototypes/_LostParadise/Research/industrial.yml @@ -60,3 +60,22 @@ cost: 7500 recipeUnlocks: - WeaponCutterAdv + +# Tier 2 +- type: technology + id: LPPRoboticsIndustrial + name: research-technology-robotics-mining + icon: + sprite: Objects/Weapons/Melee/survival_knife.rsi + state: icon + discipline: Industrial + tier: 2 + cost: 15000 + recipeUnlocks: + - LPPLeftArmBorgMining + - LPPRightArmBorgMining + - LPPLeftLegBorgMining + - LPPRightLegBorgMining + - LPPHeadBorgMining + - LPPTorsoBorgMining + - BorgModuleMining diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json index f5efb29101..64a61c79db 100644 --- a/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json @@ -17,6 +17,10 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "combat-equipped-HELMET", + "directions": 4 + }, { "name": "on-equipped-HELMET", "directions": 4 diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json index 4cd271cc03..12cc0b8b6b 100644 --- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json @@ -28,6 +28,15 @@ { "name": "silver" }, + { + "name": "adamantine" + }, + { + "name": "copper" + }, + { + "name": "ammonia" + }, { "name": "titanium" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index cccac38fb0..e0abe206fd 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -22,6 +22,12 @@ { "name": "envelope_torn_overlay" }, + { + "name": "paper_stamp-notary" + }, + { + "name": "paper_stamp-void" + }, { "name": "folder-base" }, diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index 79fd4fcc06..70531bab45 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -26,6 +26,9 @@ { "name": "icon" }, + { + "name": "red-crowbar" + }, { "name": "red-icon" }, diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index ff330f3aaa..4512c062de 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "wrench" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json index 3a8eeb4b49..57e28bdd63 100644 --- a/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/extinguisher_cabinet.rsi/meta.json @@ -16,6 +16,21 @@ { "name": "frame" }, + { + "name": "extinguisher-mini" + }, + { + "name": "extinguisher_empty" + }, + { + "name": "extinguisher_mini" + }, + { + "name": "extinguisher_full" + }, + { + "name": "extinguisher_closed" + }, { "name": "open" } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 97be2aaa0d..2fe100ebd7 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -1458,6 +1458,24 @@ ] ] }, + { + "name": "direction_lawyer", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, { "name": "nine", "delays": [ diff --git a/Resources/Textures/Structures/cryostorage.rsi/meta.json b/Resources/Textures/Structures/cryostorage.rsi/meta.json index ed9f72a60e..7518083012 100644 --- a/Resources/Textures/Structures/cryostorage.rsi/meta.json +++ b/Resources/Textures/Structures/cryostorage.rsi/meta.json @@ -17,8 +17,8 @@ "delays": [ [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05] + [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], + [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05] ] } ] diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/astra.rsi/\320\220\321\201\321\202\321\200\320\260.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/astra.rsi/\320\220\321\201\321\202\321\200\320\260.txt" deleted file mode 100644 index 6b23189ba8..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/astra.rsi/\320\220\321\201\321\202\321\200\320\260.txt" +++ /dev/null @@ -1 +0,0 @@ -Сигареты, отличаются высоким содержанием смол. Популярны у космических пиратов, службы безопасности и рабочего люда по всему космосу. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/baltic-channel.rsi/\320\261\320\260\320\273\321\202\320\270\320\271\321\201\320\272\320\270\320\271 \320\272\320\260\320\275\320\260\320\273.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/baltic-channel.rsi/\320\261\320\260\320\273\321\202\320\270\320\271\321\201\320\272\320\270\320\271 \320\272\320\260\320\275\320\260\320\273.txt" deleted file mode 100644 index ac237e49cc..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/baltic-channel.rsi/\320\261\320\260\320\273\321\202\320\270\320\271\321\201\320\272\320\270\320\271 \320\272\320\260\320\275\320\260\320\273.txt" +++ /dev/null @@ -1 +0,0 @@ -По настоящему легендарные сигареты, прошедшие к вам через многое. Отнюдь не высшего сорта... Но табак в них 70% Натуральный! \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-lady-slim.rsi/\320\263\320\276\320\273\321\203\320\261\320\260\321\217 \320\273\320\265\320\264\320\270 \321\201\320\273\320\270\320\274.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-lady-slim.rsi/\320\263\320\276\320\273\321\203\320\261\320\260\321\217 \320\273\320\265\320\264\320\270 \321\201\320\273\320\270\320\274.txt" deleted file mode 100644 index 81ca6b146f..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-lady-slim.rsi/\320\263\320\276\320\273\321\203\320\261\320\260\321\217 \320\273\320\265\320\264\320\270 \321\201\320\273\320\270\320\274.txt" +++ /dev/null @@ -1,2 +0,0 @@ -на обороте пачки написано «You've come a long way, baby» -пахнет идеями эмансипации и женской самореализацией. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-sky.rsi/\320\263\320\276\320\273\321\203\320\261\320\276\320\265 \320\275\320\265\320\261\320\276.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-sky.rsi/\320\263\320\276\320\273\321\203\320\261\320\276\320\265 \320\275\320\265\320\261\320\276.txt" deleted file mode 100644 index 2555651356..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/blue-sky.rsi/\320\263\320\276\320\273\321\203\320\261\320\276\320\265 \320\275\320\265\320\261\320\276.txt" +++ /dev/null @@ -1,2 +0,0 @@ -сигареты на основе отборного табака. Продукция радует курильщиков ярким вкусом и насыщенной ароматикой. -Дым сигареты не обладает едким и резким запахом, а имеет неповторимый классический, мягкий вкус с легким табачно-сладковатым ароматом, оставляет принятое послевкусие с небольшой долей горчинки. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/cosmos.rsi/\320\272\320\276\321\201\320\274\320\276\321\201.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/cosmos.rsi/\320\272\320\276\321\201\320\274\320\276\321\201.txt" deleted file mode 100644 index 7bfdaf5cb1..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/cosmos.rsi/\320\272\320\276\321\201\320\274\320\276\321\201.txt" +++ /dev/null @@ -1 +0,0 @@ -классический вкус и запах сигарет «Космос» — это преобладание табака сорта Вирджиния с наличием легкой кислинки. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" deleted file mode 100644 index b18a698ce7..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/critical-luck.rsi/\320\272\321\200\320\270\321\202\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \321\203\320\264\320\260\321\207\320\260.txt" +++ /dev/null @@ -1,2 +0,0 @@ -В свое время, очень популярные у солдат сигареты. -Прожарка боевым пламенем придает табаку улучшенный вкус и понижает кислотность, облегчает воздействие сигарет на горло... diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar-crush.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200 \320\272\321\200\320\260\321\210.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar-crush.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200 \320\272\321\200\320\260\321\210.txt" deleted file mode 100644 index 77dcd21cda..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar-crush.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200 \320\272\321\200\320\260\321\210.txt" +++ /dev/null @@ -1 +0,0 @@ -Легкие сигареты с фильтром, в котором расположена капсула с ментолом, стандартного размера. Придает нотку свежести вашему перегару. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200.txt" deleted file mode 100644 index 836e914993..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/dromedar.rsi/\320\264\321\200\320\276\320\274\320\265\320\264\320\260\321\200.txt" +++ /dev/null @@ -1,2 +0,0 @@ -Сигареты с незамысловатым названием марки — «дромедар» -Эта марка сигарет выпускается с 2113 года. Рецептура представляет смесь входивших тогда в моду тёмных и терпких табаков и светлых, мягких. "Пангалактическая смесь" \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\224\320\266\320\265\320\275\321\202\320\273\321\214\320\274\320\265\320\275 \321\203\320\264\320\260\321\207\320\270.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\224\320\266\320\265\320\275\321\202\320\273\321\214\320\274\320\265\320\275 \321\203\320\264\320\260\321\207\320\270.txt" deleted file mode 100644 index 2336cf1526..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\224\320\266\320\265\320\275\321\202\320\273\321\214\320\274\320\265\320\275 \321\203\320\264\320\260\321\207\320\270.txt" +++ /dev/null @@ -1 +0,0 @@ -Произведены из отборных табачных листьев, обладают ярким вкусом спелой вишни. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\277\321\200\320\270\320\274\320\265\321\207\320\260\320\275\320\270\320\265.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\277\321\200\320\270\320\274\320\265\321\207\320\260\320\275\320\270\320\265.txt" deleted file mode 100644 index 6ea563b958..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/gentleman-of-luck.rsi/\320\277\321\200\320\270\320\274\320\265\321\207\320\260\320\275\320\270\320\265.txt" +++ /dev/null @@ -1 +0,0 @@ -в этой пачке должны быть сигариллы. Это аналог реального корсара с вишней. diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/landtag.rsi/\320\273\320\260\320\275\320\264\321\202\320\260\320\263.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/landtag.rsi/\320\273\320\260\320\275\320\264\321\202\320\260\320\263.txt" deleted file mode 100644 index 7a7fe185c1..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/landtag.rsi/\320\273\320\260\320\275\320\264\321\202\320\260\320\263.txt" +++ /dev/null @@ -1 +0,0 @@ -сигареты, с фильтром-мундштуком, обеспечивающим охлаждение дыма. Бренд премиум класса. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/liberty-spirit.rsi/\320\224\321\203\321\205 \321\201\320\262\320\276\320\261\320\276\320\264\321\213.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/liberty-spirit.rsi/\320\224\321\203\321\205 \321\201\320\262\320\276\320\261\320\276\320\264\321\213.txt" deleted file mode 100644 index 28c52a19d1..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/liberty-spirit.rsi/\320\224\321\203\321\205 \321\201\320\262\320\276\320\261\320\276\320\264\321\213.txt" +++ /dev/null @@ -1 +0,0 @@ -Сигареты со вкусом демократии и тонкой ноткой нефти. diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/marbrolo.rsi/\320\274\320\260\321\200\320\261\321\200\320\276\320\273\320\276.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/marbrolo.rsi/\320\274\320\260\321\200\320\261\321\200\320\276\320\273\320\276.txt" deleted file mode 100644 index 4a385bd332..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/marbrolo.rsi/\320\274\320\260\321\200\320\261\321\200\320\276\320\273\320\276.txt" +++ /dev/null @@ -1 +0,0 @@ -сигареты классического формата. Раскрывают традиционный вкус, где доминируют терпкие, слегка горьковатые акценты. Имеют внушительный уровень крепости. Укомплектованы надежным ацетатным фильтром, который сохраняет форму под влиянием влаги и повышенных температур. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/maximus.rsi/\320\274\320\260\320\272\321\201\320\270\320\274\321\203\321\201.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/maximus.rsi/\320\274\320\260\320\272\321\201\320\270\320\274\321\203\321\201.txt" deleted file mode 100644 index a601f0ada4..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/maximus.rsi/\320\274\320\260\320\272\321\201\320\270\320\274\321\203\321\201.txt" +++ /dev/null @@ -1 +0,0 @@ -Относительно недорогие, не самые противные сигареты. \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/closed.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/closed.png deleted file mode 100644 index f69f37e44d..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/equipped-BELT.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/equipped-BELT.png deleted file mode 100644 index d49b6f112c..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-left.png deleted file mode 100644 index fa238f8de7..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-right.png deleted file mode 100644 index 263f797355..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/meta.json deleted file mode 100644 index f38bc647c5..0000000000 --- a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/meta.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Draw by Artemionizer", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "closed" - }, - { - "name": "open" - }, - { - "name": "trash" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/open.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/open.png deleted file mode 100644 index f19d73b65e..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/trash.png b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/trash.png deleted file mode 100644 index 5adff19d24..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/syndicate.rsi/trash.png and /dev/null differ diff --git "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/winchester.rsi/\320\262\320\270\320\275\321\207\320\265\321\201\321\202\320\265\321\200.txt" "b/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/winchester.rsi/\320\262\320\270\320\275\321\207\320\265\321\201\321\202\320\265\321\200.txt" deleted file mode 100644 index 5c4fed7d99..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Consumable/Smokeables/Cigarettes/winchester.rsi/\320\262\320\270\320\275\321\207\320\265\321\201\321\202\320\265\321\200.txt" +++ /dev/null @@ -1 +0,0 @@ -сигареты именитой марки. В течение столетий изделия бренда сохраняют статус наиболее популярных среди курильщиков. Потребители выбирают продукцию компании, ориентируясь на оптимальное соотношение цена-качество. \ No newline at end of file diff --git "a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-Energ.rsi/\321\215\320\275\320\265\321\200\320\263\320\265\321\202\320\270\320\272 \320\244\321\200\321\203\320\277\320\277\320\270.txt" "b/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-Energ.rsi/\321\215\320\275\320\265\321\200\320\263\320\265\321\202\320\270\320\272 \320\244\321\200\321\203\320\277\320\277\320\270.txt" deleted file mode 100644 index 0124018a0b..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-Energ.rsi/\321\215\320\275\320\265\321\200\320\263\320\265\321\202\320\270\320\272 \320\244\321\200\321\203\320\277\320\277\320\270.txt" +++ /dev/null @@ -1,9 +0,0 @@ -НАЗВАНИЕ - Фруппи ENERGY !!! - -ОПИСАНИЕ - Кто-то думал что pwr game единственный геймерский напиток ?! Этот сквонч обладает РЕАЛЬНОЙ СИЛОЙ, которую жаждут все геймеры ! Запрещен во всех секторах космоса, побазируйся вместе с ним на свой страх и риск. - -ОПИСАНИЕ ВКУСА - Серб. На вкус как РЕАКЦИЯ СЖИГАНИЯ ВОДОРОТА !!! - -Свойство : В этом напитке 15 единиц экспериментальных стимуляторов, 10 единиц энергетика, 5 единиц омнизина. - -НЕ ДОБАВЛЯТЬ В ВЕНДИНГ !!! diff --git "a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-apple.rsi/\320\244\321\200\321\203\320\277\320\277\320\270 \320\257\320\261\320\273\320\276\321\207\320\275\321\213\320\271.txt" "b/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-apple.rsi/\320\244\321\200\321\203\320\277\320\277\320\270 \320\257\320\261\320\273\320\276\321\207\320\275\321\213\320\271.txt" deleted file mode 100644 index 1697eac8b5..0000000000 --- "a/Resources/Textures/_LostParadise/Objects/Misc/Fluffy/Floppy-apple.rsi/\320\244\321\200\321\203\320\277\320\277\320\270 \320\257\320\261\320\273\320\276\321\207\320\275\321\213\320\271.txt" +++ /dev/null @@ -1,7 +0,0 @@ -НАЗВАНИЕ - Фруппи яблочный ! - -ОПИСАНИЕ - Яблочный микс самых базированных яблок галактики,вызывает привыкание, обсквончишься от вкуса ! - -ОПИСАНИЕ ВКУСА - Серб. На вкус как газированное молочное яблоко,ням-ням ! - -СВОЙСТВО - 5 единиц космических наркотиков. \ No newline at end of file