Merge remote-tracking branch 'WD-core/master' into upstream-core

This commit is contained in:
BIGZi0348
2025-02-09 20:09:27 +03:00
37 changed files with 1981 additions and 497 deletions

View File

@@ -195,32 +195,6 @@
- type: EyeProtection
protectionTime: 5
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesMercenaryMeaty
name: mercenary glasses
description: Glasses made for combat.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/mercglasses.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/mercglasses.rsi
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesSunglassesMeaty
name: sun glasses
description: Useful both for security and cargonia.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: Tag
tags:
- HamsterWearable
- WhitelistChameleon
#Make a scanner category when these actually function and we get the trayson
- type: entity
parent: ClothingEyesBase

View File

@@ -311,3 +311,5 @@
sprite: Clothing/Neck/Cloaks/inspector.rsi
- type: TypingIndicatorClothing
proto: lawyer
- type: StealTarget
stealGroup: HeadCloak

View File

@@ -400,29 +400,6 @@
- type: Clothing
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatSyndieCapMeaty
name: syndicate's coat
description: The syndicate's coat is made of durable fabric, with gilded patterns.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatSyndieCapArmoredMeaty
name: syndicate's armored coat
description: The syndicate's armored coat is made of durable fabric, with gilded patterns.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing] # WD added AllowSuitStorageClothing
id: ClothingOuterCoatAMG

View File

@@ -541,39 +541,6 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterWeb
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterWinterSyndieCapMeaty
name: syndicate's winter coat
description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool."
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterWinterSyndieCapArmoredMeaty
name: syndicate's armored winter coat
description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool."
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterWinterSyndieMeaty
name: syndicate's winter coat
description: Insulated winter coat, looks like a merch from "Syndieland"
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterWinterInspector