diff --git a/Resources/Maps/_Goobstation/cog.yml b/Resources/Maps/_Goobstation/cog.yml index b5f3f852dcc..515a2e3d1c2 100644 --- a/Resources/Maps/_Goobstation/cog.yml +++ b/Resources/Maps/_Goobstation/cog.yml @@ -150717,16 +150717,6 @@ entities: - type: Transform pos: 56.5,64.5 parent: 2 -- proto: PlushieNigel - entities: - - uid: 22918 - components: - - type: MetaData - desc: the patient needs lexorin to live - name: ugly fucking plushie - - type: Transform - pos: 23.747175,53.78041 - parent: 2 - proto: PlushiePenguin entities: - uid: 22919 diff --git a/Resources/Maps/_Omu/cog.yml b/Resources/Maps/_Omu/cog.yml index a39309efeb6..9f1de3700b7 100644 --- a/Resources/Maps/_Omu/cog.yml +++ b/Resources/Maps/_Omu/cog.yml @@ -151058,16 +151058,6 @@ entities: - type: Transform pos: 56.5,64.5 parent: 2 -- proto: PlushieNigel - entities: - - uid: 22891 - components: - - type: MetaData - desc: the patient needs lexorin to live - name: ugly fucking plushie - - type: Transform - pos: 23.747175,53.78041 - parent: 2 - proto: PlushiePenguin entities: - uid: 22892 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml index 03e46f5088b..d551854437d 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml @@ -461,36 +461,36 @@ sound: path: /Audio/_Goobstation/Wizard/charge.ogg -- type: entity - parent: BasePlushie - id: PlushieNigel - name: handsome plushie - description: Smells like greatness, and a distinct smell of adalamin brand perfume? - components: - - type: Sprite - sprite: _Goobstation/Objects/Fun/toys.rsi - state: plushie_nigel - - type: EmitSoundOnUse - sound: - path: /Audio/Effects/adminhelp.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/Effects/adminhelp.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/Effects/adminhelp.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Effects/adminhelp.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/Effects/adminhelp.ogg - - type: MeleeWeapon - damage: - types: - Blunt: 0 - soundHit: - path: /Audio/Effects/adminhelp.ogg +# - type: entity # Omu +# parent: BasePlushie +# id: PlushieNigel +# name: handsome plushie +# description: Smells like greatness, and a distinct smell of adalamin brand perfume? +# components: +# - type: Sprite +# sprite: _Goobstation/Objects/Fun/toys.rsi +# state: plushie_nigel +# - type: EmitSoundOnUse +# sound: +# path: /Audio/Effects/adminhelp.ogg +# - type: EmitSoundOnLand +# sound: +# path: /Audio/Effects/adminhelp.ogg +# - type: EmitSoundOnActivate +# sound: +# path: /Audio/Effects/adminhelp.ogg +# - type: EmitSoundOnTrigger +# sound: +# path: /Audio/Effects/adminhelp.ogg +# - type: EmitSoundOnCollide +# sound: +# path: /Audio/Effects/adminhelp.ogg +# - type: MeleeWeapon +# damage: +# types: +# Blunt: 0 +# soundHit: +# path: /Audio/Effects/adminhelp.ogg - type: entity parent: BasePlushie @@ -1024,11 +1024,11 @@ id: EvilPlushieBrizby suffix: Evil -- type: entity - name: evil Nigel plush - parent: PlushieNigel - id: EvilPlushieNigel - suffix: Evil +# - type: entity # Omu +# name: evil Nigel plush +# parent: PlushieNigel +# id: EvilPlushieNigel +# suffix: Evil - type: entity name: evil Fern plush diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml index 2d52b9de5cc..4cde35a3209 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml @@ -390,7 +390,6 @@ - PlushieAbductor # - PlushieJvne # Omu # - PlushieFern # Omu -# - PlushieNigel # Omu # - PlushieBrizby # Omu # - PlushieBoggle # Omu # - PlushieLehmin # Omu @@ -425,7 +424,6 @@ # - EvilPlushieXeve # Omu # - EvilPlushieBoggle # Omu # - EvilPlushieBrizby # Omu -# - EvilPlushieNigel # Omu # - EvilPlushieFern # Omu # - EvilPlushieJvne # Omu - EvilPlushieMnwaar diff --git a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json index 7804ef86899..eaa7a4e269b 100644 --- a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "plushie_fern" }, - { - "name": "plushie_nigel" - }, { "name": "plushie_mnwaar" }, diff --git a/Resources/migration.yml b/Resources/migration.yml index 730ea20c78e..c8025a3583d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -1139,3 +1139,7 @@ DVSmartFridgeMedical: SmartFridgeMedical # 2026-01-10 Goobstation Change Mapped Chem to Energy Chem by default # ChemDispenser: EnergyChemDispenser #omu edit + +# 2026-06-07 +PlushieNigel: null +