From c9f6d40e3e820f7422857c62716b63c767f4d111 Mon Sep 17 00:00:00 2001 From: Myzumi <34660019+Myzumi@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:13:17 +0100 Subject: [PATCH] Jetpack Module and Cyborg Action Icons for Our Modules (#2857) * Jetpack and Action Icons * Missed an Commit File * cyborg module can't hold blood-red magboots * Revert "cyborg module can't hold blood-red magboots" This reverts commit 16e650fdcdc59c4f43d876db4758bd035f787ba4. * Update Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --------- Co-authored-by: Whatstone Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Mobs/Cyborgs/base_borg_chassis.yml | 1 - .../Entities/Mobs/Player/silicon.yml | 3 ++- .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Research/industrial.yml | 1 + .../Specific/Robotics/borg_modules.yml | 23 ++++++++++++++++++ .../_NF/Recipes/Lathes/robotics.yml | 10 ++++++++ .../actions_borg.rsi/adv-drill-module.png | Bin 0 -> 861 bytes .../actions_borg.rsi/adv-paramed-module.png | Bin 0 -> 721 bytes .../actions_borg.rsi/jetpack-module.png | Bin 0 -> 682 bytes .../Actions/actions_borg.rsi/meta.json | 20 +++++++++++++++ .../Robotics/borgmodule.rsi/icon-jetpack.png | Bin 0 -> 303 bytes .../Robotics/borgmodule.rsi/meta.json | 3 +++ 12 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png create mode 100644 Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-paramed-module.png create mode 100644 Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/jetpack-module.png create mode 100644 Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 2ad69af3162..aba08ecd376 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -245,7 +245,6 @@ damageProtection: flatReductions: Heat: 10 # capable of touching light bulbs and stoves without feeling pain! - - type: JetpackUser # DeltaV: Lets cyborgs fly in space - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 8508ab7da38..d9f913cc2d4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -605,7 +605,8 @@ - PositronicBrain borg_module: - BorgModuleTool - - BorgModuleFireExtinguisher + # - BorgModuleFireExtinguisher # Frontier + - BorgModuleJetpack # Frontier - BorgModuleGPS - type: ItemSlots slots: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 76010ffc904..c312fedeadc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -686,6 +686,7 @@ - BorgModuleHarvesting - BorgModuleDefibrillator - BorgModuleAdvancedTreatment + - BorgModuleJetpack # Frontier - BorgModuleAdvancedParamedic # Frontier - BorgModuleAdvancedMining # Frontier - RipleyHarness diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 15846bc02be..629bba514db 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -172,6 +172,7 @@ - JawsOfLife - UtilityBeltChiefEngineer - BorgModuleAdvancedTool + - BorgModuleJetpack # Frontier - NFBlueprintPowerDrill # Frontier - NFBlueprintJawsOfLife # Frontier - NFBlueprintWelderExperimental # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml index b2363ef9eb0..a8ae08f6841 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -20,6 +20,8 @@ whitelist: components: - NFOreBag + - type: BorgModuleIcon + icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-drill-module } - type: entity id: BorgModuleAdvancedParamedic @@ -39,3 +41,24 @@ - Gauze10Lingering - Bloodpack10Lingering - SyringeBluespace + - type: BorgModuleIcon + icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: adv-paramed-module } + +- type: entity + id: BorgModuleJetpack + parent: [ BaseBorgModule, BaseProviderBorgModule ] + name: jetpack cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-jetpack + sprite: _NF/Objects/Specific/Robotics/borgmodule.rsi + - type: ItemBorgModule + droppableItems: + - id: JetpackMiniFilled + whitelist: + components: + - Jetpack + - type: BorgModuleIcon + icon: { sprite: _NF/Interface/Actions/actions_borg.rsi, state: jetpack-module } diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml index 50074bbf101..52faad3754a 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/robotics.yml @@ -19,3 +19,13 @@ Plastic: 250 Bluespace: 200 # OreBagOfHolding Bluepsace price Diamond: 100 # MiningDrillDiamond Diamond price + +- type: latheRecipe + id: BorgModuleJetpack + result: BorgModuleJetpack + parent: BaseBorgModuleRecipe + materials: + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/adv-drill-module.png new file mode 100644 index 0000000000000000000000000000000000000000..f49cf07293a51e5d6eb3c060d8806a4d1cd3dd26 GIT binary patch literal 861 zcmV-j1ETziP)Px%{YgYYR9J=Wmp@DsQ5?rVz5YGh@Tby%kQhSz%(+sm_VY&#fgwOIN;_$ zn2dvi18$ONVq)szV1fe@7vi81f!qd?5F|vKwx$J2Q(EBK;?VZ>FQp_L4*E+j_ulW` z-TQt&{k?lV_}9Zw+))(e@GK@(RaML@8u`gpRn>KJMNvvbn97tv!v$RhsH!SNR0sgT z(W0vWV!@JbrGR)uUjb#IJAvh=1GvXN7ZPVpz&$!u^ZKb1sBl~!dJ`yiyf86D-^1ye z<4;7O-x{czpWkn?AgGt`CK4fUWqR$ZM$#5AI$EKugVvXXJ_CXgQw1&4G&m%*^@m%0VW_2l?UuiEK48 z@n(q*r@dr+o<=B|z-*GR+sv$Q1Q;8+!TLr3vuQ~XsTLIilKbhLgA7iGjr&hN;A)Tw z$FgXP-RB9UGl$}y^^E|nZ7y-Xb`bK1{^JXO+tD#z;JIP zz7;!8$F?AlCvv&75iOMwHL$y<0al*9{+OLOR|7b5wN(!Rvq=)GVLoobD8;yUMdEh| zEGCIiG=Whv(9_k#%32fvqhw$!a=?pspNbqKT-Ut{?!4RtPx%aY;l$R9J=WmrqC(Q5e8~>$tP7in;W3X;)LMAUatCf|o>E3hZFFg1~d<&K)~< z?jnIu*sTr;#)fz@76v+thUSj3I-!I+Q!_hkhh=A-o&7V)t`Ygc!-uV+a(oY@e&g1t0e0n|W`X=tb#IX$~rk<1e@Wj`rr356_w9j)20`AO%jMWYT%db*E?HXt%ZLfi$#0=TprOHPq zA&|WCC~$CXbI~PnynoTLNXAoWn~SxR_IY{*ATyLmaqYoapy0NdC$v20ohhK@(iH+_ zDpdqJe4`!dB;&Uky%#5*972k8(V^XJsJr?vGCbW+GM*|CJl3-73tnFk0wGBz9PJ?- z?M4W}LAHlj9X&XF8QV1Yb@+pjBsZ_2AT>~QENnB6Z5r%n1~Brw6zb{K3xvkL;aI;Z zI@XC-QBwi~6Z;%|86`HpRZ|a6?qQqaoWQ?Jz`qP@5a^2~>gvQ)X#EI&;Jx4SmpeV|jT};aI z*RN*h@&~P4x2>~K>d^oI01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf Dl_^2| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/jetpack-module.png b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/jetpack-module.png new file mode 100644 index 0000000000000000000000000000000000000000..44043af340eef8468a5c2f5518ef5534b8429f91 GIT binary patch literal 682 zcmV;b0#*HqP)Px%N=ZaPR9J=Wm)~pJP#ncSixD4c*CJM!A{N&&>-qa z8@19-v{btYrS!(_AtY_gk2M|X2HW@P-mfS3dptP_C-AS=i-#Ls*MB_6P}4MnxxvC8 zZklGU!*yK`kx# zCJ>{*yY?1RN^kx4H6OoT#~#*gmASpW_10pS!Dtx;WmTXncB$9v?CtFVFdPo)x-J9z zlulzCfRpnDU9n5E*$m-e%)ma4C7VoOO@Tt8fDj_s3n93;xIi>3XqpCqqF9Nzh@x2) zaNT=Z?|Uvn2wJTc0C#tHjK||xT#~1f3B)K+DwQI=VzJ0*GyvHMcxHj6*xOPqu1+&dWK=Jxw#oU z1(szc;&S!C&CQK>h^pq}flgyP@!m=)nNFtwNGTI>oh`}9`64nVnZN_ain2;opjN8^ z;5beqPEnMw3Rx7em(Z(JeoFy+d=(jyP9TE^9LMnv$;$%(N5_}At{XVqFbwwh_dV#+ zd&J7+GSzC8!^6W6&iFKp{^hlLR30$CEV#P*z|PK2@bUoy$u~AO0MImze!tIbHp8AP z@#*TRiO60;XSE8Fj-Lhm@}1skY^S<@y)tFOlWP#oibrU!gnkS4({klg74XZBNm*(A zU)A50igjIowht4({`jZa|N04B6kB_d%Q?{i000hUSV?A0O#mtY000O800000007cc QlK=n!07*qoM6N<$f}|BVEdT%j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json new file mode 100644 index 00000000000..d9cd3afdecd --- /dev/null +++ b/Resources/Textures/_NF/Interface/Actions/actions_borg.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Made by GhostPrince for Frontier Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "adv-drill-module" + }, + { + "name": "adv-paramed-module" + }, + { + "name": "jetpack-module" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png b/Resources/Textures/_NF/Objects/Specific/Robotics/borgmodule.rsi/icon-jetpack.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7033ec2fed40d598cfbe156ccc2dd8030c3855 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgQ1GFr zi(^QHdvbyV>taO%DJB?kK=FXbs=wuZ`hU*rYqTwV`}lV_kJhx0DzlHftYWVFmzeP5 z>ud4D{0hpO)ASC1m)|d0_y6D756|UKmNl%(p5w_ebcip%-Lt@(6$WsMB4)L?~ZHs72j;rE1bH=;zhy6;oiQ-K6 z_tm96u&EGS^E0iDe?}Vnr~118Uh?cecFi(o@q5P