Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
10 changes: 6 additions & 4 deletions Resources/Audio/_Impstation/RoundEnd/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@
copyright: "The Role of Cardassian Trials (DS9: Tribunal)"
source: "https://www.youtube.com/watch?v=JEtl2X6mBmQ"

- files: ["wuhey.ogg"]
license: "Custom"
copyright: "middle aged men ordering a greggs by theboski"
source: "https://www.tiktok.com/@theboski/video/7074212516699606278"
# QB edit start - nowuhey
# - files: ["wuhey.ogg"]
# license: "Custom"
# copyright: "middle aged men ordering a greggs by theboski"
# source: "https://www.tiktok.com/@theboski/video/7074212516699606278"
# QB edit end

- files:
- specialstew.ogg
Expand Down
4 changes: 0 additions & 4 deletions Resources/Audio/_Impstation/Voice/Misc/attributions.yml

This file was deleted.

Binary file removed Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
- id: PlushieGnomeChild
- id: PlushieGollylad
- id: PlushieHeadofPersonnel
- id: PlushieImp
# - id: PlushieImp # QB - nomira
- id: PlushieJumboGray
- id: PlushieThavenWeird
- id: PlushieUnguTiny
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.06
- !type:Emote
emote: Wuhey
showInChat: true
force: true
probability: 0.02
# - !type:Emote # QB - nowuhey
# emote: Wuhey
# showInChat: true
# force: true
# probability: 0.02

- type: reagent
id: BlueCuracao
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SoundCollections/announcements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
- /Audio/_Impstation/RoundEnd/weed.ogg
- /Audio/_Impstation/RoundEnd/whymad.ogg
- /Audio/_Impstation/RoundEnd/winning.ogg
- /Audio/_Impstation/RoundEnd/wuhey.ogg
# - /Audio/_Impstation/RoundEnd/wuhey.ogg # QB - nowuhey
- /Audio/_Impstation/RoundEnd/specialstew.ogg
- /Audio/_Impstation/RoundEnd/propermeal.ogg
- /Audio/_Impstation/RoundEnd/vegetables.ogg
Expand Down
58 changes: 0 additions & 58 deletions Resources/Prototypes/Voice/speech_emote_sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
collection: MaleGasp
DefaultDeathgasp:
collection: MaleDeathGasp
# imp edit start
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end

- type: emoteSounds
id: FemaleHuman
Expand Down Expand Up @@ -88,12 +82,6 @@
collection: FemaleGasp
DefaultDeathgasp:
collection: FemaleDeathGasp
# imp edit start
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end

- type: emoteSounds
id: MaleReptilian
Expand All @@ -114,10 +102,6 @@
collection: Weh
Hew:
collection: Hew
Wuhey: # imp
collection: Wuhey
Ungh: # imp
collection: Ungh
Gasp:
collection: MaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -156,10 +140,6 @@
collection: Weh
Hew:
collection: Hew
Wuhey: # imp
collection: Wuhey
Ungh: # imp
collection: Ungh
Gasp:
collection: FemaleGasp
DefaultDeathgasp:
Expand Down Expand Up @@ -224,12 +204,6 @@
collection: MaleSlimeGasp # imp
DefaultDeathgasp:
collection: MaleSlimeDeathGasp # imp
# imp edit start
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end
params:
variation: 0.125

Expand Down Expand Up @@ -277,10 +251,6 @@
collection: Bubbles
Pop:
collection: Pops
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end
params:
variation: 0.125
Expand Down Expand Up @@ -333,10 +303,6 @@
collection: UnisexSneezes #placeholder
Yawn:
collection: UnisexYawn #placeholder
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end
params:
variation: 0.125
Expand Down Expand Up @@ -374,10 +340,6 @@
collection: UnisexCry #placeholder
Whistle:
collection: Whistles
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end
params:
variation: 0.125
Expand Down Expand Up @@ -420,10 +382,6 @@
path: /Audio/_Impstation/Voice/Arachnid/arachnid_cry.ogg
Whistle:
collection: Whistles
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end

- type: emoteSounds
Expand Down Expand Up @@ -465,12 +423,6 @@
collection: UnisexGasp # imp
DefaultDeathgasp:
collection: UnisexDeathGasp # imp
# imp edit start
Wuhey: # imp
collection: Wuhey
Ungh: # imp
collection: Ungh
# imp edit end
params:
variation: 0.125
pitch: 0.75
Expand Down Expand Up @@ -514,12 +466,6 @@
collection: FemaleGasp
DefaultDeathgasp:
collection: FemaleDeathGasp
# imp edit start
Wuhey: # imp
collection: Wuhey
Ungh: # imp
collection: Ungh
# imp edit end
params:
variation: 0.125
pitch: 0.75
Expand Down Expand Up @@ -562,10 +508,6 @@
path: /Audio/_Impstation/Voice/Moth/mothcry.ogg
Whistle:
collection: Whistles
Wuhey:
collection: Wuhey
Ungh:
collection: Ungh
# imp edit end

- type: emoteSounds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
containers:
entity_storage: !type:AllSelector
children:
- id: PlushieImp
# - id: PlushieImp # QB - nomira
- id: PlushieGnomeChild
- !type:GroupSelector
children:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
- type: Sprite
sprite: _Impstation/Clothing/Back/Backpacks/commandveteran.rsi

- type: entity
parent: [ClothingBackpack, BaseCentcommContraband]
id: ClothingBackpackImpishBackpack
name: impish backpack
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Back/Backpacks/impishbackpack.rsi
# QB edit start - nomira
# - type: entity
# parent: [ClothingBackpack, BaseCentcommContraband]
# id: ClothingBackpackImpishBackpack
# name: impish backpack
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Back/Backpacks/impishbackpack.rsi
# QB edit end
29 changes: 16 additions & 13 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Hands/misc.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
- type: entity
parent: [ClothingHandsBase, BaseCentcommContraband]
id: ClothingHandsImpishWristbands
name: impish wristbands
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Hands/Misc/impishwristbands.rsi
- type: Clothing
sprite: _Impstation/Clothing/Hands/Misc/impishwristbands.rsi
- type: Tag
tags:
- WhitelistChameleon
# QB edit start - nomira
# - type: entity
# parent: [ClothingHandsBase, BaseCentcommContraband]
# id: ClothingHandsImpishWristbands
# name: impish wristbands
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Hands/Misc/impishwristbands.rsi
# - type: Clothing
# sprite: _Impstation/Clothing/Hands/Misc/impishwristbands.rsi
# - type: Tag
# tags:
# - WhitelistChameleon
# QB edit end

30 changes: 16 additions & 14 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,22 @@
- WhitelistChameleon
- ClothMade

- type: entity
parent: [ClothingHeadBase, BaseCentcommContraband]
id: ClothingHeadImpishHorns
name: impish horns
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Head/Hats/impishhorns.rsi
- type: Clothing
sprite: _Impstation/Clothing/Head/Hats/impishhorns.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
# QB edit start - nomira
# - type: entity
# parent: [ClothingHeadBase, BaseCentcommContraband]
# id: ClothingHeadImpishHorns
# name: impish horns
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Head/Hats/impishhorns.rsi
# - type: Clothing
# sprite: _Impstation/Clothing/Head/Hats/impishhorns.rsi
# - type: Tag
# tags:
# - ClothMade
# - WhitelistChameleon
# QB edit end

- type: entity
parent: ClothingHeadBase
Expand Down
22 changes: 12 additions & 10 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,18 @@
tags:
- WhitelistChameleon

- type: entity
parent: [ClothingNeckBase, BaseCentcommContraband]
id: ClothingNeckImpishAccessories
name: impish accessories
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Neck/Misc/impishaccessories.rsi
- type: Clothing
sprite: _Impstation/Clothing/Neck/Misc/impishaccessories.rsi
# QB edit start - nomira
# - type: entity
# parent: [ClothingNeckBase, BaseCentcommContraband]
# id: ClothingNeckImpishAccessories
# name: impish accessories
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Neck/Misc/impishaccessories.rsi
# - type: Clothing
# sprite: _Impstation/Clothing/Neck/Misc/impishaccessories.rsi
# QB edit end

- type: entity
parent: ClothingNeckBase
Expand Down
22 changes: 12 additions & 10 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
tags:
- WhitelistChameleon

- type: entity
parent: [ClothingShoesBaseButcherable, BaseCentcommContraband]
id: ClothingShoesImpishShoes
name: impish shoes
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Shoes/Misc/impishshoes.rsi
- type: Clothing
sprite: _Impstation/Clothing/Shoes/Misc/impishshoes.rsi
# QB edit start - nomira
# - type: entity
# parent: [ClothingShoesBaseButcherable, BaseCentcommContraband]
# id: ClothingShoesImpishShoes
# name: impish shoes
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Shoes/Misc/impishshoes.rsi
# - type: Clothing
# sprite: _Impstation/Clothing/Shoes/Misc/impishshoes.rsi
# QB edit end
Original file line number Diff line number Diff line change
Expand Up @@ -450,19 +450,21 @@
- WhitelistChameleon
- ClothMade

- type: entity
parent: [ClothingUniformBase, BaseCentcommContraband]
id: ClothingUniformImpishOutfit
name: impish outfit
description:
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Other/impishoutfit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Other/impishoutfit.rsi
- type: Tag
tags:
- ClothMade
# QB edit start - nomira
# - type: entity
# parent: [ClothingUniformBase, BaseCentcommContraband]
# id: ClothingUniformImpishOutfit
# name: impish outfit
# description:
# components:
# - type: Sprite
# sprite: _Impstation/Clothing/Uniforms/Other/impishoutfit.rsi
# - type: Clothing
# sprite: _Impstation/Clothing/Uniforms/Other/impishoutfit.rsi
# - type: Tag
# tags:
# - ClothMade
# QB edit end

- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
Expand Down
Loading
Loading