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

[Resprite] Lizard digitigrade #1465

Merged
merged 43 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
4077316
Update reptilian bodyparts
Morb0 Aug 8, 2023
df307bd
Update reptilian markings
Morb0 Aug 8, 2023
a7058ee
Update tail markings
Morb0 Aug 8, 2023
de2c0ea
Add digitigrade reptilian legs
Morb0 Aug 8, 2023
14e6047
Update tails
Morb0 Aug 8, 2023
89106ff
Update tails mask for digitigrade
Morb0 Aug 8, 2023
9d903ae
Set reptilian digitigrade species item visualization
Morb0 Aug 8, 2023
e2ce560
Remove shoes for reptilians
Morb0 Aug 9, 2023
abedd29
Update digitigrade legs sprite to support digi clothes
Morb0 Aug 9, 2023
e0b67a3
Add digitigrade version to 55 jumpsuits
Morb0 Aug 9, 2023
3157df1
Update ancient voidsuit sprite
Morb0 Aug 17, 2023
f28833e
Add digitigrade version to 22 outerclothes
Morb0 Aug 17, 2023
de6f527
Add selfmade digi jumpsuits
Morb0 Sep 13, 2023
20ee8e4
Add outerclothes selfmade digi sprites
Morb0 Sep 13, 2023
54651b9
Fix some sprites
Morb0 Sep 13, 2023
be7a277
Add digi selfmade mask sprites
Morb0 Sep 13, 2023
4f1b775
add missed digi for jumpsuits
Morb0 Sep 16, 2023
52ee260
Fix ert hardsuit alpha pixel & add digi
Morb0 Sep 16, 2023
f184c05
Add color jumpsuits digi sprites
Morb0 Sep 16, 2023
e431f10
Add tacticool digi state
Morb0 Sep 16, 2023
fb1d112
Add shoes digi sprites
Morb0 Sep 16, 2023
d5ee02c
Fix nanotrasen jumpsuit state name
Morb0 Sep 16, 2023
5f9e49b
Add missing digi states of color jumpsuits to meta
Morb0 Sep 16, 2023
9c9fcbf
Revert "Remove shoes for reptilians"
Morb0 Sep 16, 2023
a46e776
Add ert hardsuit digi states
Morb0 Sep 16, 2023
f619350
Fix lawyer blue rsi
Morb0 Sep 22, 2023
ddafc7f
Add digi shoes sprites
Morb0 Sep 22, 2023
8edc24a
Fix hos digi state
Morb0 Sep 22, 2023
045b145
Add cluwne shoes digi state
Morb0 Sep 22, 2023
26902e5
Add Corvax custom clothes digi states
Morb0 Sep 25, 2023
0f25f72
Add damedane shoes digi state
Morb0 Sep 25, 2023
aa2c01f
Update meta.json digi copyright
Morb0 Sep 25, 2023
d0d6743
Merge branch 'master-syndie' into lizard-digitigrade
Morb0 Sep 25, 2023
3a5c5ba
Fix dummy digi display
Morb0 Sep 27, 2023
5100ffd
Fix lawyer good file name
Morb0 Sep 27, 2023
5c46fe5
Add labcoats digi state
Morb0 Sep 27, 2023
6cf68cf
Update copyright contributors info
Morb0 Sep 27, 2023
7b60eef
Return labcoats default state
Morb0 Sep 27, 2023
3416901
Add missing states
Morb0 Sep 27, 2023
7ebe79a
Return chem labcoat rsi states
Morb0 Sep 27, 2023
66bbc1a
Add missing digi state for damedane outfit
Morb0 Sep 27, 2023
a1da8f6
Add missing digi state for centcomformal
Morb0 Sep 27, 2023
9e96854
Merge remote-tracking branch 'syndie/master' into lizard-digitigrade
Morb0 Oct 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions Resources/Prototypes/Corvax/Species/reptilian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: humanoidBaseSprite
id: MobReptilianLLegDigi
baseSprite:
sprite: Corvax/Mobs/Species/Reptilian/parts.rsi
state: l_leg_digi

- type: humanoidBaseSprite
id: MobReptilianLFootDigi
baseSprite:
sprite: Corvax/Mobs/Species/Reptilian/parts.rsi
state: l_foot_digi

- type: humanoidBaseSprite
id: MobReptilianRLegDigi
baseSprite:
sprite: Corvax/Mobs/Species/Reptilian/parts.rsi
state: r_leg_digi

- type: humanoidBaseSprite
id: MobReptilianRFootDigi
baseSprite:
sprite: Corvax/Mobs/Species/Reptilian/parts.rsi
state: r_foot_digi
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- type: Body
prototype: Reptilian
requiredLegs: 2
- type: Inventory
speciesId: digi
- type: Butcherable
butcheringType: Spike
spawned:
Expand Down Expand Up @@ -68,5 +70,7 @@
components:
- type: HumanoidAppearance
species: Reptilian
- type: Inventory
speciesId: digi

#Weh
8 changes: 4 additions & 4 deletions Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
RArm: MobReptilianRArm
LHand: MobReptilianLHand
RHand: MobReptilianRHand
LLeg: MobReptilianLLeg
RLeg: MobReptilianRLeg
LFoot: MobReptilianLFoot
RFoot: MobReptilianRFoot
LLeg: MobReptilianLLegDigi # Corvax-Digitigrade
RLeg: MobReptilianRLegDigi # Corvax-Digitigrade
LFoot: MobReptilianLFootDigi # Corvax-Digitigrade
RFoot: MobReptilianRFootDigi # Corvax-Digitigrade

- type: markingPoints
id: MobReptilianMarkingLimits
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/bat.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/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi",
"copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/bear.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/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi",
"copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/bee.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/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi",
"copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/breath.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -65,6 +65,10 @@
{
"name": "equipped-MASK-kangaroo",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/clown.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-MASK-hamster",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/cluwne.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": "Made by brainfood1183 (github) for ss14",
"copyright": "Made by brainfood1183 (github) for ss14, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/ert.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": "Made by Nimfar11 (GitHub) for Space Station 14",
"copyright": "Made by Nimfar11 (GitHub) for Space Station 14, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/fox.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/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi",
"copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/gas.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -18,6 +18,10 @@
"name": "equipped-MASK-hamster",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/gascaptain.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/4f6190e2895e09116663ef282d3ce1d8b35c032e, remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/gascentcom.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
},
{
"name": "up-equipped-MASK",
"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 tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
},
{
"name": "up-equipped-MASK",
"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.
12 changes: 11 additions & 1 deletion Resources/Textures/Clothing/Mask/gassyndicate.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/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -20,6 +20,16 @@
[ 0.5, 0.5, 0.5 ]
]
},
{
"name": "equipped-MASK-digi",
"directions": 4,
"delays": [
[ 0.5, 0.5, 0.5 ],
[ 0.5, 0.5, 0.5 ],
[ 0.5, 0.5, 0.5 ],
[ 0.5, 0.5, 0.5 ]
]
},
{
"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.
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/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"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.
6 changes: 5 additions & 1 deletion Resources/Textures/Clothing/Mask/jackal.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/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi",
"copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi, digi made by kuro(388673708753027083)",
"size": {
"x": 32,
"y": 32
Expand All @@ -13,6 +13,10 @@
{
"name": "equipped-MASK",
"directions": 4
},
{
"name": "equipped-MASK-digi",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading