diff --git a/Resources/Audio/_Impstation/RoundEnd/attributions.yml b/Resources/Audio/_Impstation/RoundEnd/attributions.yml index 7aa989c6e5784..c03a591886471 100644 --- a/Resources/Audio/_Impstation/RoundEnd/attributions.yml +++ b/Resources/Audio/_Impstation/RoundEnd/attributions.yml @@ -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 diff --git a/Resources/Audio/_Impstation/Voice/Misc/attributions.yml b/Resources/Audio/_Impstation/Voice/Misc/attributions.yml deleted file mode 100644 index d3c4d6ea73eaf..0000000000000 --- a/Resources/Audio/_Impstation/Voice/Misc/attributions.yml +++ /dev/null @@ -1,4 +0,0 @@ -- files: ["wuhey.ogg"] - license: "Custom" - copyright: "middle aged men ordering a greggs by theboski" - source: "https://www.tiktok.com/@theboski/video/7074212516699606278" diff --git a/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg b/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg deleted file mode 100644 index 2a0febfc6a41b..0000000000000 Binary files a/Resources/Audio/_Impstation/Voice/Misc/wuhey.ogg and /dev/null differ diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index aa317e5aa1c9f..7e0c02d6d1bbd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -108,7 +108,7 @@ - id: PlushieGnomeChild - id: PlushieGollylad - id: PlushieHeadofPersonnel - - id: PlushieImp + # - id: PlushieImp # QB - nomira - id: PlushieJumboGray - id: PlushieThavenWeird - id: PlushieUnguTiny diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 27d9aeb5a28ce..b8f314ca5fc8f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -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 diff --git a/Resources/Prototypes/SoundCollections/announcements.yml b/Resources/Prototypes/SoundCollections/announcements.yml index 895e5d360281e..08bbe8a59e64b 100644 --- a/Resources/Prototypes/SoundCollections/announcements.yml +++ b/Resources/Prototypes/SoundCollections/announcements.yml @@ -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 diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index fbfdeebac706a..e8143cfb57ed6 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -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 @@ -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 @@ -114,10 +102,6 @@ collection: Weh Hew: collection: Hew - Wuhey: # imp - collection: Wuhey - Ungh: # imp - collection: Ungh Gasp: collection: MaleGasp DefaultDeathgasp: @@ -156,10 +140,6 @@ collection: Weh Hew: collection: Hew - Wuhey: # imp - collection: Wuhey - Ungh: # imp - collection: Ungh Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -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 @@ -277,10 +251,6 @@ collection: Bubbles Pop: collection: Pops - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh # imp edit end params: variation: 0.125 @@ -333,10 +303,6 @@ collection: UnisexSneezes #placeholder Yawn: collection: UnisexYawn #placeholder - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh # imp edit end params: variation: 0.125 @@ -374,10 +340,6 @@ collection: UnisexCry #placeholder Whistle: collection: Whistles - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh # imp edit end params: variation: 0.125 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/holiday.yml b/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/holiday.yml index 1c53a12b5cb5a..17d35d8b87f4b 100644 --- a/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/holiday.yml +++ b/Resources/Prototypes/_Impstation/Catalog/Fills/Crates/holiday.yml @@ -32,7 +32,7 @@ containers: entity_storage: !type:AllSelector children: - - id: PlushieImp + # - id: PlushieImp # QB - nomira - id: PlushieGnomeChild - !type:GroupSelector children: diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Back/backpacks.yml index 5fce31dcbe8e8..af11521a8c6b4 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Back/backpacks.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/misc.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/misc.yml index 00a7c719db297..4434efb37a6aa 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/misc.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Hands/misc.yml @@ -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 + diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hats.yml index 18ce4ee542885..e3c37b0878f37 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hats.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/misc.yml index 3712d9b02c21f..4f07d8e01abe7 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/misc.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/misc.yml index fb4c196a01e98..0fe77317c3deb 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/misc.yml @@ -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 diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml index bd42b3633ecfe..75d78748e1e8b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml @@ -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] diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Fun/toys.yml index 3e6d62438fdc3..039dc1694c4fa 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Fun/toys.yml @@ -313,49 +313,51 @@ - ReagentId: Fiber Quantity: 10 -- type: entity - parent: BasePlushie - id: PlushieImp - name: imp plushie - description: Huh? Who's this stoner? - components: - - type: Sprite - sprite: _Impstation/Objects/Fun/toys.rsi - state: plushie_imp - - type: EmitSoundOnUse - sound: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_Impstation/Voice/Misc/wuhey.ogg - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Fiber - Quantity: 5 - - ReagentId: THC - Quantity: 5 - - type: FlavorProfile - flavors: - - imp - - type: FoodSequenceElement - entries: - CottonBurger: ImpPlushie +# QB edit start - nomira +# - type: entity +# parent: BasePlushie +# id: PlushieImp +# name: imp plushie +# description: Huh? Who's this stoner? +# components: +# - type: Sprite +# sprite: _Impstation/Objects/Fun/toys.rsi +# state: plushie_imp +# - type: EmitSoundOnUse +# sound: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: EmitSoundOnLand +# sound: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: EmitSoundOnActivate +# sound: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: EmitSoundOnTrigger +# sound: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: MeleeWeapon +# soundHit: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: Edible +# requiresSpecialDigestion: true +# useSound: +# path: /Audio/_Impstation/Voice/Misc/wuhey.ogg +# - type: SolutionContainerManager +# solutions: +# food: +# maxVol: 10 +# reagents: +# - ReagentId: Fiber +# Quantity: 5 +# - ReagentId: THC +# Quantity: 5 +# - type: FlavorProfile +# flavors: +# - imp +# - type: FoodSequenceElement +# entries: +# CottonBurger: ImpPlushie +# QB edit end - type: entity id: ItemBouquet diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/Signs/bar_sign.yml index 12ece6ca71171..d264d0fbae472 100644 --- a/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/Signs/bar_sign.yml +++ b/Resources/Prototypes/_Impstation/Entities/Structures/Wallmounts/Signs/bar_sign.yml @@ -1,11 +1,13 @@ -- type: entity - parent: BaseBarSign - id: BarSignImp - name: Imp - description: Looking at this sign gives you the peculiar feeling of being an ant in a bug farm. - components: - - type: BarSign - current: Imp +# QB edit start - nomira +# - type: entity +# parent: BaseBarSign +# id: BarSignImp +# name: Imp +# description: Looking at this sign gives you the peculiar feeling of being an ant in a bug farm. +# components: +# - type: BarSign +# current: Imp +# QB edit end - type: entity parent: BaseBarSign diff --git a/Resources/Prototypes/_Impstation/Loadouts/Miscellaneous/sillysmite.yml b/Resources/Prototypes/_Impstation/Loadouts/Miscellaneous/sillysmite.yml index d449965799743..bb3f605349d98 100644 --- a/Resources/Prototypes/_Impstation/Loadouts/Miscellaneous/sillysmite.yml +++ b/Resources/Prototypes/_Impstation/Loadouts/Miscellaneous/sillysmite.yml @@ -53,18 +53,20 @@ shoes: ClothingShoesBootsLaceup # mira mimi imp -- type: startingGear - id: MimiImpishSimple - equipment: - neck: ClothingNeckImpishAccessories - head: ClothingHeadImpishHorns +# QB edit start - nomira +# - type: startingGear +# id: MimiImpishSimple +# equipment: +# neck: ClothingNeckImpishAccessories +# head: ClothingHeadImpishHorns -- type: startingGear - id: MimiImpishFull - equipment: - jumpsuit: ClothingUniformImpishOutfit - head: ClothingHeadImpishHorns - neck: ClothingNeckImpishAccessories - gloves: ClothingHandsImpishWristbands - shoes: ClothingShoesImpishShoes - back: ClothingBackpackImpishBackpack +# - type: startingGear +# id: MimiImpishFull +# equipment: +# jumpsuit: ClothingUniformImpishOutfit +# head: ClothingHeadImpishHorns +# neck: ClothingNeckImpishAccessories +# gloves: ClothingHandsImpishWristbands +# shoes: ClothingShoesImpishShoes +# back: ClothingBackpackImpishBackpack +# QB edit end diff --git a/Resources/Prototypes/_Impstation/Recipes/Lathes/Packs/service.yml b/Resources/Prototypes/_Impstation/Recipes/Lathes/Packs/service.yml index 6303d9de11e8c..59e9e3f6326c3 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Lathes/Packs/service.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Lathes/Packs/service.yml @@ -214,7 +214,7 @@ - PlushieGollylad - PlushieHeadofPersonnel - PlushieIba - - PlushieImp + # - PlushieImp # QB - nomira - PlushieNuke - PlushieOdds - PlushieRainbowCarp diff --git a/Resources/Prototypes/_Impstation/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/_Impstation/Recipes/Lathes/prizecounter.yml index 8e59fe790d88f..5d68b310cc2ed 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Lathes/prizecounter.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Lathes/prizecounter.yml @@ -286,10 +286,12 @@ id: PlushieIba result: PlushieIba -- type: latheRecipe - parent: PrizeCounterPlushieExpensive - id: PlushieImp - result: PlushieImp +# QB edit start - nomira +# - type: latheRecipe +# parent: PrizeCounterPlushieExpensive +# id: PlushieImp +# result: PlushieImp +# QB edit end - type: latheRecipe parent: PrizeCounterPlushieExpensive diff --git a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml index 9caf9df49ffb9..abda1c1a587ca 100644 --- a/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml +++ b/Resources/Prototypes/_Impstation/SoundCollections/emotes.yml @@ -129,10 +129,12 @@ - /Audio/_Impstation/Voice/Vox/voxcoo2.ogg - /Audio/_Impstation/Voice/Vox/voxcoo3.ogg -- type: soundCollection - id: Wuhey - files: - - /Audio/_Impstation/Voice/Misc/wuhey.ogg +# QB edit start - nowuhey +# - type: soundCollection +# id: Wuhey +# files: +# - /Audio/_Impstation/Voice/Misc/wuhey.ogg +# QB edit end - type: soundCollection id: Blinks diff --git a/Resources/Prototypes/_Impstation/Voice/anomalocarid.yml b/Resources/Prototypes/_Impstation/Voice/anomalocarid.yml index 631881e853deb..f07e6e8ad9d3d 100644 --- a/Resources/Prototypes/_Impstation/Voice/anomalocarid.yml +++ b/Resources/Prototypes/_Impstation/Voice/anomalocarid.yml @@ -44,10 +44,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: #QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Chitter: path: /Audio/Voice/Arachnid/arachnid_chitter.ogg Click: diff --git a/Resources/Prototypes/_Impstation/Voice/decapoid.yml b/Resources/Prototypes/_Impstation/Voice/decapoid.yml index 480ab0b57ee16..2735f7bba09bc 100644 --- a/Resources/Prototypes/_Impstation/Voice/decapoid.yml +++ b/Resources/Prototypes/_Impstation/Voice/decapoid.yml @@ -44,10 +44,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Chitter: path: /Audio/Voice/Arachnid/arachnid_chitter.ogg Click: diff --git a/Resources/Prototypes/_Impstation/Voice/dino.yml b/Resources/Prototypes/_Impstation/Voice/dino.yml index eb7bc8c5cfe6f..f0e1317beec84 100644 --- a/Resources/Prototypes/_Impstation/Voice/dino.yml +++ b/Resources/Prototypes/_Impstation/Voice/dino.yml @@ -44,10 +44,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Dino/dino_gasp.ogg DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/Voice/gastropoid.yml b/Resources/Prototypes/_Impstation/Voice/gastropoid.yml index a5555006edb42..c4353f235b916 100644 --- a/Resources/Prototypes/_Impstation/Voice/gastropoid.yml +++ b/Resources/Prototypes/_Impstation/Voice/gastropoid.yml @@ -44,10 +44,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Snail/snail_gasp.ogg DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/Voice/gray.yml b/Resources/Prototypes/_Impstation/Voice/gray.yml index 8b55409068d5b..75073612b6812 100644 --- a/Resources/Prototypes/_Impstation/Voice/gray.yml +++ b/Resources/Prototypes/_Impstation/Voice/gray.yml @@ -44,10 +44,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Gray/gray_gasp.ogg DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml index 0e969f014792e..f450db43bdd6a 100644 --- a/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_Impstation/Voice/speech_emote_sounds.yml @@ -33,10 +33,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: UnisexGasp DefaultDeathgasp: @@ -71,10 +71,10 @@ collection: UnisexCry Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: UnisexGasp DefaultDeathgasp: @@ -119,10 +119,10 @@ collection: SlimeWhistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: UnisexSlimeGasp DefaultDeathgasp: @@ -155,10 +155,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: VoxGasp params: @@ -207,10 +207,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: VoxGasp params: @@ -263,10 +263,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: MaleGasp DefaultDeathgasp: @@ -301,10 +301,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -343,10 +343,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Arachnid/arachnid_gasp.ogg DefaultDeathgasp: @@ -383,10 +383,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Arachnid/arachnid_gasp.ogg DefaultDeathgasp: @@ -427,10 +427,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: MaleGasp DefaultDeathgasp: @@ -470,10 +470,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Moth/mothgasp.ogg DefaultDeathgasp: @@ -510,10 +510,10 @@ collection: Whistles Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Moth/mothgasp.ogg DefaultDeathgasp: @@ -606,10 +606,10 @@ collection: Ungh Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: MaleGasp DefaultDeathgasp: @@ -637,10 +637,10 @@ collection: BikeHorn Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh DefaultDeathgasp: collection: MaleSlimeDeathGasp params: @@ -742,10 +742,10 @@ collection: VoxCoo params: volume: -7 - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh - type: emoteSounds id: YoungKodepiia @@ -826,10 +826,10 @@ collection: VoxCoo params: volume: -7 - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh - type: emoteSounds id: TckTck @@ -890,10 +890,10 @@ path: /Audio/_EE/Supermatter/marauder.ogg Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Blink: collection: Blinks params: @@ -950,10 +950,10 @@ path: /Audio/_Impstation/Allulalo/allulalo_cry.ogg Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Allulalo/allulalo_say.ogg DefaultDeathgasp: @@ -995,10 +995,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh GoblinThroatSinging: collection: GoblinThroatSingingCollection Gasp: diff --git a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml index 224f4c5254018..893b06c1d5abd 100644 --- a/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_Impstation/Voice/speech_emotes.yml @@ -54,12 +54,14 @@ - hisses. - hisses! -- type: emote - id: Wuhey - name: chat-emote-name-wuhey - category: Vocal - icon: _Impstation/Interface/Emotes/wuhey.png - chatMessages: ["chat-emote-msg-wuhey"] +# QB edit start - nowuhey +# - type: emote +# id: Wuhey +# name: chat-emote-name-wuhey +# category: Vocal +# icon: _Impstation/Interface/Emotes/wuhey.png +# chatMessages: ["chat-emote-msg-wuhey"] +# QB edit end - type: emote id: Ungh diff --git a/Resources/Prototypes/_Impstation/Voice/thaven.yml b/Resources/Prototypes/_Impstation/Voice/thaven.yml index b5d9bd87d3b5b..be3926d997cc6 100644 --- a/Resources/Prototypes/_Impstation/Voice/thaven.yml +++ b/Resources/Prototypes/_Impstation/Voice/thaven.yml @@ -33,10 +33,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: MaleGasp DefaultDeathgasp: @@ -80,10 +80,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: FemaleGasp DefaultDeathgasp: @@ -127,10 +127,10 @@ collection: Hew Weh: collection: Weh - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: collection: UnisexGasp DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/Voice/ungu.yml b/Resources/Prototypes/_Impstation/Voice/ungu.yml index a165e2c48edb8..d4e35c99e4092 100644 --- a/Resources/Prototypes/_Impstation/Voice/ungu.yml +++ b/Resources/Prototypes/_Impstation/Voice/ungu.yml @@ -40,10 +40,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Ungu/ungu_gasp.ogg DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/Voice/vrex.yml b/Resources/Prototypes/_Impstation/Voice/vrex.yml index 9c04e4a17d8e8..68d58bc239f9e 100644 --- a/Resources/Prototypes/_Impstation/Voice/vrex.yml +++ b/Resources/Prototypes/_Impstation/Voice/vrex.yml @@ -29,10 +29,10 @@ collection: Weh Hew: collection: Hew - Wuhey: - collection: Wuhey - Ungh: - collection: Ungh + # Wuhey: # QB - nowuhey + # collection: Wuhey + # Ungh: + # collection: Ungh Gasp: path: /Audio/_Impstation/Voice/Dino/dino_gasp.ogg DefaultDeathgasp: diff --git a/Resources/Prototypes/_Impstation/bar_signs.yml b/Resources/Prototypes/_Impstation/bar_signs.yml index 931e8b09f2b60..2398580bc14e0 100644 --- a/Resources/Prototypes/_Impstation/bar_signs.yml +++ b/Resources/Prototypes/_Impstation/bar_signs.yml @@ -1,10 +1,12 @@ -- type: barSign - id: Imp - name: barsign-prototype-name-imp - icon: - sprite: _Impstation/Structures/Wallmounts/barsign.rsi - state: imp - description: barsign-prototype-description-imp +# QB edit start - nomira +# - type: barSign +# id: Imp +# name: barsign-prototype-name-imp +# icon: +# sprite: _Impstation/Structures/Wallmounts/barsign.rsi +# state: imp +# description: barsign-prototype-description-imp +# QB edit end - type: barSign id: TheGreytide diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml index cd1e8896dcde8..a53d855334cc9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/prizeticket.yml @@ -215,9 +215,9 @@ - id: PlushieHolocarp prob: 0.03 orGroup: Prize - - id: PlushieImp - prob: 0.03 - orGroup: Prize + # - id: PlushieImp # QB - nomira + # prob: 0.03 + # orGroup: Prize - id: PlushieJumboGray # bwee.... prob: 0.03 orGroup: Prize diff --git a/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/imp.png b/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/imp.png deleted file mode 100644 index a10e5b1fa979c..0000000000000 Binary files a/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/imp.png and /dev/null differ diff --git a/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/meta.json b/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/meta.json index 3ec812def5282..77b2cfbb39d8e 100644 --- a/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/meta.json +++ b/Resources/Textures/_Impstation/Structures/Wallmounts/barsign.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae, imp by starlighthowls, The Loose by SixValentine", + "copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae, The Loose by SixValentine", "states": [ { "name": "bargonia", @@ -635,25 +635,6 @@ { "name": "vladssaladbar" }, - { - "name": "imp", - "delays": [ - [ - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1 - ] - ] - }, { "name": "theloose", "delays": [