From d15b7dff4213ba324a76428c165672923a552c73 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sun, 1 Oct 2023 23:45:17 +0300 Subject: [PATCH] Advanced treatment cyborg module for medical borg (#19667) * chemical analysis goggles for medical borg * module and its tools * fix * fix2 * icon * module research * meh --- .../Objects/Specific/Medical/hypospray.yml | 24 +++++++++++++++++- .../Specific/Robotics/borg_modules.yml | 16 ++++++++++++ .../Entities/Objects/Specific/chemistry.yml | 20 +++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/robotics.yml | 10 ++++++++ Resources/Prototypes/Research/biochemical.yml | 1 + .../Chemistry/dropper.rsi/borgdropper.png | Bin 0 -> 291 bytes .../Specific/Chemistry/dropper.rsi/meta.json | 3 +++ .../Medical/hypospray.rsi/borghypo.png | Bin 587 -> 602 bytes .../Robotics/borgmodule.rsi/icon-chemist.png | Bin 0 -> 181 bytes .../Robotics/borgmodule.rsi/meta.json | 3 +++ 11 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-chemist.png diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 4a90e60b0c..dccbbc7328 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -51,6 +51,29 @@ - type: UseDelay delay: 0.5 +- type: entity + name: borghypo + parent: BaseItem + description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs. + id: BorgHypo + components: + - type: Sprite + sprite: Objects/Specific/Medical/hypospray.rsi + state: borghypo + - type: Item + sprite: Objects/Specific/Medical/hypospray.rsi + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 10 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + - type: UseDelay + delay: 0.5 + - type: entity name: experimental hypospray suffix: Admeme @@ -123,7 +146,6 @@ - type: Tag tags: [] - - type: entity name: poison auto-injector parent: ChemicalMedipen diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 31d6831f37..5bb71ec04e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -338,6 +338,22 @@ items: - DefibrillatorOneHandedUnpowered +- type: entity + id: BorgModuleAdvancedTreatment + parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ] + name: advanced treatment cyborg module + components: + - type: Sprite + layers: + - state: medical + - state: icon-chemist + - type: ItemBorgModule + items: + - Beaker + - Beaker + - BorgDropper + - BorgHypo + # science modules # todo: if science ever gets their own custom robot, add more "sci" modules. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index a0e57d520f..8fbc2b2f95 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -278,6 +278,26 @@ - type: StaticPrice price: 40 +- type: entity + name: borgdropper + parent: Dropper + description: Used to transfer small amounts of chemical solution between containers. Extended for use by medical borgs. + id: BorgDropper + components: + - type: Sprite + sprite: Objects/Specific/Chemistry/dropper.rsi + layers: + - state: borgdropper + - state: dropper1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerManager + solutions: + injector: + maxVol: 10 + - type: Item + sprite: Objects/Specific/Chemistry/dropper.rsi + - type: entity name: syringe parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e86882028e..f0d774c1fd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -459,6 +459,7 @@ - BorgModuleDiagnosis - BorgModuleTreatment - BorgModuleDefibrillator + - BorgModuleAdvancedTreatment - RipleyHarness - RipleyLArm - RipleyRArm diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 6e56988ea5..4825adbe49 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -479,6 +479,16 @@ Plastic: 250 Gold: 50 +- type: latheRecipe + id: BorgModuleAdvancedTreatment + result: BorgModuleAdvancedTreatment + completetime: 3 + materials: + Steel: 500 + Glass: 750 + Plastic: 250 + Gold: 50 + - type: latheRecipe id: BorgModuleDefibrillator result: BorgModuleDefibrillator diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml index 6b3733c6aa..18145052ae 100644 --- a/Resources/Prototypes/Research/biochemical.yml +++ b/Resources/Prototypes/Research/biochemical.yml @@ -99,6 +99,7 @@ recipeUnlocks: - ChemMasterMachineCircuitboard - ChemDispenserMachineCircuitboard + - BorgModuleAdvancedTreatment technologyPrerequisites: - Chemistry diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png new file mode 100644 index 0000000000000000000000000000000000000000..ba86a60ed648c3033efa68d394eba82cb9faae13 GIT binary patch literal 291 zcmV+;0o?wHP)Px#-AP12R9J=WlPwQ|Kp4mW=PV@hVRHuhbxlAZQ}_UW3k+K9CW_xfNSdWOgHbW# z=7?udm@k{a=1F;e>Gs^q|M%SO0D>S0f~X)ALXHe$rRw}nRX70noZE#&D1_{3y8M*@ zs|p7IB(HP*cpfzkvMkG~El_mpb8b&}hq6A&2LOPv+}0MzvP|f@o-oGh3jmKBNIvUF zTrrFnYHy$*fLT7n#<)c5G<5=)a;cqh%CoO~e}ZSbGJvV{7j&x@%&=!jRmJ1pWs|xx p0nc{j^Y|~}?-H$q69hrD%?;T-NPy`~3x5Cr002ovPDHLkV1hw9dr1HQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json index e7e78c01a6..646becdd08 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "dropper" }, + { + "name": "borgdropper" + }, { "name": "dropper1" }, diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png index e96d92d7936308f2b3287c1e5ba1d04b59085710..e0eafad0f57ba4582f217106bc8707605bbaa872 100644 GIT binary patch delta 552 zcmV+@0@wY^1lk0UBNYGvb5ch_0Itp)=>Px%6iGxuR9J>fmM$gdxI>Nz|U&<`Dbsc}rW>cBHyRN#h+K!FaSX_ab z$z}idu3_MX5Y(!$EQ|W(ayj@8sHoTL5&(8fC44?Pq509}B{mWXYE}4&E^Pn+eq3D0 z<3Sq*M~4ob15+uYeI~CPL5Ni)$j8Eh$T@cyW0*`P q7~aO8-hc2AH`iBKS?T{g>*Vit%`g;?;G3Yfq!@4 zch;Fyiuzr{KrWY~*2P;bZ!AAEwD5WNPy&EntDDxA*YT8V&cBg|vp)j*~JRVd3>%|52y?X~|DSY~VfLcwH zl}hEF2{Q0;^aAZ~BfNd~TbaeSu79K1Y$~&N*Hsr*du?M6iz_fQx$OVmH4MBGf?5@p zWl_IeE(hNM74>>u0>DnGgfFM3G(Wn!!bT!NtqMQUr40bU&&x}B(rDoQ@o@|QIOlSB z7pL|3`VgjRE+wX7O$gEZn+>LE#^UQk{OF&@-0{DP6P$Bj6Z3aN2q6I=nSU*Y^F}1I z#hwtNx0%@rtOnqS8d@*<vDsXk_m zVQNsimoRiV=gw5bnVSzi`-KQ0oT-pA9g|?#XTPwFoO6dUhRI}t;a&Xs!$*&CdvlGj bOaBKR*Ve}v%=zB{0000> zTJJD0Jl{C`bMCc<-TyvzEoHj*;XIR9$>P6?+mG8t%$)8PT59%NNY>@ZobzXvuQL8? d1=PMq@Ah$hCL^cSj6kayJYD@<);T3K0RW&MMZ*99 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 681e84a96e..62f02dda7e 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -28,6 +28,9 @@ { "name": "icon-cables" }, + { + "name": "icon-chemist" + }, { "name": "icon-clown" }, -- 2.51.2