From b15cc62b4fdfb8198e2a89ce33c357a657b5a1d0 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sat, 28 Dec 2024 23:44:29 +0000 Subject: [PATCH 1/3] add Explosives to Uplink --- .../catalog/fills/boxes/nanotrasen.ftl | 16 ++ .../entities/objects/misc/implanters.ftl | 3 + .../objects/misc/subdermal_implants.ftl | 2 + .../_strings/_sunrise/store/categories.ftl | 1 + .../_sunrise/store/ntuplink-catalog.ftl | 1 + .../catalog/fills/boxes/nanotrasen.ftl | 16 ++ .../entities/objects/misc/implanters.ftl | 3 + .../objects/misc/subdermal_implants.ftl | 2 + .../_strings/_sunrise/store/categories.ftl | 1 + .../_sunrise/store/ntuplink-catalog.ftl | 1 + .../Objects/Misc/subdermal_implants.yml | 43 ++++ Resources/Prototypes/Store/presets.yml | 1 + .../Catalog/Fills/Boxes/nanotrasen.yml | 123 +++++++++ .../_Sunrise/Catalog/ert_uplink_catalog.yml | 237 ++++++++++++------ .../Entities/Objects/Misc/implanters.yml | 9 + .../Prototypes/_Sunrise/Store/categories.yml | 5 + .../Objects/Storage/boxes.rsi/incendiary.png | Bin 0 -> 177 bytes .../Objects/Storage/boxes.rsi/meta.json | 9 + .../Objects/Storage/boxes.rsi/shrapnel.png | Bin 0 -> 172 bytes .../Objects/Storage/boxes.rsi/stinger.png | Bin 0 -> 175 bytes .../Misc/nt_icons.rsi/box_ertrattle.png | Bin 0 -> 1252 bytes .../Misc/nt_icons.rsi/box_incendiary.png | Bin 0 -> 1282 bytes .../Misc/nt_icons.rsi/box_shrapnel.png | Bin 0 -> 1278 bytes .../Misc/nt_icons.rsi/box_stinger.png | Bin 0 -> 1279 bytes .../Interface/Misc/nt_icons.rsi/meta.json | 12 + 25 files changed, 410 insertions(+), 75 deletions(-) create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shrapnel.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/stinger.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_incendiary.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png create mode 100644 Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl new file mode 100644 index 00000000000..959a9b95483 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -0,0 +1,16 @@ +ent-BoxErtImplants = ERT death tracking implant box + .desc = Six death tracking implants for the whole ERT squad. +ent-BoxGrenadeIncendiary = GrenadeIncendiary box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxGrenadeShrapnel = GrenadeShrapnel Box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxGrenadeStinger = GrenadeStinger Box + .desc = 'WARNING: These devices are extremely dangerous.' +ent-BoxMetalFoamGrenade = MetalFoamGrenade Box + .desc = 'WARNING: These devices are dangerous.' +ent-BoxSmokeGrenade = SmokeGrenade Box + .desc = 'WARNING: These devices are dangerous.' +ent-BoxTearGasGrenade = TearGasGrenade box + .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' +ent-BoxClusterBangFull = ClusterBang box + .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl index 8fc26fa3bc5..dd868f2215a 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/implanters.ftl @@ -21,6 +21,9 @@ ent-BikeHornImplanter = { ent-BaseImplantOnlyImplanter } ent-TrackingImplanter = { ent-BaseImplantOnlyImplanter } .suffix = tracking .desc = { ent-BaseImplantOnlyImplanter.desc } +ent-TrackingImplanterERT = { ent-BaseImplantOnlyImplanter } + .suffix = death rattle ERT + .desc = { ent-BaseImplantOnlyImplanter.desc } ent-StorageImplanter = { ent-BaseImplantOnlyImplanterSyndi } .suffix = storage .desc = { ent-BaseImplantOnlyImplanterSyndi.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl index 5fd3733456e..1c0b1bd84a2 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -8,6 +8,8 @@ ent-BikeHornImplant = bike horn implant .desc = This implant lets the user honk anywhere at any time. ent-TrackingImplant = tracking implant .desc = This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel. +ent-TrackingImplantErt = ERT death rattle implant + .desc = This implant will inform the Centcomm radio channel should the user fall into critical condition or die. ent-StorageImplant = storage implant .desc = This implant grants hidden storage within a person's body using bluespace technology. ent-FreedomImplant = freedom implant diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl index 76e5343d8e3..8a1f889c186 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/categories.ftl @@ -33,5 +33,6 @@ store-category-ntadditional = Additional store-category-ntsanitary = Sanitary store-category-ntengineering = Engineering store-category-ntmechs = Mechs +store-category-ntexplosive = Explosive store-category-ntammo = Ammo store-category-ntequipment = Equipment Экипировка diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl index 42672152db9..7f1fb8e52bd 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -7,6 +7,7 @@ ntuplink-mech-teleporter-eliteheavy-desc = contains crate with Seraph. for high ntuplink-mech-powercage-nanotrasen-name = NanoTrasen power cage ntuplink-mech-powercage-nanotrasen-desc = A rechargeable power cage for big devices. Increased capacity for increased power levels. Immune to EMP. +ntuplink-deathrattle-implant-desc = A box containing enough deathrattle implants for the whole squad. Relays a message containing your position to the Centcomm channel when you go into a critical state or die. ntuplink-equip-jetpackvoid-name = void jetpack ntuplink-equip-jetpackmini-name = mini jetpack ntuplink-equip-jetpack-name = jetpack diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl new file mode 100644 index 00000000000..925a233edee --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -0,0 +1,16 @@ +ent-BoxErtImplants = коробка имплантеров "Предсмертный трекер" + .desc = Шесть имплантов "Предсмертный трекер" для всего отряда ЦК. +ent-BoxGrenadeIncendiary = Коробка зажигательных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxGrenadeShrapnel = Коробка шрапнельных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxGrenadeStinger = Коробка травматических гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны. +ent-BoxMetalFoamGrenade = Коробка металопенных гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать удушение. +ent-BoxSmokeGrenade = Коробка дымовых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту. +ent-BoxTearGasGrenade = Коробка слезоточивых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту при многократном использовании. +ent-BoxClusterBangFull = Коробка кластерных светошумовых гранат + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl index 08caed8dc22..8191f72f58c 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/implanters.ftl @@ -21,6 +21,9 @@ ent-BikeHornImplanter = { ent-Implanter } ent-TrackingImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Трекер +ent-TrackingImplanterERT = { ent-Implanter } + .desc = { ent-BaseImplantOnlyImplanter.desc } + .suffix = Предсмертный хрип ОБР ent-StorageImplanter = { ent-Implanter } .desc = { ent-BaseImplantOnlyImplanter.desc } .suffix = Хранилище diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl index 4f17db718ae..7bf0821d7d6 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/misc/subdermal_implants.ftl @@ -8,6 +8,8 @@ ent-BikeHornImplant = хонк-имплант .desc = Этот имплант позволяет пользователю хонкать когда угодно. ent-TrackingImplant = имплант Трекер .desc = Этот имплант оснащён устройством слежения, подключенным к сети датчиков комбинезонов, а также монитором состояния для радиоканала службы безопасности. +ent-TrackingImplantErt = имплант Предсмертный хрип ОБР + .desc = Этот имплант сообщит в радиоканал Центком, если пользователь окажется в критическом состоянии или умрёт. ent-StorageImplant = имплант Хранилище .desc = Этот имплант позволяет организовать скрытое хранилище внутри тела, с использованием блюспейс-технологии. ent-FreedomImplant = имплант Свобода diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl index 2c2d8df85a5..c92aa4087f0 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl @@ -34,5 +34,6 @@ store-category-ntadditional = Дополнительное store-category-ntsanitary = Санитария store-category-ntengineering = Инженерия store-category-ntmechs = Мехи +store-category-ntexplosive = Взрывчатка store-category-ntammo = Боеприпасы store-category-ntequipment = Экипировка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl index a30a66a22d2..05e9c775bf3 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/ntuplink-catalog.ftl @@ -7,6 +7,7 @@ ntuplink-mech-teleporter-eliteheavy-desc = Содержит ящик с лучш ntuplink-mech-powercage-nanotrasen-name = Энерго ячейка НаноТрейзен ntuplink-mech-powercage-nanotrasen-desc = Перезаряжаемая энергетическая ячейка для больших устройств. Увеличенная ёмкость для увеличенного уровня мощности. Имеет защиту от ЭМИ. +ntuplink-deathrattle-implant-desc = Коробка, содержащая 6 имплантов "Предсмертный хрип". Когда вы попадаете в критическое состояние Передаст сообщение с вашими координатами по радиоканалу Центком. ntuplink-equip-jetpackvoid-name = пустотный джетпак ntuplink-equip-jetpackmini-name = мини джетпак ntuplink-equip-jetpack-name = джетпак diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 4ad3d4532ed..d26179bfd94 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -103,6 +103,49 @@ - type: Rattle radioChannel: "Security" +#ERT implants Sunrise-start +#- type: entity +# parent: [ BaseSubdermalImplant, StorePresetUplink ] +# id: UplinkImplantErt +# name: uplink implant +# description: This implant lets the user access a hidden Syndicate uplink at will. +# categories: [ HideSpawnMenu ] +# components: +# - type: SubdermalImplant +# implantAction: ActionOpenUplinkImplantErt +# whitelist: +# components: +# - Hands +# - type: Store +# balance: +# Bluecrystal: 0 +# Crystallite: 0 +# - type: UserInterface +# interfaces: +# enum.StoreUiKey.Key: +# type: StoreBoundUserInterface +# - type: Tag +# tags: +# - NTUplink + +- type: entity + parent: BaseSubdermalImplant + id: TrackingImplantErt + name: tracking ERT implant + description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Centcom radio channel. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + whitelist: + components: + - MobState # admeme implanting a chair with tracking implant needs to give the chair mobstate so it can die first + - type: TriggerOnMobstateChange + mobState: + - Critical + - type: Rattle + radioChannel: "CentCom" +#Sunrise-end + #Traitor implants - type: entity diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index ac1f0c74307..a4cffc64629 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -53,6 +53,7 @@ - NTAmmo - NTMedicine - NTAdditional + - NTexplosive - NTMechs - NTSanitary - NTEngineering diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml new file mode 100644 index 00000000000..4ada31d7d04 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml @@ -0,0 +1,123 @@ +- type: entity + name: ERT death tracking implant box + parent: [BoxCardboard, BaseCentcommContraband] + id: BoxErtImplants + description: Six death tracking implants for the whole centcomm squad. + components: + - type: Sprite + layers: + - state: internals + - state: syringe + - type: Storage + grid: + - 0,0,5,3 + - type: StorageFill + contents: + - id: TrackingImplanterERT + amount: 6 + +- type: entity + name: GrenadeIncendiary box + parent: BoxCardboard + id: BoxGrenadeIncendiary + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeIncendiary + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: incendiary + +- type: entity + name: GrenadeShrapnel box + parent: BoxCardboard + id: BoxGrenadeShrapnel + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeShrapnel + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: shrapnel + + +- type: entity + name: GrenadeStinger box + parent: BoxCardboard + id: BoxGrenadeStinger + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: GrenadeStinger + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: stinger + +- type: entity + name: MetalFoamGrenade box + parent: BoxCardboard + id: BoxMetalFoamGrenade + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: MetalFoamGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: TearGasGrenade box + parent: BoxCardboard + id: BoxTearGasGrenade + description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' + components: + - type: StorageFill + contents: + - id: TearGasGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: SmokeGrenade box + parent: BoxCardboard + id: BoxSmokeGrenade + description: 'WARNING: These devices are extremely dangerous.' + components: + - type: StorageFill + contents: + - id: SmokeGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: ClusterBangFull box + parent: BoxCardboard + id: BoxClusterBangFull + description: 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' + components: + - type: StorageFill + contents: + - id: ClusterBangFull + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index 64109e08bf2..32791505fa6 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -5,7 +5,7 @@ productEntity: ClothingBackpackDuffelWeaponSubMachineGunWt550Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: wt550 } cost: - Bluecrystal: 3 + Bluecrystal: 2 categories: - NTAutoGun conditions: @@ -31,7 +31,7 @@ productEntity: ClothingBackpackDuffelWeaponRifleLecterFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lecter } cost: - Bluecrystal: 6 + Bluecrystal: 5 categories: - NTAutoGun conditions: @@ -83,7 +83,7 @@ productEntity: ClothingBackpackDuffelWeaponLightMachineGunMG42 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 } cost: - Bluecrystal: 25 + Bluecrystal: 24 categories: - NTAutoGun conditions: @@ -122,7 +122,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgunZauerFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: zauer } cost: - Bluecrystal: 14 + Bluecrystal: 13 categories: - NTAutoGun conditions: @@ -135,7 +135,7 @@ productEntity: ClothingBackpackDuffelWeaponXM1014Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: xm1014 } cost: - Bluecrystal: 10 + Bluecrystal: 9 categories: - NTAutoGun conditions: @@ -148,7 +148,7 @@ productEntity: ClothingBackpackDuffelWeaponShotgun12Filled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: spas12 } cost: - Bluecrystal: 8 + Bluecrystal: 7 categories: - NTAutoGun conditions: @@ -209,7 +209,7 @@ productEntity: WeaponEnergyGunTactical icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun_tac } cost: - Bluecrystal: 8 + Bluecrystal: 6 categories: - NTLasers conditions: @@ -247,7 +247,7 @@ productEntity: WeaponPulsePistol icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-p } cost: - Bluecrystal: 3 + Bluecrystal: 4 categories: - NTPistols conditions: @@ -272,7 +272,7 @@ productEntity: WeaponPistolN1984 icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: n1984 } cost: - Bluecrystal: 2 + Bluecrystal: 3 categories: - NTPistols conditions: @@ -284,7 +284,7 @@ productEntity: WeaponFlareGunSecurity icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: sec_flaregun } cost: - Bluecrystal: 2 + Bluecrystal: 1 categories: - NTPistols conditions: @@ -393,7 +393,7 @@ productEntity: SMGIncendiaryAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_red } cost: - Crystallite: 17 + Crystallite: 15 categories: - NTAmmo conditions: @@ -405,7 +405,7 @@ productEntity: SMGUraniumAmmoKit icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_uran } cost: - Crystallite: 30 + Crystallite: 25 categories: - NTAmmo conditions: @@ -429,7 +429,7 @@ productEntity: BoxMagazineShotgunIncendiary icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red } cost: - Crystallite: 18 + Crystallite: 16 categories: - NTAmmo conditions: @@ -441,7 +441,7 @@ productEntity: BoxMagazineShotgunSlug icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_slug } cost: - Crystallite: 10 + Crystallite: 9 categories: - NTAmmo conditions: @@ -489,13 +489,98 @@ productEntity: PortableRecharger icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: port_recharge } cost: - Crystallite: 20 + Crystallite: 15 categories: - NTAmmo conditions: + - !type:ListingLimitedStockCondition + stock: 5 + +# NTexplosive: +- type: listing + id: NTUplinkSunriseBoxFlashbang + productEntity: BoxFlashbang + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + +- type: listing + id: NTUplinkSunriseBoxTearGasGrenade + productEntity: BoxTearGasGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + +- type: listing + id: NTUplinkSunriseBoxSmokeGrenade + productEntity: BoxSmokeGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 3 + categories: + - NTexplosive + conditions: - !type:ListingLimitedStockCondition stock: 4 +- type: listing + id: NTUplinkSunriseBoxClusterBangFull + productEntity: BoxClusterBangFull + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 4 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeStinger + productEntity: BoxGrenadeStinger + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_stinger } + cost: + Crystallite: 5 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeShrapnel + productEntity: BoxGrenadeShrapnel + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shrapnel } + cost: + Crystallite: 8 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + +- type: listing + id: NTUplinkSunriseBoxGrenadeIncendiary + productEntity: BoxGrenadeIncendiary + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_incendiary } + cost: + Crystallite: 8 + categories: + - NTexplosive + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + # Медицина: - type: listing id: NTUplinkSunriseMaterialBiomass @@ -598,7 +683,7 @@ productEntity: ClothingBackpackDuffelNanotrasenMedicalBundleFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: med_bundle } cost: - Crystallite: 35 + Crystallite: 30 categories: - NTMedicine conditions: @@ -612,7 +697,7 @@ productEntity: CrateMindShieldImplants icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: crate_med } cost: - Crystallite: 6 + Crystallite: 5 categories: - NTAdditional conditions: @@ -636,19 +721,19 @@ productEntity: PinpointerUniversal icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: universal_pinpointer } cost: - Crystallite: 3 + Crystallite: 2 categories: - NTAdditional conditions: - !type:ListingLimitedStockCondition - stock: 8 + stock: 6 - type: listing id: NTUplinkSunriseBoxMRE productEntity: BoxMRE icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_mre } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTAdditional conditions: @@ -660,19 +745,7 @@ productEntity: BoxHandcuff icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_handcuffs } cost: - Crystallite: 2 - categories: - - NTAdditional - conditions: - - !type:ListingLimitedStockCondition - stock: 8 - -- type: listing - id: NTUplinkSunriseBoxFlashbang - productEntity: BoxFlashbang - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } - cost: - Crystallite: 4 + Crystallite: 1 categories: - NTAdditional conditions: @@ -701,20 +774,33 @@ - NTAdditional conditions: - !type:ListingLimitedStockCondition - stock: 12 + stock: 6 - type: listing id: NTUplinkSunriseDeployableBarrier productEntity: DeployableBarrier icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: deploy_barrier } cost: - Crystallite: 6 + Crystallite: 4 categories: - NTAdditional conditions: - !type:ListingLimitedStockCondition stock: 8 +- type: listing + id: NTUplinkSunriseBoxErtImplants + description: ntuplink-deathrattle-implant-desc + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_ertrattle } + productEntity: BoxErtImplants + cost: + Crystallite: 2 + categories: + - NTAdditional + conditions: + - !type:ListingLimitedStockCondition + stock: 2 + # Санитария - type: listing @@ -777,12 +863,24 @@ - !type:ListingLimitedStockCondition stock: 3 +- type: listing + id: NTUplinkSunriseBoxCleanerGrenades + productEntity: BoxCleanerGrenades + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } #НЕГОТОВО + cost: + Crystallite: 2 + categories: + - NTSanitary + conditions: + - !type:ListingLimitedStockCondition + stock: 5 + - type: listing id: NTUplinkSunriseAdvMopItem productEntity: AdvMopItem icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: adv-mop } cost: - Crystallite: 4 + Crystallite: 3 categories: - NTSanitary conditions: @@ -802,12 +900,24 @@ - !type:ListingLimitedStockCondition stock: 4 +- type: listing + id: NTUplinkSunriseBoxMetalFoamGrenade + productEntity: BoxMetalFoamGrenade + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } + cost: + Crystallite: 2 + categories: + - NTEngineering + conditions: + - !type:ListingLimitedStockCondition + stock: 4 + - type: listing id: NTUplinkSunriseJawsOfLife productEntity: JawsOfLife icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jaws } cost: - Crystallite: 5 + Crystallite: 4 categories: - NTEngineering conditions: @@ -819,7 +929,7 @@ productEntity: Omnitool icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: omnitool } cost: - Crystallite: 7 + Crystallite: 6 categories: - NTEngineering conditions: @@ -831,7 +941,7 @@ productEntity: PowerCellHigh icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_high } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEngineering conditions: @@ -845,35 +955,12 @@ productEntity: PowerCellNanoTrasen icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: power_cell_nt } cost: - Crystallite: 5 - categories: - - NTEngineering - conditions: - - !type:ListingLimitedStockCondition - stock: 4 - -- type: listing - id: NTUplinkSunriseNetworkConfigurator - productEntity: NetworkConfigurator - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: network_configurator } - cost: - Crystallite: 1 - categories: - - NTEngineering - conditions: - - !type:ListingLimitedStockCondition - stock: 4 -- type: listing - id: NTUplinkSunriseMultitool - productEntity: Multitool - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: multitool } - cost: - Crystallite: 1 + Crystallite: 4 categories: - NTEngineering conditions: - !type:ListingLimitedStockCondition - stock: 4 + stock: 8 # Экипировка: - type: listing @@ -882,7 +969,7 @@ productEntity: TelescopicShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: telescopic_shield } cost: - Crystallite: 3 + Crystallite: 2 categories: - NTEquipment conditions: @@ -895,7 +982,7 @@ productEntity: RiotBulletShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_bullet_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -908,7 +995,7 @@ productEntity: RiotLaserShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_laser_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -921,7 +1008,7 @@ productEntity: RiotShield icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: riot_shield } cost: - Crystallite: 2 + Crystallite: 1 categories: - NTEquipment conditions: @@ -934,7 +1021,7 @@ productEntity: JetpackBlueFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: jet_blue } cost: - Crystallite: 4 + Crystallite: 3 categories: - NTEquipment conditions: @@ -947,7 +1034,7 @@ productEntity: JetpackMiniFilled icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mini_jet } cost: - Crystallite: 4 + Crystallite: 2 categories: - NTEquipment conditions: @@ -972,7 +1059,7 @@ productEntity: ClothingEyesNVD icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet } cost: - Crystallite: 12 + Crystallite: 10 categories: - NTEquipment conditions: @@ -996,7 +1083,7 @@ productEntity: EnergyDomeGeneratorPersonalNT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_belt } cost: - Crystallite: 35 + Crystallite: 30 categories: - NTEquipment conditions: @@ -1011,7 +1098,7 @@ productEntity: PowerCageERT icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: powercage_nt } cost: - Crystallite: 10 + Crystallite: 15 categories: - NTMechs conditions: @@ -1037,12 +1124,12 @@ icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_ntgygax } productEntity: CrateCommandNTGygaxBundle cost: - Bluecrystal: 60 + Bluecrystal: 55 categories: - NTMechs conditions: - !type:ListingLimitedStockCondition - stock: 2 + stock: 1 - type: listing id: NTUplinkSunriseMarauder diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml new file mode 100644 index 00000000000..34202d4285b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/implanters.yml @@ -0,0 +1,9 @@ +#NanoTrasen implanters + +- type: entity + id: TrackingImplanterERT + suffix: tracking + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: TrackingImplantErt \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Store/categories.yml b/Resources/Prototypes/_Sunrise/Store/categories.yml index ee82e7e488e..7252b76f97a 100644 --- a/Resources/Prototypes/_Sunrise/Store/categories.yml +++ b/Resources/Prototypes/_Sunrise/Store/categories.yml @@ -168,6 +168,11 @@ name: store-category-ntmechs priority: 9 +- type: storeCategory + id: NTexplosive + name: store-category-ntexplosive + priority: 10 + - type: storeCategory id: NTAmmo name: store-category-ntammo diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png b/Resources/Textures/Objects/Storage/boxes.rsi/incendiary.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb9896bf860f761c669581ebcd310efcc82b6f5 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArY;~ z2@z}_X-E>CDTlh?opIzdP8{hr&PZqHVTkz}_X-E>CDTlh?opIzdP8{hr&PZqHVTk~emJRB?`GPDfJY5Hy1^WekECuoyFi0w1tZ%XMzCpt23&3jH6&OWA`FFNV*7pw Q0c~XPboFyt=akR{03>8OtpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/stinger.png b/Resources/Textures/Objects/Storage/boxes.rsi/stinger.png new file mode 100644 index 0000000000000000000000000000000000000000..284b33149bb59864818de60eef8a4cb19cf8a188 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY;~ z2@z}_X-E>CDTlh?opIzdP8{hr&PZqHVTk^1!I%5C; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_ertrattle.png new file mode 100644 index 0000000000000000000000000000000000000000..29515df8e7d819012ab9d979ff72e7039045d539 GIT binary patch literal 1252 zcmVPx(o=HSORCt{2oj*@hK@h-)19C!$1>vlSG$!~JOr)@}x1q4GqtMb1V4;bf##m@U zXF*|OZ%iz-rzWw{Sb2zv5|99=#WBa-@aA^r-Tr_3YwjNG?au7Z&c59@`*!MjyZsLe zjinV@fI?Vi@XLe6#gK9oJo9RA4*-S?AQ!$JACFvLot=#;zu357090Wl7sWaKklgj8 z`eo+#xbmnzD`yQo z*J{*U^+WfpKL+nAwVXr4jR|Wo7lU6F1kNj-N zFRf3GPX`A8aP9$cNb^1mK*Mr9rlvj%@KsO91p~l>=@^NE4UcCjgX1%jie4sff_hN{ z;ta~02fzx}x-cnNF;r2l>vxr(6xa1c5gR~=9^$gHeYjZH#!`jWfU;W$uwCgP8qp`& z8Gw}B8&*no20&fkqz!F5zu3se05+zt^}kG8&Uj3Io2Oqa7v`V5%(FlCuuVfa2VqcSwT|N$x0fg-N zwgMyQJwW&4^TGdyzYnKH>Z}9!zL^_F(_Tgcn6v>TcgR)g#Onl+uLGF$lh%(bSOdVj ze_x?VuAsfy_8orgs8<3_Tc;@KZfKCDDdY+b%XbuPC}>BbdYe1}Z5OWIO=Q0{4C(H6 zM?MSHuwmh7kc0QXE3+@v%gbZ+rCMK{>KB=q)*o+CRo1Ri)0t+IX#{|-+UYe(1qB2iwiDeZV zy40a?ngP?iT()kN zQ^NwC7~%_?Cw%1I834v?4a=3>^+Tdt2k?c>25y3}OqJ8an@yPoG@SqPEh_1=2bGHe O0000Px(yh%hsRCt{2oxe{MK@`WocZw$ji9s+nN&|t|hy^5?sIjrunD{psW306?vC+=T z7;8%#tt~Zb0tI$JfI=xuZopU!f`c`HZ-NDh*Bm$c`!msAg|o~X}A zyProbpdNCiuTLvO>OsVAv#FHsFz8;Lw5oF1 z$j^lQs`bh7ac2j>e-A)In)O)#8CKb2YUr~7TlGX7FaRo893x4v&hac{XnZC@(M#q{ zNH5WVID@k00jPp?U6?9VF`}ZnuD`7OR4KcjM3fD{MGq;nvTeB7vW?|1bPXuFbpX?q z?xGQG5}g645_`j{5}g5vuCHiAo6gTSqA`H4#|JXk9|let&Hw7wM&^3**Ot-zT@jZ# zC$tIP15nSuKiZoA&Mh4S09tFOu!ld zy+;-!Qfy#D`B!IW0RZREoB#lvyl@==F!p?dy(cd&jhWh!dlm?znq- zu1>Z7SZ)6>TjV+4FLc@~n1?{$*W`Vdk3-1-T=x7>rh_83ALcsIX)mb(6m0-m1#lG= z$~u9noSc5D^-~tC0npRGFBP50hxSUKZ0nQ=xf?OaQWkPWhGjbn))it$67`mO05-1%4%AUq>`O7?zFZ1kfa(0tZRsOQ|^nN8!W(X_wmP~U? ztxp|&s?`7hKc_Ee(k(130stl^#=Dlsr8_ikCX6AC33P?&pb#31eVJD73^CeXaa<9~4V~lxDo*eofS?|kJ`kZtGzLJVZv^QPodKv4 zd(T!SIs-^UfF8;Q;36iV%*7Bc$kHS(_6BfY3gxio0dxh^MT{~gbYt(z%1@QD>q$iW z#1PY8<#t7=F%Gi&=M0AnzqjTAY*}>ZCx+NAPig?PmaK~SJpt~1l@m7(`$9Q);)YC4 zN>479J28aHQq8Yy`E~WwB@BO^C=K?+5Rq86ZlzPh9Gw_q3zH{&#NHWzE?dK5C3gJ? s@74iqVX}d%U@WzCdU&--vw({855#IC;{%{R)&Kwi07*qoM6N<$f==R4NB{r; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_shrapnel.png new file mode 100644 index 0000000000000000000000000000000000000000..eeffd36140b9f84aff97f852822ed53f5ef3776d GIT binary patch literal 1278 zcmVPx(xJg7oRCt{2oxe{MK@`WohvEqVVvw_x1_GhN0uxQt&RS#eZ!pGKYhz-g|9~;p zmNr^b8I3;z1tul}0SawQ1Stps5p!A`FWwIKc4ltp$Ik408rgGp=DnFWZ+2$i?9?Xf z^}k3|mLA^%B>Zxm{{E_}W1enp0cbOTSon5ukhwnF+gqyq%El1`5EUk3QJm9{ zh+R)nzvw)G=?09&AUIe9_$pYCc+GKjU?6inx3i;_uKo9w{e1wyM7^GyF0UM}JW-#~ z!-nqb>FFvzTk`Ab$uY_pa+(EHoEohI&@6z)4(cJ7`unvqq#i`vsbagHM3fD{M-Q=C*)CkHZDZ+#t^q~24q&>{ zeKev=qB8(hVsBVgqB8)|^%ZSs)A^N+Xbj-f$)U{ko1xQ2^S`|PGjl!tYujl4zKF}5 z6WRpt0jTHS8Eegd7gtXJ0IuA>YqXp{_Z|QM&W-;D06bZ1l^ePzNFJc#upWTk0r+_6 z*=sfnm)jU=002fBBbnc?U%Q!m-^*7oGS{0Mn*f0C1!OUyk1kZ6>|KuX5KwewO1xi| zpR1LyqNvK*ZMtsjLDk@be+E!R?D>7nEP>LAo*-6~4ZzfVTJ_avDD!R8`smb?30MQ5 z_sC*IiVIvQ|Ln^G0AOlx5CCv$b`}6IKKI&qSw4-K+L3z}2&0=Ntf4dnbc$^Yom*2g z*&jZB_9KV|blNMJhrqJ0$(LO|4kZKd+4Do04vM&bm}^I;y`%jbKD za{8&(k1bdOpr`+`RCJ;{v{wRUTcEZ0%6z7RW-sJF}$i0#7FyNu|! zh7lW^8<~F}J$|Tl|I*Tuahb{p8x~F$sXE5#_FysUw&(_kvLouJ+VjQqM7Q-W!g>JO zgQmMPs4UR?`>G>b36u^2wx=;%{xT0#mU(uboOv>;%5PiG(ys){3}L;eCDY<+>r+SX zYBd1BkMkEZ>6VvQ005Jd6S?Ja>CVi*Z~bu?akPG{RqnJzZXZOs5?GcV&rx>yI7+_~ zXqpS>XLA3aJV40kv{#sBn=pnnCeRnAgFX_ zyREl<&-)vh-`8m6&JbgVD~{_zxuKIhK*b5(0}#|B(+48-h{gbj^o<}rqB8(hV(;0i zL}vhL2+%{>0DQy**jxV($z<&epJ4iCsUUbn5`F oFxkLWFqT?6J-phaSwO}42YqED7xyb54gdfE07*qoM6N<$g8k%N?f?J) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/box_stinger.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f86191b1fcdd9bdd8e602428cc03fb6fbcf61b GIT binary patch literal 1279 zcmVPx(xk*GpRCt{2oxe{MK@`WocZw$ji9ya%8iWfK7LsV9#>QG>;vZp*t=gE_XzY!D zfTfMrmKrs|M63h^3T;dTDF^`(b6OlP-VXO}W_IVt&g^^|*>iU0y_q*}c4pt~)LMyzWn_BMe39)N~4=d%DZEZbvh=(7M<^+X&n04i7iM@OI`iN8xcEU5@e)P;_NVykC}| ztCg^#sLGi)UEX?7HMroP0aOut{vb0;pmd@qh!tf6Fg2f6eKi`&eA~1>I`w1%)&S@| zvKW!#0vF1E`TQ6F&^k5^0GPad8~`x?aoTuUK8=~$k$V;hqnjnHp)>^aifs#>$>}=) z0D8n)T=6H1X>{5vn1{f!ugRBPJ`N=V@Y(Z2nGTA$ewgbGP_zML6~I+gDC-2O za&r2q){iY%1E8n>vQ%^;AKEK{vaM4hRm?k zTf>O8^|j2u4<9|yx_@C|!MIFigbfQPi&P!sbbGKEbz5`;MA;GbQ|*L$&(g01$_!z(-jQj3x$~)` zx3wAo;K%IwOuEIzB>+IHHPyE~F5Stwcbz}>BaT)Nb;_NQ$nAqDR|3n@<2lMMA4lm| z0!?#n_H5t(Cl3%ZI_(vv*(Qu3jS2LH>7WoA)8Eg1P)cVKp8+nVi3!Y;PY7!Pregy0 zrWa8)xHJS*9P2TG;#)7Bw_qVWS(}Op%v(=Ik;Vl2+8+=?eouhAU**J&USBBZPTY{mN$JVO zawmpRS*rQjmS0y-UBd9!32U$?hKR(nbt|13=IO)`SC~BEBlgY!^w}B~E3xZGlx`is p6($?F3dT}Pr-xUYGz+LW{{U%ZBra~yJ7NF;002ovPDHLkV1it7Qzifa literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json index c29da88cf50..dee78c61809 100644 --- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/meta.json @@ -97,6 +97,9 @@ { "name": "port_recharge" }, + { + "name": "box_ertrattle" + }, { "name": "p90" }, @@ -241,6 +244,15 @@ { "name": "box_flashbangs" }, + { + "name": "box_stinger" + }, + { + "name": "box_shrapnel" + }, + { + "name": "box_incendiary" + }, { "name": "box_handcuffs" }, From ea38b8157dc6bbc1fed33648b3c046cda1d3286b Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 15:31:07 +0000 Subject: [PATCH 2/3] Fix NVD Icon --- Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index 32791505fa6..e56e45328b8 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -1057,7 +1057,7 @@ - type: listing id: NTUplinkSunriseClothingEyesNVD productEntity: ClothingEyesNVD - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet } + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nvd } cost: Crystallite: 10 categories: From dd350b4e62d3cc34c87599201434c9a0b475fcba Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 29 Dec 2024 15:31:25 +0000 Subject: [PATCH 3/3] clean --- Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml index e56e45328b8..c0d902c6a1b 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml @@ -866,7 +866,7 @@ - type: listing id: NTUplinkSunriseBoxCleanerGrenades productEntity: BoxCleanerGrenades - icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } #НЕГОТОВО + icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_flashbangs } cost: Crystallite: 2 categories: