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

diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 85be8ece4529a5d261b4d2a023385c591578d58f..b0f38f37ea10471eea1ea587e3e5ed6d6fb0f966 100644 (file)
--- 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 fd20778e9e586e6f368ef8f29ebe6c7d4becac9d..e023133f2720050a1f1c862ffa8eaafc24ef4307 100644 (file)
--- 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 23d7b68d37d9a8f223ff49acb9a1f222f2a5ba28..78873a8f46d40101b819364be34191910e5a120d 100644 (file)
--- 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 2db59977be4725f610b3ec2b1b656ee2e7b11000..5d47f01544b90d7403509c643e18e91391cbb898 100644 (file)
--- 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 9465d7b87ad8b2e2c976bb9c2f49ee463835df8b..51f32d000e10d2acaa6028fb9c673b3635bafbd6 100644 (file)
--- 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 (file)
index 0000000..d734fdc
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/artistry-module.png differ

diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index 1766f0a7dea0e9fe63a11e2b5e18a3ee62e8bdce..fc70118da6d9fdb6b7e006c2278d7d13b69fb1ef 100644 (file)
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, inflatable module by FungiFellow (GitHub), Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA.  c20r and esword by RedBookcase on Github.",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, inflatable module by FungiFellow (GitHub), Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA.  c20r and esword by RedBookcase on Github, artistry-module by Kittygyat, with help from TiniestShark",
     "size": {
         "x": 32,
         "y": 32
@@ -25,6 +25,9 @@
         {
             "name":"extinguisher-module"
         },
+        {
+            "name":"artistry-module"
+        },
         {
             "name":"geiger-module"
         },

diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/electric.png b/Resources/Textures/Objects/Fun/crayons.rsi/electric.png
new file mode 100644 (file)
index 0000000..d1f1db8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/crayons.rsi/electric.png differ

diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
index fd4cad8ac25f3f46a63526a7838dccb9e46de297..cb583a878ef62ca233c7b6aa964b6d511642816f 100644 (file)
--- a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser",
+  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser, electric crayon by Kittygyat",
   "size": {
     "x": 32,
     "y": 32
@@ -40,6 +40,9 @@
       "name": "box-inhand-right",
       "directions": 4
     },
+    {
+      "name": "electric"
+    },
     {
       "name": "green"
     },

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png
new file mode 100644 (file)
index 0000000..1af1343
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-artistry.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 922981560111639137f20d7d525cd67162279ee7..345a622f3f8c9f6c9399148cbb7d2caf3a59ee82 100644 (file)
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github)",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github), icon-artistry by Kittygyat",
     "size": {
         "x": 32,
         "y": 32
@@ -55,6 +55,9 @@
         {
             "name": "icon-fire-extinguisher"
         },
+        {
+            "name": "icon-artistry"
+        },
         {
             "name": "icon-gardening"
         },