Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better insectoid glasses (round 2) #1670

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
spawned:
- id: FoodMeatSpider
amount: 5
- type: Inventory
templateId: arachnid
speciesId: arachnid # DeltaV - allow arachnid clothing sprite variants
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add the speciesId bit to the existing Inventory component at the bottom (dont remove it just to place it here)

- type: Reactive
reactions:
- reagents: [Water]
Expand Down Expand Up @@ -112,8 +115,6 @@
sprite: "Effects/creampie.rsi"
state: "creampie_arachnid"
visible: false
- type: Inventory
templateId: arachnid


- type: entity
Expand All @@ -123,6 +124,8 @@
components:
- type: HumanoidAppearance
species: Arachnid
- type: Inventory
speciesId: arachnid #DeltaV - Allows the "dummy" in th elobby menu to wear the arachnid sprites
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

th elobby :trollface:



#>88w88<
16 changes: 9 additions & 7 deletions Resources/Prototypes/Entities/Mobs/Species/moth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
- type: Icon
sprite: Mobs/Species/Moth/parts.rsi
state: full
- type: Inventory
speciesId: moth # Deltav - allows moth clothing sprite variants
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same, dont move it for no reason

femaleDisplacements:
jumpsuit:
sizeMaps:
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female
- type: Body
prototype: Moth
requiredLegs: 2
Expand Down Expand Up @@ -114,13 +122,6 @@
sprite: "Effects/creampie.rsi"
state: "creampie_moth"
visible: false
- type: Inventory
femaleDisplacements:
jumpsuit:
sizeMaps:
32:
sprite: Mobs/Species/Human/displacement.rsi
state: jumpsuit-female


- type: entity
Expand All @@ -131,6 +132,7 @@
- type: HumanoidAppearance
species: Moth
- type: Inventory
speciesId: moth #DeltaV - allows the "dummy" in the lobby menu to wear the moth sprites
femaleDisplacements:
jumpsuit:
sizeMaps:
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion Resources/Textures/Clothing/Eyes/Glasses/gar.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-arachnid motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -28,6 +28,18 @@
"name": "super-equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "alt-equipped-EYES-arachnid",
"directions": 4
},
{
"name": "super-equipped-EYES-arachnid",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,18 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,18 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by MACMAN2003",
"copyright": "Sprited by MACMAN2003. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson.",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem.",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "equipped-EYES-secdog",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from paradise station https://github.com/ParadiseSS13/Paradise/commit/ede55cc8f5b50abcd4f51d37779b56853a440a9a",
"copyright": "Taken from paradise station https://github.com/ParadiseSS13/Paradise/commit/ede55cc8f5b50abcd4f51d37779b56853a440a9a, equipped-EYES-arachnid motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and modified by лазік#7305. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES-hamster by TJohnson.",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES-hamster by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,18 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "equipped-EYES-secdog",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson.",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "equipped-EYES-secdog",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,14 @@
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. Equipped-EYES-arachnid and equipped-EYES-moth motified from equipped-EYES, inhand-left and inhand-right motified from inhand-left and inhand-right from the glasses folder by HTMLSystem",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,22 @@
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-arachnid",
"directions": 4
},
{
"name": "equipped-EYES-moth",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Loading