merge staging into master (#38799)

This commit is contained in:
slarticodefast
2025-07-06 15:21:26 +02:00
committed by GitHub
8 changed files with 25 additions and 4 deletions

View File

@@ -579,6 +579,7 @@
- Hardsuit - Hardsuit
- WhitelistChameleon - WhitelistChameleon
- CorgiWearable - CorgiWearable
- ScurretWearable
- type: StaticPrice - type: StaticPrice
price: 5000 price: 5000

View File

@@ -62,6 +62,7 @@
- type: Tag - type: Tag
tags: tags:
- CorgiWearable - CorgiWearable
- ScurretWearable
- MonkeyWearable - MonkeyWearable
- WhitelistChameleon - WhitelistChameleon

View File

@@ -59,3 +59,13 @@
dependsOnComponents: dependsOnComponents:
- type: AllowSuitStorage - type: AllowSuitStorage
displayName: Suit Storage displayName: Suit Storage
- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
stripTime: 6
uiWindowPos: 0,3
strippingWindowPos: 1,3
displayName: Suit
whitelist:
tags:
- ScurretWearable

View File

@@ -225,7 +225,6 @@
- type: Tag - type: Tag
id: CanPilot id: CanPilot
- type: Tag - type: Tag
id: CaptainSabre id: CaptainSabre
@@ -1203,6 +1202,9 @@
- type: Tag - type: Tag
id: Screwdriver id: Screwdriver
- type: Tag # Flags items that scurrets can wear in their back and outerwear slots.
id: ScurretWearable
- type: Tag - type: Tag
id: SecBeltEquip id: SecBeltEquip
@@ -1517,5 +1519,4 @@
- type: Tag - type: Tag
id: XenoborgModuleStealth id: XenoborgModuleStealth
# ALPHABETICAL # ALPHABETICAL

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -1,7 +1,7 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub)", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14, equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by casiliuscestus (GitHub), equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (Github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
@@ -26,6 +26,10 @@
"name": "equipped-OUTERCLOTHING-dog", "name": "equipped-OUTERCLOTHING-dog",
"directions": 4 "directions": 4
}, },
{
"name": "equipped-OUTERCLOTHING-scurret",
"directions": 4
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,7 +1,7 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub).", "copyright": "Sprites by Flareguy, cboyjet, & monkey-suit sprite by Kittygyat, modified from space suit sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34. Vox state based off of biosuit, taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79. equipped-OUTERCLOTHING-dog modified from equipped-OUTERCLOTHING by Sparlight (GitHub). equipped-OUTERCLOTHING-scurret modified from equipped-OUTERCLOTHING by FairlySadPanda (GitHub)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
@@ -26,6 +26,10 @@
"name": "equipped-OUTERCLOTHING-dog", "name": "equipped-OUTERCLOTHING-dog",
"directions": 4 "directions": 4
}, },
{
"name": "equipped-OUTERCLOTHING-scurret",
"directions": 4
},
{ {
"name": "inhand-left", "name": "inhand-left",
"directions": 4 "directions": 4