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
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
abstract: true
|
abstract: true
|
||||||
parent: BaseItem
|
parent: BaseItem
|
||||||
id: Crayon
|
id: CrayonInedible
|
||||||
name: crayon
|
name: crayon
|
||||||
description: A colourful crayon. Looks tasty. Mmmm...
|
description: A colourful crayon. Looks tasty. Mmmm...
|
||||||
components:
|
components:
|
||||||
@@ -24,7 +24,25 @@
|
|||||||
selectedState: like
|
selectedState: like
|
||||||
- type: LimitedCharges
|
- type: LimitedCharges
|
||||||
maxCharges: 25
|
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
|
- type: FlavorProfile
|
||||||
flavors:
|
flavors:
|
||||||
- chewy
|
- chewy
|
||||||
@@ -37,8 +55,6 @@
|
|||||||
Quantity: 3
|
Quantity: 3
|
||||||
- ReagentId: MindbreakerToxin
|
- ReagentId: MindbreakerToxin
|
||||||
Quantity: 2
|
Quantity: 2
|
||||||
- type: StaticPrice
|
|
||||||
price: 5
|
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: Crayon
|
parent: Crayon
|
||||||
@@ -109,6 +125,30 @@
|
|||||||
- type: AutoRecharge
|
- type: AutoRecharge
|
||||||
rechargeDuration: 5
|
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
|
- type: entity
|
||||||
parent: Crayon
|
parent: Crayon
|
||||||
id: CrayonBlack
|
id: CrayonBlack
|
||||||
|
|||||||
@@ -450,6 +450,23 @@
|
|||||||
- type: BorgModuleIcon
|
- type: BorgModuleIcon
|
||||||
icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
|
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
|
- type: entity
|
||||||
id: BorgModuleFireExtinguisher
|
id: BorgModuleFireExtinguisher
|
||||||
parent: [ BaseBorgModule, BaseProviderBorgModule ]
|
parent: [ BaseBorgModule, BaseProviderBorgModule ]
|
||||||
|
|||||||
@@ -47,6 +47,16 @@
|
|||||||
- type: AutoRecharge
|
- type: AutoRecharge
|
||||||
rechargeDuration: 1
|
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
|
- type: entity
|
||||||
parent: SprayPainter
|
parent: SprayPainter
|
||||||
id: SprayPainterEmpty
|
id: SprayPainterEmpty
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
- BorgModuleCable
|
- BorgModuleCable
|
||||||
- BorgModuleFireExtinguisher
|
- BorgModuleFireExtinguisher
|
||||||
- BorgModuleInflatable
|
- BorgModuleInflatable
|
||||||
|
- BorgModuleArtistry
|
||||||
|
|
||||||
- type: latheRecipePack
|
- type: latheRecipePack
|
||||||
id: BorgLimbsStatic
|
id: BorgLimbsStatic
|
||||||
|
|||||||
@@ -42,6 +42,11 @@
|
|||||||
id: BorgModuleInflatable
|
id: BorgModuleInflatable
|
||||||
result: BorgModuleInflatable
|
result: BorgModuleInflatable
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
parent: BaseBorgModuleRecipe
|
||||||
|
id: BorgModuleArtistry
|
||||||
|
result: BorgModuleArtistry
|
||||||
|
|
||||||
# Cargo Modules
|
# Cargo Modules
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 857 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"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": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -25,6 +25,9 @@
|
|||||||
{
|
{
|
||||||
"name":"extinguisher-module"
|
"name":"extinguisher-module"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name":"artistry-module"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name":"geiger-module"
|
"name":"geiger-module"
|
||||||
},
|
},
|
||||||
|
|||||||
BIN
Resources/Textures/Objects/Fun/crayons.rsi/electric.png
Normal file
BIN
Resources/Textures/Objects/Fun/crayons.rsi/electric.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 235 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"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": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -40,6 +40,9 @@
|
|||||||
"name": "box-inhand-right",
|
"name": "box-inhand-right",
|
||||||
"directions": 4
|
"directions": 4
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "electric"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "green"
|
"name": "green"
|
||||||
},
|
},
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 237 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC0-1.0",
|
"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": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -55,6 +55,9 @@
|
|||||||
{
|
{
|
||||||
"name": "icon-fire-extinguisher"
|
"name": "icon-fire-extinguisher"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "icon-artistry"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "icon-gardening"
|
"name": "icon-gardening"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user