diff --git a/Resources/Audio/_Omu/Items/Plushie/ogrenoise.ogg b/Resources/Audio/_Omu/Items/Plushie/ogrenoise.ogg new file mode 100644 index 00000000000..53c3b610ea7 Binary files /dev/null and b/Resources/Audio/_Omu/Items/Plushie/ogrenoise.ogg differ diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml index 0005022f6cc..93e8af6b2ce 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml @@ -59,6 +59,7 @@ - id: CombatMedipen # Omu - id: MobXenomorphMaid # Omu - id: MedkitCombatFilled + - id: PlushieRestful # Omu # Fish from water - type: entityTable diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml index 2c6ec7f43e3..1bff50e55b6 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml @@ -379,36 +379,37 @@ - PlushieMoth - PlushieHuman - PlushiePenguin - - PlushieXeve +# - PlushieXeve # Omu, we are adding our own self inserts muahaha - PlushieDurk - PlushieMnwaar - - PlushieLouie +# - PlushieLouie # Omu - FoamWonderprod - PlushieBingle - PlushieBongle - PlushieBinglePony - PlushieAbductor - - PlushieJvne - - PlushieFern - - PlushieNigel - - PlushieBrizby - - PlushieBoggle - - PlushieLehmin - - PlushieWachtel - - PlushieLeguia - - PlushiePasha +# - PlushieJvne # Omu +# - PlushieFern # Omu +# - PlushieNigel # Omu +# - PlushieBrizby # Omu +# - PlushieBoggle # Omu +# - PlushieLehmin # Omu +# - PlushieWachtel # Omu +# - PlushieLeguia # Omu +# - PlushiePasha # Omu + - PlushieRestful # Omu evilRewards: - - EvilPlushieXeve - - EvilPlushieBoggle - - EvilPlushieBrizby - - EvilPlushieNigel - - EvilPlushieFern - - EvilPlushieJvne +# - EvilPlushieXeve # Omu +# - EvilPlushieBoggle # Omu +# - EvilPlushieBrizby # Omu +# - EvilPlushieNigel # Omu +# - EvilPlushieFern # Omu +# - EvilPlushieJvne # Omu - EvilPlushieMnwaar - EvilPlushieDurk - - EvilPlushieLouie - - EvilPlushieWachtel - - EvilPlushieLeguia - - EvilPlushiePasha - - EvilPlushieTwofish +# - EvilPlushieLouie # Omu +# - EvilPlushieWachtel # Omu +# - EvilPlushieLeguia # Omu +# - EvilPlushiePasha # Omu +# - EvilPlushieTwofish # Omu - type: DoAfter diff --git a/Resources/Prototypes/_Omu/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/_Omu/Entities/Objects/Fun/plushies.yml new file mode 100644 index 00000000000..d3d4ef95261 --- /dev/null +++ b/Resources/Prototypes/_Omu/Entities/Objects/Fun/plushies.yml @@ -0,0 +1,37 @@ +- type: entity + parent: BasePlushie + id: PlushieRestful + name: disgusting ogre plushie + description: Absolutely massive plushie, vile.... + components: + - type: Sprite + sprite: _Omu/Objects/Fun/Plushies/restful.rsi + state: plushie_restful + - type: EmitSoundOnUse + sound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: Food + requiresSpecialDigestion: false + useSound: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: MeleeWeapon + wideAnimationRotation: 180 + soundHit: + path: /Audio/_Omu/Items/Plushie/ogrenoise.ogg + - type: Fish + difficulty: 0.023 + - type: GibThisGuy # hes cool with it + icNames: + - Dajjal Ojibakk diff --git a/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/meta.json b/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/meta.json new file mode 100644 index 00000000000..8e608c9ff6d --- /dev/null +++ b/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Sprites by ton2nite", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plushie_restful" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/plushie_restful.png b/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/plushie_restful.png new file mode 100644 index 00000000000..71f2beb6ba4 Binary files /dev/null and b/Resources/Textures/_Omu/Objects/Fun/Plushies/restful.rsi/plushie_restful.png differ