Skip to content
Open
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: 0 additions & 10 deletions Resources/Maps/_Goobstation/cog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions Resources/Maps/_Omu/cog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
70 changes: 35 additions & 35 deletions Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@
- PlushieAbductor
# - PlushieJvne # Omu
# - PlushieFern # Omu
# - PlushieNigel # Omu
# - PlushieBrizby # Omu
# - PlushieBoggle # Omu
# - PlushieLehmin # Omu
Expand Down Expand Up @@ -425,7 +424,6 @@
# - EvilPlushieXeve # Omu
# - EvilPlushieBoggle # Omu
# - EvilPlushieBrizby # Omu
# - EvilPlushieNigel # Omu
# - EvilPlushieFern # Omu
# - EvilPlushieJvne # Omu
- EvilPlushieMnwaar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
{
"name": "plushie_fern"
},
{
"name": "plushie_nigel"
},
{
"name": "plushie_mnwaar"
},
Expand Down
4 changes: 4 additions & 0 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading