From 2f0538fa9aa599fde967ae3a26223d93469b359f Mon Sep 17 00:00:00 2001 From: Kittygyat <202250949+Kittygyat@users.noreply.github.com> Date: Sat, 18 Oct 2025 08:02:15 +0100 Subject: [PATCH] Made a new generic borg module for art; the Artistry Module! (#39679) * Made a new generic borg module for art; the Artistry Module! * Made requested changes, changed the crayon emptyRepresentatives * Did the thing. * Added updated action sprite,with thanks to TiniestShark, also Attempted to fix the merge conflict * changed empty representative of red to rainbow * Added recharging crayon 'Electric Crayon' and sprite to the borg module, removed redundant extra crayon slot. * Added requested changes, replaced old spraypainter with new recharging borg spraypainter * Forgot to readd the recyclable tag to Crayon * Removed compressed paint hand --- .../Entities/Objects/Fun/crayons.yml | 48 ++++++++++++++++-- .../Specific/Robotics/borg_modules.yml | 17 +++++++ .../Entities/Objects/Tools/spray_painter.yml | 10 ++++ .../Recipes/Lathes/Packs/robotics.yml | 1 + .../Recipes/Lathes/robot_modules.yml | 5 ++ .../actions_borg.rsi/artistry-module.png | Bin 0 -> 857 bytes .../Actions/actions_borg.rsi/meta.json | 5 +- .../Objects/Fun/crayons.rsi/electric.png | Bin 0 -> 235 bytes .../Objects/Fun/crayons.rsi/meta.json | 5 +- .../Robotics/borgmodule.rsi/icon-artistry.png | Bin 0 -> 237 bytes .../Robotics/borgmodule.rsi/meta.json | 5 +- 11 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png create mode 100644 Resources/Textures/Objects/Fun/crayons.rsi/electric.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 85be8ece45..b0f38f37ea 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -1,7 +1,7 @@ - type: entity abstract: true parent: BaseItem - id: Crayon + id: CrayonInedible name: crayon description: A colourful crayon. Looks tasty. Mmmm... components: @@ -24,7 +24,25 @@ selectedState: like - type: LimitedCharges maxCharges: 25 - - type: Food + - type: StaticPrice + price: 5 + +- type: entity + abstract: true + parent: CrayonInedible + id: Crayon + name: crayon + description: A colourful crayon. Looks tasty. Mmmm... + components: + - type: Sprite + sprite: Objects/Fun/crayons.rsi + - type: Item + sprite: Objects/Fun/crayons.rsi + size: Tiny + - type: Tag + tags: + - Recyclable + - type: Edible - type: FlavorProfile flavors: - chewy @@ -37,8 +55,6 @@ Quantity: 3 - ReagentId: MindbreakerToxin Quantity: 2 - - type: StaticPrice - price: 5 - type: entity parent: Crayon @@ -109,6 +125,30 @@ - type: AutoRecharge rechargeDuration: 5 +- type: entity + parent: CrayonInedible + id: CrayonBorg + name: electric crayon + description: Supposedly the most delicious crayon type in all the universes; unfortunately, you cannot eat. + components: + - type: Sprite + state: electric + - type: Item + heldPrefix: electric + - type: Crayon + deleteEmpty: false + color: Red + selectableColor: true + - type: LimitedCharges + maxCharges: 30 + - type: AutoRecharge + rechargeDuration: 5 + - type: Tag + tags: + - Write + - Crayon + - Trash + - type: entity parent: Crayon id: CrayonBlack diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index fd20778e9e..e023133f27 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -450,6 +450,23 @@ - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module } +- type: entity + id: BorgModuleArtistry + parent: [ BaseBorgModule, BaseProviderBorgModule ] + name: artistry cyborg module + description: A module for arts & crafts whilst the station burns! + components: + - type: Sprite + layers: + - state: generic + - state: icon-artistry + - type: ItemBorgModule + hands: + - item: SprayPainterBorg + - item: CrayonBorg + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: artistry-module } + - type: entity id: BorgModuleFireExtinguisher parent: [ BaseBorgModule, BaseProviderBorgModule ] diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml index 23d7b68d37..78873a8f46 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml @@ -47,6 +47,16 @@ - type: AutoRecharge rechargeDuration: 1 +- type: entity + parent: SprayPainter + name: experimental spray painter + description: An experimental recharging spray painter that can infinitely replicate compressed paint. + id: SprayPainterBorg + suffix: Borg + components: + - type: AutoRecharge + rechargeDuration: 5 + - type: entity parent: SprayPainter id: SprayPainterEmpty diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml index 2db59977be..5d47f01544 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml @@ -15,6 +15,7 @@ - BorgModuleCable - BorgModuleFireExtinguisher - BorgModuleInflatable + - BorgModuleArtistry - type: latheRecipePack id: BorgLimbsStatic diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml index 9465d7b87a..51f32d000e 100644 --- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml +++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml @@ -42,6 +42,11 @@ id: BorgModuleInflatable result: BorgModuleInflatable +- type: latheRecipe + parent: BaseBorgModuleRecipe + id: BorgModuleArtistry + result: BorgModuleArtistry + # Cargo Modules - type: latheRecipe diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png new file mode 100644 index 0000000000000000000000000000000000000000..d734fdc09fb802ee99699efb73cbcb5f81e82d08 GIT binary patch literal 857 zcmV-f1E&0mP)Px&6G=otR9J=WmrrQZa1_TsitI3&{ecl;L$}f$q=-R@y2HE(f*_1CCc>_67d?6L zxYIx!yLeJT0$$v}%fzAEz=5D;=oW;4v~D;kqceoTTw8ir2YOhWCQZ_Ix{07)_|g25 z_kQpD`{upZU*KQIG3P{8)gON%sIKdFT>GLDT-Ws@4X&!Hi^PcND1h=Zj3LN(s6t-L=-oEDmduIms!1HkyL8vsmAO(6&ZvMk$9*=#m&gHAhubUN);D3wB0RsSleC@_Ba zHX|b=HUWT0BoY|Z38&r0#s&a`gM$Ff%*=S~Jp?Mj!{@I85O0TkKF{pztZg$eFc3(< zPl0<+E56?S24_t9eWeNzmpka~?L|=(6h&cTVj|G37OCv_y3d0NxT?XM^~GY5OsUPD z_eEL}MG*kYviPu3^jW8wDyYCw1+px=c5m;hY*PttSr(RMF*GzpU!>JjQGQk6QNVux zHglhv4|S0#K~HCnOsNgiG!aD+MNtq00RYo9{d-EoPDu6r$K{UT-2)i_wxF|xWHN~? z%S5A5^7*`LoqF&m&|vqqkfhdXQ2U-lrd0I$A4GvvVSk#L@Jj|jo5C-)g19tL3Y*}TU$un%mmEcn-Pz{qUx zvb40s=;$b!?OiBrkzJlg6h)?|r+M@7b8~%Q?9uZoiFEaR7^KMN%7T5ZY1+PjsEe=f zUJwq40l1L3Sf+kj2(eg<)zwu_UB2G%zo6+ep`R*#=BLTj-zSS$mh%1h z|L%5q+k%zBj(iC$f=igZWIo7;@NyRxHoZ|fT{OY1NcO}3o9+HQK}nu;l90tHMW6aewNtbH;U$hhrR^+^jpC!cXMW7 Y2;ZaF>&p}R2taO%DJB?kK=FXbs=t?)`To||)I6CmX)4e4s`SotPuX zy^^mX^4}X3?U>b_l}5}b1fMWWiv1H2^uqqkrwfnWCBveln%_<}`hQm8_aE7l&kQF% z&YB=M;pu(jn+Hr(8*