From 3da429d042f4858072bba63df737cbdcd62ffc67 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 5 Jan 2025 22:44:18 +0000 Subject: [PATCH 1/3] Syringe Gun --- .../catalog/fills/boxes/nanotrasen.ftl | 4 +- .../objects/weapons/guns/syringe_guns.ftl | 15 +++ .../_sunrise/research/technologies.ftl | 2 + .../_sunrise/store/uplink-catalog.ftl | 6 + .../catalog/fills/boxes/nanotrasen.ftl | 4 +- .../objects/weapons/guns/syringe_guns.ftl | 15 +++ .../_sunrise/research/technologies.ftl | 2 + .../_sunrise/store/uplink-catalog.ftl | 6 + .../Catalog/Fills/Lockers/heads.yml | 6 + .../Catalog/Fills/Lockers/medical.yml | 8 ++ .../Objects/Weapons/Guns/pneumatic_cannon.yml | 4 +- .../Entities/Structures/Machines/lathe.yml | 3 + .../Catalog/Fills/Boxes/nanotrasen.yml | 20 +++- .../_Sunrise/Catalog/uplink_catalog.yml | 39 +++++++ .../Objects/Specific/Medical/chemistry.yml | 51 +++++++++ .../Weapons/Guns/Launchers/syringe_guns.yml | 107 ++++++++++++++++++ .../_Sunrise/Recipes/Lathes/medical.yml | 30 +++++ .../Prototypes/_Sunrise/Research/medical.yml | 25 ++++ .../syringe_pistol.rsi/inhand-left.png | Bin 0 -> 337 bytes .../syringe_pistol.rsi/inhand-right.png | Bin 0 -> 341 bytes .../Launchers/syringe_pistol.rsi/meta.json | 22 ++++ .../syringe_pistol.rsi/syringe_gun.png | Bin 0 -> 421 bytes .../syringe_rapidgun.rsi/inhand-left.png | Bin 0 -> 337 bytes .../syringe_rapidgun.rsi/inhand-right.png | Bin 0 -> 341 bytes .../Launchers/syringe_rapidgun.rsi/meta.json | 22 ++++ .../syringe_rapidgun.rsi/syringe_gun.png | Bin 0 -> 558 bytes 26 files changed, 387 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/syringe_gun.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/syringe_gun.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 index 959a9b95483..121b5f4dc84 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -13,4 +13,6 @@ ent-BoxSmokeGrenade = SmokeGrenade Box 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 + .desc = 'WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.' +ent-BoxMiniSyringe = Mini Syringe box + .desc = A Mini Syringe-Filled Box. \ No newline at end of file diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl new file mode 100644 index 00000000000..411cfb7fc36 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl @@ -0,0 +1,15 @@ +ent-LauncherSyringeMed = syringe gun + .suffix = Standart + .desc = Load full of poisoned syringes for optimal fun. + +ent-LauncherSyringePistol = syringe pistol + .suffix = Compact + .desc = { ent-LauncherSyringeMed.desc } + +ent-LauncherSyringePistolFilled = syringe pistol + .suffix = Compact, Filled + .desc = { ent-LauncherSyringeMed.desc } + +ent-LauncherSyringeRapid = Auto syringe gun + .suffix = Auto + .desc = { ent-LauncherSyringeMed.desc } diff --git a/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl index 7a43934d497..7d47d549db1 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/research/technologies.ftl @@ -2,6 +2,8 @@ research-discipline-biochemical = Biochemical research-technology-basic-surgery = Basic surgery research-technology-basic-cyberlimbs = Basic cyberlimbs +research-technology-basic-syringegun = Basic Syringegun +research-technology-compact-syringegun = Compact Syringegun research-technology-advanced-surgery = Advanced surgery research-technology-handcraft-nvd = Кустарные ПНВ diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index 9b42f06371e..653cce4ea47 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -64,5 +64,11 @@ uplink-hypo-name = Горлекс гипоспрей uplink-hypo-desc = Химический гипоспрей, произвёденный синдикатом, способный мгновенно впрыснуть до 20 ед. реагентов. Изначально пуст. uplink-polytrinic-acid-chemistry-bottle-name = Политриновая кислота uplink-polytrinic-acid-chemistry-bottle-desc = Чрезвычайно едкое химическое вещество. Сильно обжигает всех, кто вступит с ней в непосредственный контакт. +uplink-syringe-pistol-filled-name = Компактный шприцемёт +uplink-syringe-pistol-filled-desc = Сразу заполнен тремя шприцами. В шприцах: токсин немоты,карпотоктин и фризиум. +uplink-syringe-box-filled-name = коробка мини шприцов +uplink-syringe-box-filled-desc = Полная коробка мини шприцов. +uplink-syringe-rapid-name = Автоматический шприцемёт +uplink-syringe-rapid-desc = Принимает до 8ми шприцов. изначально пуст. Сделайте из Офицера СБ Ёжика!. uplink-clothing-glasses-nvg-name = NVG Sun Glasses uplink-clothing-glasses-nvg-desc = Quality made sunglasses, manufactured by Gorlax Security. Uses modular parts to improve visibility in low light conditions. Warning: The glasses will not protect your eyes from direct flashes. 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 index 925a233edee..c5211c406bc 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl @@ -13,4 +13,6 @@ ent-BoxSmokeGrenade = Коробка дымовых гранат ent-BoxTearGasGrenade = Коробка слезоточивых гранат .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту при многократном использовании. ent-BoxClusterBangFull = Коробка кластерных светошумовых гранат - .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании. \ No newline at end of file + .desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании. +ent-BoxMiniSyringe = Коробка мини-шприцов + .desc = Полная коробка мини-шприцов. Если не полная то кто-то уже забрал. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl new file mode 100644 index 00000000000..efc13231c27 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/syringe_guns.ftl @@ -0,0 +1,15 @@ +ent-LauncherSyringeMed = шприцемёт + .suffix = Стандартный + .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие. + +ent-LauncherSyringePistol = Компактный шприцемёт + .suffix = Компактный + .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие. теперь в смешном размере. + +ent-LauncherSyringePistolFilled = Компактный шприцемёт + .suffix = Компактный, Заполнен + .desc = { ent-LauncherSyringePistol.desc } + +ent-LauncherSyringeRapid = Авто-прицемёт + .suffix = Автоматический + .desc = Зарядите в пациента до 8-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl index f437b6efe15..f40ba60205f 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -1,6 +1,8 @@ research-discipline-biochemical = Биохимия research-technology-basic-surgery = Базовая хирургия research-technology-basic-cyberlimbs = Базовые кибер-конечности +research-technology-basic-syringegun = Базовые шприцемёты +research-technology-compact-syringegun = Компактные шприцемёты research-technology-advanced-surgery = Продвинутая хирургия research-technology-handcraft-nvd = Кустарные ПНВ research-technology-basic-nvd = Продвинутое ПНВ diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index bc5dab19067..433d49a285d 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -77,6 +77,12 @@ uplink-hypo-name = Горлекс гипоспрей uplink-hypo-desc = Химический гипоспрей, произвёденный синдикатом, способный мгновенно впрыснуть до 20 ед. реагентов. Изначально пуст. uplink-polytrinic-acid-chemistry-bottle-name = Политриновая кислота uplink-polytrinic-acid-chemistry-bottle-desc = Чрезвычайно едкое химическое вещество. Сильно обжигает всех, кто вступит с ней в непосредственный контакт. +uplink-syringe-pistol-filled-name = Компактный шприцемёт +uplink-syringe-pistol-filled-desc = Сразу заполнен тремя шприцами. В шприцах: токсин немоты,карпотоктин и фризиум. +uplink-syringe-box-filled-name = коробка мини шприцов +uplink-syringe-box-filled-desc = Полная коробка мини шприцов. +uplink-syringe-rapid-name = Автоматический шприцемёт +uplink-syringe-rapid-desc = Изначально пуст. Принимает до 8-ми шприцов. Сделайте из Офицера СБ Ёжика! ## Mechs equipment diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index acac5b8dfb9..b8b04206540 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -229,6 +229,12 @@ #Sunrise-start - id: ClothingEyesUniversalMedicalHud - id: AdvancedDefibrillator + - id: LauncherSyringeMed + prob: 0.6 + - id: BoxMiniSyringe + prob: 0.8 + - id: BoxMiniSyringe + prob: 0.20 #Sunrise-end - id: MedicalTechFabCircuitboard - id: MedkitFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 5279d80618a..4d3c71bd555 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -110,6 +110,14 @@ components: - type: StorageFill contents: + #Sunrise-start + - id: LauncherSyringeMed + prob: 0.25 + - id: BoxMiniSyringe + prob: 0.15 + - id: BoxMiniSyringe + prob: 0.4 + #Sunrise-end - id: BoxSyringe - id: BoxBeaker - id: BoxBeaker diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index 63a7acd2576..003963a1521 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -13,12 +13,14 @@ visible: false - type: Item size: Huge + shape: #Sunrise-Edit + - 0,0,4,4 #5X5 #Sunrise-Edit - type: Clothing quickEquip: false slots: - Back - type: Gun - fireRate: 2 + fireRate: 1.5 #Sunrise-Edit selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e9358804c95..b07871b1a1d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1097,6 +1097,9 @@ - SawAdvanced - Hemostat - HemostatAdvanced + - LauncherSyringeMed #Sunrise-Edit + - LauncherSyringePistol #Sunrise-Edit + - MiniSyringe #Sunrise-Edit - LeftArmCyber - RightArmCyber - LeftHandCyber diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml index 4ada31d7d04..29b92c0d1ab 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml @@ -120,4 +120,22 @@ - type: Sprite layers: - state: box_security - - state: flashbang \ No newline at end of file + - state: flashbang + +- type: entity + name: Mini-Syringe box + parent: BoxCardboard + id: BoxMiniSyringe + description: A box full of MiniSyringe. + components: + - type: Storage + grid: + - 0,0,2,1 + - type: StorageFill + contents: + - id: MiniSyringe + amount: 6 + - type: Sprite + layers: + - state: box + - state: syringe \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 7fa6f04d634..4a3cd6a47a7 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -813,6 +813,45 @@ categories: - UplinkChemicals +- type: listing + id: UplinkLauncherSyringePistolFilled + name: uplink-syringe-pistol-filled-name + description: uplink-syringe-pistol-filled-desc + productEntity: LauncherSyringePistolFilled + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 6 + cost: + Telecrystal: 12 + categories: + - UplinkChemicals + +- type: listing + id: UplinkBoxMiniSyringe + name: uplink-syringe-box-filled-name + description: uplink-syringe-box-filled-desc + productEntity: BoxMiniSyringe + discountCategory: RareDiscounts + discountDownTo: + Telecrystal: 2 + cost: + Telecrystal: 4 + categories: + - UplinkChemicals + +- type: listing + id: UplinkLauncherSyringeRapid + name: uplink-syringe-rapid-name + description: uplink-syringe-rapid-desc + productEntity: LauncherSyringeRapid + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 8 + cost: + Telecrystal: 16 + categories: + - UplinkChemicals + - type: listing id: UplinkExplosiveCollarsKit name: uplink-exp-collars-kit-name diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml new file mode 100644 index 00000000000..443c92f3735 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/chemistry.yml @@ -0,0 +1,51 @@ +- type: entity + parent: MiniSyringe + id: PrefilledMiniSyringe + components: + - type: Injector + toggleState: Inject + +- type: entity + suffix: MuteToxin, MiniSyringe + parent: PrefilledMiniSyringe + id: MiniSyringeMuteToxin + components: + - type: Label + currentLabel: reagent-name-mute-toxin + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: MuteToxin + Quantity: 15 + +- type: entity + suffix: Fresium, MiniSyringe + parent: PrefilledMiniSyringe + id: MiniSyringeFresium + components: + - type: Label + currentLabel: reagent-name-fresium + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: Fresium + Quantity: 15 + +- type: entity + suffix: CarpoToxin, MiniSyringe + parent: PrefilledMiniSyringe + id: MiniSyringeCarpoToxin + components: + - type: Label + currentLabel: reagent-name-carpotoxin + - type: SolutionContainerManager + solutions: + injector: + maxVol: 15 + reagents: + - ReagentId: CarpoToxin + Quantity: 15 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml new file mode 100644 index 00000000000..331ba77e40e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml @@ -0,0 +1,107 @@ +- type: entity + name: syringe gun + parent: [LauncherSyringe] + id: LauncherSyringeMed + suffix: Standart + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi + layers: + - state: syringe_gun + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,0 + whitelist: + tags: + - SyringeGunAmmo + - type: Gun + fireRate: 0.8 + - type: Item + size: Normal + shape: + - 0,0,2,1 + - 0,0,2,1 + +- type: entity + name: syringe pistol + parent: [LauncherSyringe] + id: LauncherSyringePistol + suffix: Compact + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi + layers: + - state: syringe_gun + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,0 + whitelist: + tags: + - SyringeGunAmmo + - type: Gun + fireRate: 0.8 + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + +- type: entity + name: syringe pistol + parent: [LauncherSyringe] + id: LauncherSyringePistolFilled + suffix: Compact, Filled + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi + layers: + - state: syringe_gun + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,0 + - type: StorageFill + contents: + - id: MiniSyringeCarpoToxin + - id: MiniSyringeMuteToxin + - id: MiniSyringeFresium + whitelist: + tags: + - SyringeGunAmmo + - type: Gun + fireRate: 0.8 + - type: Item + size: Small + shape: + - 0,0,1,0 + - 0,1,0,1 + +- type: entity + name: Rapid syringe gun + parent: [LauncherSyringe] + id: LauncherSyringeRapid + suffix: Auto + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi + layers: + - state: syringe_gun + - type: Storage + maxItemSize: Small + grid: + - 0,0,3,1 + whitelist: + tags: + - SyringeGunAmmo + - type: Gun + fireRate: 1.8 + selectedMode: FullAuto + availableModes: + - FullAuto + - type: Item + size: Small + shape: + - 0,0,2,1 + - 0,0,2,1 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml index fd20019cb18..464b5c012a4 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml @@ -69,6 +69,36 @@ materials: Steel: 200 +#SyringeGuns +- type: latheRecipe + id: LauncherSyringeMed + result: LauncherSyringeMed + category: Tools + completetime: 25 + materials: + Plastic: 200 + Steel: 800 + Glass: 300 + +- type: latheRecipe + id: LauncherSyringePistol + result: LauncherSyringePistol + category: Tools + completetime: 10 + materials: + Plastic: 200 + Steel: 1000 + Glass: 350 + +- type: latheRecipe + id: MiniSyringe + result: MiniSyringe + category: Tools + completetime: 3 + materials: + Plastic: 100 + Steel: 25 + #cyberlimbs - type: latheRecipe diff --git a/Resources/Prototypes/_Sunrise/Research/medical.yml b/Resources/Prototypes/_Sunrise/Research/medical.yml index c6eb013c0ab..fcb467dfbc9 100644 --- a/Resources/Prototypes/_Sunrise/Research/medical.yml +++ b/Resources/Prototypes/_Sunrise/Research/medical.yml @@ -37,6 +37,31 @@ - LeftFootCyber - RightFootCyber +- type: technology + id: BasicSyringeGun + name: research-technology-basic-syringegun + icon: + sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi + state: syringe_gun + discipline: Biochemical + tier: 1 + cost: 5000 + recipeUnlocks: + - MiniSyringe + - LauncherSyringeMed + +- type: technology + id: CompactSyringeGun + name: research-technology-compact-syringegun + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi + state: syringe_gun + discipline: Biochemical + tier: 2 + cost: 7500 + recipeUnlocks: + - LauncherSyringePistol + - type: technology id: SurgeryTechAdvanced name: research-technology-advanced-surgery diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b59a4d52682c1a0f290c8751b524b1eb04fa2f04 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|O(o zr;B4q#hkad4EdTI1RO3NJakQ3Kr3o}1Lw3VF6(Okhmw0*m&P2L#8@GkZ3wDax^L4r?g`I}SH9kyGd)}KliH5C*DKDxzRzvw{+Y?fZ_BE_PVJ_58G$9XV-3sUGBheYLCwo=;brR<;~lL*dJ97*N@tj!Nl#I8T5}?; z_2>UrXW#w4x2!sw2WTt1RLY9Mo@}UVj2?5r}BG_R+E^>(QF!@0ssC{VeNPHZ6Orl)|>3ySaV$ zMRL6Hjtef7ay;+nzWK&`-&xDHe%E=oe)joe-`0I!|A&3W0*iSycJ=Ek!v39g%9hLd hF>k-|ZFZoU)#7d}nUb|HE`b7&!PC{xWt~$(69AhukQV>| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/meta.json new file mode 100644 index 00000000000..f636bf22a03 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13 at f91dfe2e0dba1b7a8b9a0fa18251340920979a62, held sprite by ScarKy0,resprited by KaiserMaus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "syringe_gun" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/syringe_gun.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_pistol.rsi/syringe_gun.png new file mode 100644 index 0000000000000000000000000000000000000000..3cf74d90d80f93b9479db87659675d1d3a618d1f GIT binary patch literal 421 zcmV;W0b2fvP)Px$Ur9tkR9J=WlEF#>Q51&1Bq#i(ZhmX@dhb!v@dDKAH4ZF`f^Aa>nR$GA1EAf$i)9)a z;3Ao1)5tUQoJp+~X5JJdhU%W!0_?LVEdPjUvI1RNp P00000NkvXXu0mjftyi*b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b59a4d52682c1a0f290c8751b524b1eb04fa2f04 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|O(o zr;B4q#hkad4EdTI1RO3NJakQ3Kr3o}1Lw3VF6(Okhmw0*m&P2L#8@GkZ3wDax^L4r?g`I}SH9kyGd)}KliH5C*DKDxzRzvw{+Y?fZ_BE_PVJ_58G$9XV-3sUGBheYLCwo=;brR<;~lL*dJ97*N@tj!Nl#I8T5}?; z_2>UrXW#w4x2!sw2WTt1RLY9Mo@}UVj2?5r}BG_R+E^>(QF!@0ssC{VeNPHZ6Orl)|>3ySaV$ zMRL6Hjtef7ay;+nzWK&`-&xDHe%E=oe)joe-`0I!|A&3W0*iSycJ=Ek!v39g%9hLd hF>k-|ZFZoU)#7d}nUb|HE`b7&!PC{xWt~$(69AhukQV>| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/meta.json new file mode 100644 index 00000000000..5fb2744760a --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprited by KaiserMaus", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "syringe_gun" + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/syringe_gun.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Launchers/syringe_rapidgun.rsi/syringe_gun.png new file mode 100644 index 0000000000000000000000000000000000000000..03bc0e89bbe0d285f14a97a91907fae27d8d93fb GIT binary patch literal 558 zcmV+}0@3}6P)Px$=t)FDR9J=Wluc_BK^Vt>W71FwB!R9k2bq*M6arg910@F~z4`_ERXlm@r|{&x zU%;ERc#)KfxDbRTU4u};2_Z2t%erAaXx1bcQhC6t4b}lSLV;Yq#66TzWon_l`xbaiIs5iU^C6 zalVJ6ls>7~IXF8zH5qtwbaedm{9H>ZMNpiP^du-0EU}h>T;oC?A0BerXy`yn#`!#{ zUN6#L7!2G4PU>}@c%Gius?|pTTwcD?7$zPw01$LKQEb~a^0gXoJ&yz6v7!F?XavCC zUL~dt2474qmK&JHabEMVR*OuTCNR;yZsb;Nx1NE_))qk+8W)%*@C5K@&fcA&>f^MdijvkT7 zK)HEW()2C7!YoGW=49qhgfBReg wS3g8^-1sDn2C~_lXtf*-hCewWA>m)+J9Nvlb%Jl|y#N3J07*qoM6N<$f^p#d#sB~S literal 0 HcmV?d00001 From e448e2339b206c53b571fd4b43cef8fb04128e03 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 5 Jan 2025 23:12:29 +0000 Subject: [PATCH 2/3] Fix Linter? --- Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml | 2 +- .../Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index 4a3cd6a47a7..ba4076029c7 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -831,7 +831,7 @@ name: uplink-syringe-box-filled-name description: uplink-syringe-box-filled-desc productEntity: BoxMiniSyringe - discountCategory: RareDiscounts + discountCategory: veryRareDiscounts discountDownTo: Telecrystal: 2 cost: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml index 331ba77e40e..c17025f5616 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml @@ -70,6 +70,9 @@ whitelist: tags: - SyringeGunAmmo + - MiniSyringeFresium + - MiniSyringeMuteToxin + - MiniSyringeCarpoToxin - type: Gun fireRate: 0.8 - type: Item From 1514b52cb1a25e6e89f73c57efc2dfaa2609e9e4 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Sun, 5 Jan 2025 23:22:40 +0000 Subject: [PATCH 3/3] Now fix? --- .../Weapons/Guns/Launchers/syringe_guns.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml index c17025f5616..c0ba54a8f3f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/syringe_guns.yml @@ -12,9 +12,6 @@ maxItemSize: Small grid: - 0,0,2,0 - whitelist: - tags: - - SyringeGunAmmo - type: Gun fireRate: 0.8 - type: Item @@ -37,9 +34,6 @@ maxItemSize: Small grid: - 0,0,2,0 - whitelist: - tags: - - SyringeGunAmmo - type: Gun fireRate: 0.8 - type: Item @@ -67,12 +61,6 @@ - id: MiniSyringeCarpoToxin - id: MiniSyringeMuteToxin - id: MiniSyringeFresium - whitelist: - tags: - - SyringeGunAmmo - - MiniSyringeFresium - - MiniSyringeMuteToxin - - MiniSyringeCarpoToxin - type: Gun fireRate: 0.8 - type: Item @@ -95,9 +83,6 @@ maxItemSize: Small grid: - 0,0,3,1 - whitelist: - tags: - - SyringeGunAmmo - type: Gun fireRate: 1.8 selectedMode: FullAuto