From 376efb156a344394cf11e76bbac018f8cafa511c Mon Sep 17 00:00:00 2001 From: Sh1ntra Date: Wed, 2 Oct 2024 17:50:49 +0300 Subject: [PATCH] Upstream september part 2 --- .../storagefilltemplates/departmental_eva.ftl | 4 +- .../structures/machines/vending_machines.ftl | 4 +- .../Corvax/Entities/Mobs/Species/elzuosa.yml | 6 - .../Prototypes/Corvax/Shipyard/Asklepi.yml | 2 +- .../Prototypes/Corvax/Shipyard/Asstedia.yml | 2 +- Resources/Prototypes/Corvax/Shipyard/Fang.yml | 2 +- .../Prototypes/Corvax/Shipyard/Kudzu.yml | 2 +- .../Corvax/Shipyard/Nfsd/hammer.yml | 2 +- .../Corvax/Shipyard/Nfsd/warrior.yml | 2 +- Resources/Prototypes/Corvax/Shipyard/Pot.yml | 2 +- .../Prototypes/Corvax/Shipyard/hercules.yml | 2 +- .../Prototypes/Corvax/Shipyard/kontrashef.yml | 2 +- Resources/Prototypes/Corvax/Shipyard/pill.yml | 2 +- .../Corvax/Shipyard/theScavenger.yml | 2 +- .../Entities/Mobs/Species/arachnid.yml | 2 - .../Fills/Items/weapon_cases_expedition.yml | 15 +- .../Weapons/Guns/Revolvers/revolvers.yml | 6 - .../Objects/Weapons/Guns/expedition_guns.yml | 197 ------------------ .../Machines/Computers/computers.yml | 26 +-- .../Prototypes/_NF/Shipyard/Scrap/bison.yml | 3 +- .../Color/yellow.rsi/equipped-HAND-resomi.png | Bin 450 -> 0 bytes .../Hands/Gloves/Color/yellow.rsi/meta.json | 8 - .../Head/Helmets/syndie-raid.rsi/meta.json | 8 - .../Clothing/Mask/goldenmask.rsi/meta.json | 8 - .../Structures/Wallmounts/signs.rsi/meta.json | 32 +-- .../Guns/Crossbow/crossbow.rsi/meta.json | 4 - 26 files changed, 28 insertions(+), 317 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml delete mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-resomi.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/storagefilltemplates/departmental_eva.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/storagefilltemplates/departmental_eva.ftl index fd43a241399..4ca932ea41c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/storagefilltemplates/departmental_eva.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/catalog/fills/storagefilltemplates/departmental_eva.ftl @@ -6,6 +6,8 @@ ent-StorageFillEVASuitSr = хранилище скафандра предста .desc = Содержит полный набор для выхода в открытый космос. ent-StorageFillEVASuitCaptain = хранилище скафандра капитана .desc = Содержит полный набор для выхода в открытый космос. +ent-StorageFillEVASuitEngineer = хранилище скафандра инженера + .desc = Содержит полный набор для выхода в открытый космос. ent-StorageFillEVASuitAtmosTech = хранилище скафандра атмосферного техника .desc = Содержит полный набор для выхода в открытый космос. ent-StorageFillEVASuitCargo = хранилище скафандра грузчика @@ -45,4 +47,4 @@ ent-StorageFillEVASuitPrivateSec = хранилище скафандра тел ent-StorageFillEVASuitNfsd = хранилище скафандра ДСБФ .desc = Содержит полный набор для выхода в открытый космос. ent-StorageFillEVASuitGoblin = хранилище скафандра гоблинов - .desc = Содержит традиционный набор гоблинов для выхода в открытый космос. \ No newline at end of file + .desc = Содержит традиционный набор гоблинов для выхода в открытый космос. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl index 4f6c4cbaaf3..6edfea45fbd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nf/entities/structures/machines/vending_machines.ftl @@ -6,6 +6,8 @@ ent-VendingMachineFlatpackVend = Упак-О-Мат .desc = Крутые технологии в компактной упаковке! Получите все, что нужно для ваших космических путешествий, с этим универсальным автоматом. ent-VendingMachineExpeditionaryFlatpackVend = Экспедиционный Упак-О-Мат .desc = Современные технологии для самых смелых экспедиций! Исследуйте неизведанные планеты с лучшим снаряжением для первооткрывателей. +ent-LessLethalVendingMachine = Травма-То-Венд + .desc = Обеспечиваем ограничение насилия с 08-года! ent-VendingMachineSyndieContraband = КонтраВенд .desc = Окунитесь в мир запретных товаров! Только для тех, кто не боится нарушить правила ради эксклюзивных шаттлов и уникальных артефактов. Осторожно: находитесь под наблюдением! ent-VendingMachineBountyVend = КонтрактВенд @@ -56,4 +58,4 @@ ent-VendingMachineYouToolPOI = { ent-VendingMachineYouTool } ent-VendingMachineSalvagePOI = { ent-VendingMachineSalvage } .desc = { ent-VendingMachineSalvage.desc } ent-VendingMachineTankDispenserEVAPOI = { ent-VendingMachineTankDispenserEVA } - .desc = { ent-VendingMachineTankDispenserEVA.desc } \ No newline at end of file + .desc = { ent-VendingMachineTankDispenserEVA.desc } diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml index 7ad0732d120..b5c84d55abb 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/elzuosa.yml @@ -49,12 +49,6 @@ interactSuccessSound: /Audio/Effects/sparks1.ogg messagePerceivedByOthers: pat-success-elzuosa-others - type: Carriable # Carrying system from nyanotrasen. - - type: SizeAttributeWhitelist # Frontier - short: true - shortscale: 0.8 - shortDensity: 140 - shortPseudoItem: true - shortCosmeticOnly: false - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Corvax/Shipyard/Asklepi.yml b/Resources/Prototypes/Corvax/Shipyard/Asklepi.yml index 71e651425da..8e0907d14e2 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Asklepi.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Asklepi.yml @@ -4,7 +4,7 @@ description: Среднегабаритный медицинский шаттл. Рекомендованный состав команды 2-5 человек. price: 52000 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/Asklepi.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/Asstedia.yml b/Resources/Prototypes/Corvax/Shipyard/Asstedia.yml index 28adedd94fe..9f3ae746f00 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Asstedia.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Asstedia.yml @@ -4,7 +4,7 @@ description: Малогабаритный шахтерский шаттл. Рекомендованный состав команды 1-3 человек. price: 30000 category: Small - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/Asstedia.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/Fang.yml b/Resources/Prototypes/Corvax/Shipyard/Fang.yml index e9cbdf47a45..0e6c3ae2f09 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Fang.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Fang.yml @@ -5,7 +5,7 @@ description: Среднегабаритный шахтерский шаттл. Рекомендованный состав команды 1-5 человек. price: 34450 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/Fang.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/Kudzu.yml b/Resources/Prototypes/Corvax/Shipyard/Kudzu.yml index 069d43d7d84..58172fc44c6 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Kudzu.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Kudzu.yml @@ -5,7 +5,7 @@ description: Среднегабаритный грузовой шаттл. Рекомендованный состав команды 1-4 человек. price: 80000 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/Kudzu.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/Nfsd/hammer.yml b/Resources/Prototypes/Corvax/Shipyard/Nfsd/hammer.yml index 5c48f4f17bb..db9dce2288d 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Nfsd/hammer.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Nfsd/hammer.yml @@ -4,8 +4,8 @@ name: NSF Молот description: Малогабаритный штурмовой шаттл ДСБФ без системы опознавания. price: 45499 + group: Security category: Small - group: None access: Security mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes shuttlePath: /Maps/Corvax/Shuttles/Nfsd/hammer.yml diff --git a/Resources/Prototypes/Corvax/Shipyard/Nfsd/warrior.yml b/Resources/Prototypes/Corvax/Shipyard/Nfsd/warrior.yml index 71382fbb3d6..b8bc9a069ae 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Nfsd/warrior.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Nfsd/warrior.yml @@ -3,8 +3,8 @@ name: NSF Вариор description: Шаттл перехватчик Вариор. Произведено частной военно-производственной компаний Vitezstvi по спец. заказу НТ. Рекомендуемый состав команды 1-2 человека. price: 32500 + group: Security category: Small - group: None access: Security mapchecker_group_override: Security shuttlePath: /Maps/Corvax/Shuttles/Nfsd/warrior.yml diff --git a/Resources/Prototypes/Corvax/Shipyard/Pot.yml b/Resources/Prototypes/Corvax/Shipyard/Pot.yml index 501ef587a1d..6258fd9a492 100644 --- a/Resources/Prototypes/Corvax/Shipyard/Pot.yml +++ b/Resources/Prototypes/Corvax/Shipyard/Pot.yml @@ -4,7 +4,7 @@ description: Среднегабаритный шахтерский шаттл. Рекомендованный состав команды 1-6 человек. price: 60000 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/Pot.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/hercules.yml b/Resources/Prototypes/Corvax/Shipyard/hercules.yml index ea3098ebeca..bb252983b7c 100644 --- a/Resources/Prototypes/Corvax/Shipyard/hercules.yml +++ b/Resources/Prototypes/Corvax/Shipyard/hercules.yml @@ -4,7 +4,7 @@ description: Среднегабаритный грузовой шаттл. Рабочая лошадка "Космологистики", используется для перевозки большого объема грузов на дальние расстояния. Рекомендованный состав команды 2-5 человека. price: 39900 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/hercules.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/kontrashef.yml b/Resources/Prototypes/Corvax/Shipyard/kontrashef.yml index 8566361432a..29b718dc98f 100644 --- a/Resources/Prototypes/Corvax/Shipyard/kontrashef.yml +++ b/Resources/Prototypes/Corvax/Shipyard/kontrashef.yml @@ -5,7 +5,7 @@ description: Среднегабаритный шаттл-ресторан. Рекомендованный размер команды 2-4 человека. price: 54500 # 13.5% markup (+2350 from init) category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/kontrashef.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/pill.yml b/Resources/Prototypes/Corvax/Shipyard/pill.yml index ad1a8f89da4..127a03a2f61 100644 --- a/Resources/Prototypes/Corvax/Shipyard/pill.yml +++ b/Resources/Prototypes/Corvax/Shipyard/pill.yml @@ -4,7 +4,7 @@ description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-2 человек. price: 17500 #меньше не поставлю, ибо нефиг category: Small - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/pill.yml - type: gameMap diff --git a/Resources/Prototypes/Corvax/Shipyard/theScavenger.yml b/Resources/Prototypes/Corvax/Shipyard/theScavenger.yml index 79c9e7937f7..f3820d76be4 100644 --- a/Resources/Prototypes/Corvax/Shipyard/theScavenger.yml +++ b/Resources/Prototypes/Corvax/Shipyard/theScavenger.yml @@ -4,7 +4,7 @@ description: Среднегабаритный шахтерский шаттл. Рекомендованный состав команды 1-5 человек. price: 36450 category: Medium - group: Civilian + group: Shipyard shuttlePath: /Maps/Corvax/Shuttles/theScavenger.yml - type: gameMap diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index b62ef39420d..0087548d65f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -119,8 +119,6 @@ sprite: "Effects/creampie.rsi" state: "creampie_arachnid" visible: false - - type: Inventory - templateId: arachnid - type: Carriable # Frontier: Carrying system from nyanotrasen. diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml index 4f1300bfe19..6d157ff5ab6 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml @@ -68,19 +68,6 @@ - id: SpeedLoaderRifleHeavy amount: 2 -- type: entity - parent: WeaponCaseShort - id: WeaponCaseShortDeckardExpedition - suffix: Dungeon, Deckard - categories: [ HideSpawnMenu ] - components: - - type: StorageFill - contents: - - id: WeaponRevolverDeckardExpedition - amount: 1 - - id: SpeedLoaderMagnum - amount: 2 - - type: entity parent: WeaponCaseShort id: WeaponCaseShortPython @@ -365,7 +352,7 @@ - id: WeaponSVT amount: 1 - id: 10roundmagazine - amount: 2 + amount: 2 # Energy - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 686acb04317..ce0ff8cb928 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -46,12 +46,6 @@ chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] -- type: entity - parent: WeaponRevolverDeckardExpedition - id: WeaponRevolverDeckardExpeditionGrifty - categories: [ HideSpawnMenu ] - name: Customer Service Resolver - - type: entity parent: [ WeaponRevolverPython, BaseC3ContrabandUnredeemable] id: WeaponRevolverPythonGrown diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml deleted file mode 100644 index 96a67ae8ade..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml +++ /dev/null @@ -1,197 +0,0 @@ -# The list contains only the guns that were previously obtainable as expedition reward -# or as a loose guns on the expedition - -# Pistols -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponPistolMk58 - categories: [ HideSpawnMenu ] - id: WeaponPistolMk58Expedition - -# Revolvers -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponRevolverArgenti - categories: [ HideSpawnMenu ] - id: WeaponRevolverArgentiExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponRevolverDeckard - categories: [ HideSpawnMenu ] - id: WeaponRevolverDeckardExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponRevolverMateba - categories: [ HideSpawnMenu ] - id: WeaponRevolverMatebaExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponRevolverPirate - categories: [ HideSpawnMenu ] - id: WeaponRevolverPirateExpedition - -# Shotguns -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponShotgunDoubleBarreled - categories: [ HideSpawnMenu ] - id: WeaponShotgunDoubleBarreledExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponShotgunSawn - categories: [ HideSpawnMenu ] - id: WeaponShotgunSawnExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponShotgunHandmade - categories: [ HideSpawnMenu ] - id: WeaponShotgunHandmadeExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponShotgunKammerer - categories: [ HideSpawnMenu ] - id: WeaponShotgunKammererExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponShotgunEnforcer - categories: [ HideSpawnMenu ] - id: WeaponShotgunEnforcerExpedition - -# Rifles -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponRifleGestio - categories: [ HideSpawnMenu ] - id: WeaponRifleGestioExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponRifleNovaliteC1 - categories: [ HideSpawnMenu ] - id: WeaponRifleNovaliteC1Expedition - -# SMGs -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponSubMachineGunWt550 - categories: [ HideSpawnMenu ] - id: WeaponSubMachineGunWt550Expedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponSubMachineGunAtreides - categories: [ HideSpawnMenu ] - id: WeaponSubMachineGunAtreidesExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponSubMachineGunDrozd - categories: [ HideSpawnMenu ] - id: WeaponSubMachineGunDrozdExpedition - -# Energy -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponLaserPistolNF - categories: [ HideSpawnMenu ] - id: WeaponLaserGunExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponLaserSvalinn - categories: [ HideSpawnMenu ] - id: WeaponLaserSvalinnExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponEnergyGun - categories: [ HideSpawnMenu ] - id: WeaponEnergyGunExpedition - -- type: entity - name: laser carbine - parent: - - BaseC2ExpeditionContraband - - WeaponLaserCarbine - categories: [ HideSpawnMenu ] - id: WeaponLaserCarbineExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponAdvancedLaser - categories: [ HideSpawnMenu ] - id: WeaponAdvancedLaserExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponLaserCannon - categories: [ HideSpawnMenu ] - id: WeaponLaserCannonExpedition - -- type: entity - parent: - - BaseC3ExpeditionContraband - - WeaponXrayCannon - categories: [ HideSpawnMenu ] - id: WeaponXrayCannonExpedition - -# Sniper -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponSniperMosin - categories: [ HideSpawnMenu ] - id: WeaponSniperMosinExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - WeaponSniperRepeater - categories: [ HideSpawnMenu ] - id: WeaponSniperRepeaterExpedition - -- type: entity - parent: - - BaseC2ExpeditionContraband - - Musket - categories: [ HideSpawnMenu ] - id: WeaponMusketExpedition - -#Corvax-Frontier start -- type: entity - parent: [ WeaponSubMachineGunVector45, UnregisteredFirearmBase ] - noSpawn: true - id: WeaponSubMachineGunVector45Expedition - -- type: entity #Corvax-Frontier - parent: [ WeaponSubMachineGunVector22, UnregisteredFirearmBase ] - noSpawn: true - id: WeaponSubMachineGunVector22Expedition -#Corvax-Frontier end diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml index 01a3a01a92d..92afc59a2c5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml @@ -1,25 +1,3 @@ -- type: entity - parent: ComputerRadar - id: ComputerAdvancedRadar # Frontier - name: radar computer - description: This advanced radar lets you detect far away objects for an increased tactical advantage. - components: - - type: Computer - board: AdvancedRadarConsoleCircuitboard - - type: RadarConsole - maxRange: 768 - maxIffRange: null # Frontier - - type: Sprite - layers: - - map: ["computerLayerBody"] - state: computer - - map: ["computerLayerKeyboard"] - state: generic_keyboard - - map: ["computerLayerScreen"] - state: eris_control - - map: ["computerLayerKeys"] - state: generic_keys - - type: entity name: cargo sale computer suffix: Normal @@ -231,7 +209,7 @@ type: WiresBoundUserInterface - type: MarketModifier mod: 1 - + - type: entity name: cargo market computer parent: ComputerMarketConsoleNFBase @@ -430,4 +408,4 @@ description: Monitors the traffic around the Trade Outpost. components: - type: NFDroneConsole - id: Trade \ No newline at end of file + id: Trade diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index a8de3743de9..745b8408d0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -10,14 +10,13 @@ class: - Scrapyard - Salvage - - Civilian - type: gameMap id: Bison mapName: 'NT Бизон' mapPath: /Maps/_NF/Shuttles/Scrap/bison.yml minPlayers: 0 - stations: + stations: Bison: stationProto: StandardFrontierVessel components: diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-resomi.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-resomi.png deleted file mode 100644 index 5243b4b2fec5a0bb3a0bcd7e476f261f08ad8486..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R4; zr;B4q#hkaZ6#ZBn1zi8Daoot+!6@Z-h}A&FgM&+@NL0vDW0P3tp~i=N3I`H)FwW$8 zJnN^5tb(HV*g7GeyAIt-5@7>;aY=tyRS zNK9cfD_-(A*k@7l|J`*H8Psg77_XV7y?n4Cc2-59q4)3Iy6uTVS=aR6HMBnu-LrSg z{$qx18y)&RvabHWEE$kA#qhhe#|nquU#?6uwm8oB`X-kAZe5kjJVw*k;^hvRhh7|B zUsk)HO%aa^ke%j`vZFVdQ I&MBb@0F#Zg6aWAK diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json index bd2c98af3b6..e7e17718c26 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HAND", "directions": 4 }, - { - "name": "equipped-HAND-resomi", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -25,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HAND-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json index 29573526bd9..2faf18830d9 100644 --- a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json @@ -10,14 +10,6 @@ { "name": "icon" }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, { "name": "equipped-HELMET", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json b/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json index c55646ad2a2..62072e7107e 100644 --- a/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json @@ -34,14 +34,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 23844e70d3f..1f2b1ada7f3 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -22,9 +22,6 @@ { "name": "anomaly" }, - { - "name": "anomaly2" - }, { "name": "arcade" }, @@ -37,9 +34,6 @@ { "name": "ass" }, - { - "name": "atmominsky" - }, { "name": "atmos" }, @@ -272,15 +266,15 @@ { "name": "hydro" }, - { - "name": "hydro" - }, { "name": "hydro1" }, { "name": "hydro2" }, + { + "name": "hydro3" + }, { "name": "interrogation" }, @@ -308,9 +302,6 @@ { "name": "memetic" }, - { - "name": "miner_dock" - }, { "name": "monkey_painting" }, @@ -332,9 +323,6 @@ { "name": "drama3" }, - { - "name": "drones" - }, { "name": "restroom" }, @@ -401,12 +389,6 @@ { "name": "shock" }, - { - "name": "something-old1" - }, - { - "name": "something-old2" - }, { "name": "space" }, @@ -416,9 +398,6 @@ { "name": "toxins" }, - { - "name": "toxins2" - }, { "name": "virology" }, @@ -543,7 +522,10 @@ "name": "ntmining" }, { - "name": "shield" + "name": "something-old1" + }, + { + "name": "something-old2" } ] } diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json index 03d32db19e5..9a813d2f6b0 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Crossbow/crossbow.rsi/meta.json @@ -28,10 +28,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - }, { "name": "inhand-left", "directions": 4