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 0000000000..d734fdc09f 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 1766f0a7de..fc70118da6 100644 --- 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 index 0000000000..d1f1db8a9b 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 fd4cad8ac2..cb583a878e 100644 --- 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 index 0000000000..1af13433c1 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 9229815601..345a622f3f 100644 --- 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" },