diff --git a/Resources/Prototypes/Chemistry/metabolism_groups.yml b/Resources/Prototypes/Chemistry/metabolism_groups.yml index db1129db7f7..3c4c20a518f 100644 --- a/Resources/Prototypes/Chemistry/metabolism_groups.yml +++ b/Resources/Prototypes/Chemistry/metabolism_groups.yml @@ -25,6 +25,7 @@ - type: metabolismGroup id: Calm + name: metabolism-group-calm # Used for gases that have effects on being inhaled - type: metabolismGroup diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index e9aa128fb5d..a7736116fb0 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -579,8 +579,8 @@ components: - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: Sprite sprite: Clothing/Neck/Misc/holster.rsi - type: Clothing @@ -623,8 +623,8 @@ - CartridgeAmmo - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 0bda6026dc8..c0efa7dab8f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -62,29 +62,29 @@ name: welding gas mask description: A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd. components: - - type: Sprite - sprite: Clothing/Mask/welding-gas.rsi - state: icon - - type: Clothing - sprite: Clothing/Mask/welding-gas.rsi - - type: BreathMask - - type: IngestionBlocker - - type: IdentityBlocker - - type: FlashImmunity - - type: EyeProtection - - type: PhysicalComposition - materialComposition: - Steel: 200 - Glass: 100 - - type: StaticPrice - price: 100 - - type: Tag - tags: - - WhitelistChameleon - - type: HideLayerClothing - slots: - - Snout + - type: Sprite + sprite: Clothing/Mask/welding-gas.rsi + state: icon + - type: Clothing + sprite: Clothing/Mask/welding-gas.rsi + - type: BreathMask + - type: IngestionBlocker + - type: IdentityBlocker + - type: FlashImmunity + - type: EyeProtection + - type: PhysicalComposition + materialComposition: + Steel: 200 + Glass: 100 + - type: StaticPrice + price: 100 + - type: Tag + tags: + - WhitelistChameleon - IPCMaskWearable # Estacao Pirata - IPCs + - type: HideLayerClothing + slots: + - Snout # Corvax-HiddenDesc-Start - type: HiddenDescription entries: diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 055c3b16378..a0bdc96d79a 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -1,7 +1,7 @@ # vocal emotes - type: emote id: Scream - # name: chat-emote-name-scream + name: chat-emote-name-scream category: Vocal # icon: Interface/Actions/scream.png # whitelist: @@ -47,7 +47,7 @@ - type: emote id: Laugh - # name: chat-emote-name-laugh + name: chat-emote-name-laugh category: Vocal # icon: Interface/Emotes/laugh.png # whitelist: @@ -105,7 +105,7 @@ - type: emote id: Honk - # name: chat-emote-name-honk + name: chat-emote-name-honk category: Vocal # icon: Interface/Emotes/honk.png # whitelist: @@ -135,7 +135,7 @@ - type: emote id: Sigh - # name: chat-emote-name-sigh + name: chat-emote-name-sigh category: Vocal # icon: Interface/Emotes/sigh.png # whitelist: @@ -163,7 +163,7 @@ - type: emote id: Whistle - # name: chat-emote-name-whistle + name: chat-emote-name-whistle category: Vocal # icon: Interface/Emotes/whistle.png # whitelist: @@ -194,7 +194,7 @@ - type: emote id: Crying - # name: chat-emote-name-crying + name: chat-emote-name-crying category: Vocal # icon: Interface/Emotes/cry.png # whitelist: @@ -233,7 +233,7 @@ - type: emote id: Squish - # name: chat-emote-name-squish + name: chat-emote-name-squish category: Vocal # available: false # icon: Interface/Emotes/squish.png @@ -262,7 +262,7 @@ - type: emote id: Chitter - # name: chat-emote-name-chitter + name: chat-emote-name-chitter category: Vocal # available: false # icon: Interface/Emotes/chitter.png @@ -291,7 +291,7 @@ - type: emote id: Squeak - # name: chat-emote-name-squeak + name: chat-emote-name-squeak category: Vocal # available: false # icon: Interface/Emotes/squeak.png @@ -320,7 +320,7 @@ - type: emote id: Click - # name: chat-emote-name-click + name: chat-emote-name-click category: Vocal # available: false # icon: Interface/Emotes/click.png @@ -350,7 +350,7 @@ # hand emotes - type: emote id: Clap - # name: chat-emote-name-clap + name: chat-emote-name-clap category: Hands # icon: Interface/Emotes/clap.png # whitelist: @@ -385,7 +385,7 @@ - type: emote id: Snap - # name: chat-emote-name-snap + name: chat-emote-name-snap category: Hands # icon: Interface/Emotes/snap.png # whitelist: @@ -434,7 +434,7 @@ - type: emote id: Salute - # name: chat-emote-name-salute + name: chat-emote-name-salute category: Hands # icon: Interface/Emotes/salute.png # whitelist: @@ -468,7 +468,7 @@ - type: emote id: Gasp - # name: chat-emote-name-gasp + name: chat-emote-name-gasp # whitelist: # components: # - Respirator @@ -486,7 +486,7 @@ - type: emote id: DefaultDeathgasp - # name: chat-emote-name-deathgasp + name: chat-emote-name-deathgasp # icon: Interface/Emotes/deathgasp.png # whitelist: # components: @@ -510,7 +510,7 @@ - type: emote id: Buzz - # name: chat-emote-name-buzz + name: chat-emote-name-buzz category: Vocal # icon: Interface/Emotes/buzz.png # whitelist: @@ -546,14 +546,14 @@ - type: emote id: Weh - # name: chat-emote-name-weh + name: chat-emote-name-weh category: Vocal # icon: Interface/Emotes/weh.png chatMessages: [издаёт вех!] - type: emote id: Chirp - # name: chat-emote-name-chirp + name: chat-emote-name-chirp category: Vocal # icon: Interface/Emotes/chirp.png # whitelist: @@ -622,7 +622,7 @@ - type: emote id: Chime - # name: chat-emote-name-chime + name: chat-emote-name-chime category: Vocal # icon: Interface/Emotes/chime.png # whitelist: @@ -652,7 +652,7 @@ - type: emote id: Buzz-Two - # name: chat-emote-name-buzztwo + name: chat-emote-name-buzztwo category: Vocal # icon: Interface/Emotes/buzztwo.png # whitelist: @@ -715,7 +715,7 @@ - type: emote id: Ping - # name: chat-emote-name-ping + name: chat-emote-name-ping category: Vocal # icon: Interface/Emotes/ping.png # whitelist: diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml index 799e3c16589..be38a282e57 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/MediKitibot.yml @@ -1,68 +1,68 @@ -- type: entity - id: LPPBorgChassisMedicalKiti - parent: [BaseBorgChassisNT] - name: medical cyborg - components: - - type: Sprite - sprite: _LostParadise/Mobs/Silicon/medibot_cat.rsi - layers: - - state: medibot1 - map: ["movement"] - - state: medibot1 - map: ["enum.BorgVisualLayers.Light"] - visible: false - - state: medibot1 - map: ["light"] - visible: false - - type: SpriteMovement - movementLayers: - movement: - state: medibot1 - noMovementLayers: - movement: - state: medibot1 - - type: SiliconLawProvider - laws: LPPNTDefaultMedicalLaws - - type: BorgChassis - maxModules: 4 - moduleWhitelist: - tags: - - BorgModuleGeneric - - BorgModuleMedical - hasMindState: medibot1 - noMindState: medibot1 - # name: киборг-доктор - - type: Construction - node: medical - - type: IntrinsicRadioTransmitter - channels: - - Medical - - Binary - - Common - - Science - - type: ActiveRadio - channels: - - Medical - - Binary - - Common - - Science - - type: AccessReader - access: [["Medical"], ["Command"], ["Research"]] - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - - type: Inventory - templateId: borgDutch - - type: TTS # Corvax-TTS - voice: Vally - - type: InteractionPopup - interactSuccessString: petting-success-generic - interactFailureString: petting-failure-generic - interactSuccessSound: - path: /Audio/Ambience/Objects/periodic_beep.ogg - - type: PointLight - color: "#009dd6" - energy: 15 +# - type: entity +# parent: BaseBorgChassisNT +# id: LPPBorgChassisMedicalKiti +# name: medical cyborg +# components: +# - type: Sprite +# sprite: _LostParadise/Mobs/Silicon/medibot_cat.rsi +# layers: +# - state: medibot1 +# map: ["movement"] +# - state: medibot1 +# map: ["enum.BorgVisualLayers.Light"] +# visible: false +# - state: medibot1 +# map: ["light"] +# visible: false +# - type: SpriteMovement +# movementLayers: +# movement: +# state: medibot1 +# noMovementLayers: +# movement: +# state: medibot1 +# - type: SiliconLawProvider +# laws: LPPNTDefaultMedicalLaws +# - type: BorgChassis +# maxModules: 4 +# moduleWhitelist: +# tags: +# - BorgModuleGeneric +# - BorgModuleMedical +# hasMindState: medibot1 +# noMindState: medibot1 +# # name: киборг-доктор +# - type: Construction +# node: medical +# - type: IntrinsicRadioTransmitter +# channels: +# - Medical +# - Binary +# - Common +# - Science +# - type: ActiveRadio +# channels: +# - Medical +# - Binary +# - Common +# - Science +# - type: AccessReader +# access: [["Medical"], ["Command"], ["Research"]] +# - type: ShowHealthBars +# damageContainers: +# - Biological +# - type: ShowHealthIcons +# damageContainers: +# - Biological +# - type: Inventory +# templateId: borgDutch +# - type: TTS # Corvax-TTS +# voice: Vally +# - type: InteractionPopup +# interactSuccessString: petting-success-generic +# interactFailureString: petting-failure-generic +# interactSuccessSound: +# path: /Audio/Ambience/Objects/periodic_beep.ogg +# - type: PointLight +# color: "#009dd6" +# energy: 15 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml index 7b1247db68d..ac97b7a72b6 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/TacticalShop.yml @@ -12,7 +12,7 @@ size: Tiny - type: UserInterface interfaces: - - key: enum.StoreUiKey.Key + enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: ActivatableUI key: enum.StoreUiKey.Key @@ -35,7 +35,7 @@ size: Tiny - type: UserInterface interfaces: - - key: enum.StoreUiKey.Key + enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: ActivatableUI key: enum.StoreUiKey.Key @@ -58,7 +58,7 @@ size: Tiny - type: UserInterface interfaces: - - key: enum.StoreUiKey.Key + enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: ActivatableUI key: enum.StoreUiKey.Key @@ -79,8 +79,8 @@ state: icon - type: UserInterface interfaces: - - key: enum.StoreUiKey.Key - type: StoreBoundUserInterface + enum.StoreUiKey.Key: + type: StoreBoundUserInterface - type: ActivatableUI key: enum.StoreUiKey.Key - type: Store diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/Papers/paper.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/Papers/paper.yml index 712a9dae5ee..e4460133afb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/Papers/paper.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/Papers/paper.yml @@ -16,8 +16,8 @@ closeOnHandDeselect: false - type: UserInterface interfaces: - - key: enum.PaperUiKey.Key - type: PaperBoundUserInterface + enum.PaperUiKey.Key: + type: PaperBoundUserInterface - type: Tag tags: - Document diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/wallet.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/wallet.yml index 4d6dd90d894..b02ee671634 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/wallet.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/wallet.yml @@ -61,8 +61,8 @@ ID-Card: !type:ContainerSlot {} - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: UseDelay delay: 0.5 - type: ItemMapper @@ -91,8 +91,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: dark-wallet - map: [ base ] + - state: dark-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -110,8 +110,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: darkleather-wallet - map: [ base ] + - state: darkleather-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -129,8 +129,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: green-wallet - map: [ base ] + - state: green-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -148,8 +148,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: grey-wallet - map: [ base ] + - state: grey-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -167,8 +167,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: yellow-wallet - map: [ base ] + - state: yellow-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -186,8 +186,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: white-wallet - map: [ base ] + - state: white-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: @@ -207,8 +207,8 @@ - type: Sprite sprite: _LostParadise/Objects/Misc/Wallet.rsi layers: - - state: syndicate-wallet - map: [ base ] + - state: syndicate-wallet + map: [ base ] - type: GenericVisualizer visuals: enum.StorageVisuals.Open: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml index d42f4a7fcb9..70951b185b9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/DiamondTools.yml @@ -102,8 +102,8 @@ - type: ActivatableUIRequiresPower - type: UserInterface interfaces: - - key: enum.ResearchClientUiKey.Key - type: ResearchClientBoundUserInterface + enum.ResearchClientUiKey.Key: + type: ResearchClientBoundUserInterface - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/RCDFAP.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/RCDFAP.yml index 050e4c62f39..755f1c64c58 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/RCDFAP.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Tools/RCDFAP.yml @@ -68,7 +68,7 @@ price: 100 - type: UserInterface interfaces: - - key: enum.RcdfapUiKey.Key + enum.RcdfapUiKey.Key: type: RCDFAPMenuBoundUserInterface - type: ActivatableUI key: enum.RcdfapUiKey.Key diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/coatrack.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/coatrack.yml index c80dc8df3dc..189429bc36a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/coatrack.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/coatrack.yml @@ -6,8 +6,8 @@ components: - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: WallMount - type: InteractionOutline - type: Appearance