diff --git a/Resources/Audio/Andromeda/Evrozor/nya1.ogg b/Resources/Audio/Andromeda/Evrozor/nya1.ogg new file mode 100644 index 00000000000..594b224cc6f Binary files /dev/null and b/Resources/Audio/Andromeda/Evrozor/nya1.ogg differ diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml index dac647d6505..b618b3929f9 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/plushiedrobe.yml @@ -100,6 +100,7 @@ PonderingOrb: 2 CrayonBox: 3 CrayonRainbow: 2 + PlushieAmmaYakiama: 1 emaggedInventory: PlushieNuke: 1 PlushieNukeMar: 1 diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml new file mode 100644 index 00000000000..3f938a442ed --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/Alconomicon.yml @@ -0,0 +1,42 @@ +- type: entity + name: алкономикон + description: По мановению руки может наслать жесткий бодун. + parent: BaseItem + id: Alconomicon + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Evrozor/Other/alconomicon.rsi + state: icon + - type: Item + size: Small + sprite: Andromeda/Evrozor/Other/alconomicon.rsi + - type: Clothing + slots: + - Belt + - type: Tag + tags: + - Book + - type: SolutionContainerManager + solutions: + essence: + maxVol: 50 + reagents: + - ReagentId: Ethanol + Quantity: 50 + - type: SolutionRegeneration + solution: essence + generated: + reagents: + - ReagentId: Ethanol + Quantity: 7 + - type: InjectableSolution + solution: essence + - type: RefillableSolution + solution: essence + - type: Hypospray + solutionName: essence + transferAmount: 7 + - type: UseDelay + delay: 40 + diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml index 7f7740cd808..3280fe693b7 100644 --- a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Other/horny_bible.yml @@ -40,7 +40,7 @@ # solution: essence - type: Hypospray solutionName: essence - transferAmount: 30 + transferAmount: 10 - type: UseDelay - delay: 1.5 + delay: 60 diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Plushies/plushie_Amma_Yakiama.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Plushies/plushie_Amma_Yakiama.yml new file mode 100644 index 00000000000..3fe59818db3 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Plushies/plushie_Amma_Yakiama.yml @@ -0,0 +1,54 @@ +- type: entity + parent: BasePlushie + id: PlushieAmmaYakiama + name: плюшевый комиссар + description: Плюшевая игрушка комиссара. Выглядит мило. От неё пахнет розами и дешёвым вином. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi + state: icon + - type: EmitSoundOnUse + sound: + path: /Audio/Andromeda/Evrozor/nya1.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Andromeda/Evrozor/nya1.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/Andromeda/Evrozor/nya1.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Andromeda/Evrozor/nya1.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Andromeda/Evrozor/nya1.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Voice/Felinid/cat_scream2.ogg + - type: PointLight + netsync: false + radius: 1.5 + energy: 2.0 + color: "#8A2BE2" + # plan for future + # - type: Instrument + # program: 29 + # - type: SwappableInstrument + # instrumentList: + # "Nylon Acoustic": {24: 0} + # "Steel Acoustic": {25: 0} + # "Clean Electric": {27: 0} + # "Jazz Electric": {25: 0} + # "Muted Electric": {28: 0} + # "Overdrive Rock": {29: 0} + # "Distortion Rock": {30: 0} + # "Harmonics Rock": {31: 0} + # "Fingered Bass": {33: 0} + # "Pick Bass": {34: 0} + # "Slap Bass": {36: 0} + # "Slap (XTra Funky) Bass": {37: 0} + # - type: UserInterface + # interfaces: + # - key: enum.InstrumentUiKey.Key + # type: InstrumentBoundUserInterface \ No newline at end of file diff --git a/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/icon.png b/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/icon.png new file mode 100644 index 00000000000..efd504cd8dd Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/icon.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/meta.json b/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/meta.json new file mode 100644 index 00000000000..685a1c0e979 --- /dev/null +++ b/Resources/Textures/Andromeda/Evrozor/Other/alconomicon.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Andromeda", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/icon.png b/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/icon.png new file mode 100644 index 00000000000..9f42589d2fc Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/icon.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/meta.json b/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/meta.json new file mode 100644 index 00000000000..32ba2925b0c --- /dev/null +++ b/Resources/Textures/Andromeda/Evrozor/Plushies/plushie_Amma_Yakiama.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Evrozor", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file