From fff5fa71ee9a56491501b0f1421fe1d96bef461b Mon Sep 17 00:00:00 2001 From: Marikiii Date: Fri, 5 Jun 2026 21:20:33 +0100 Subject: [PATCH 1/3] remove all mentions of nigel --- Resources/Maps/_Goobstation/cog.yml | 10 ----- Resources/Maps/_Omu/cog.yml | 10 ----- .../Entities/Objects/Fun/toys.yml | 37 ------------------ .../Structures/Machines/gambling_machines.yml | 2 - .../Objects/Fun/toys.rsi/meta.json | 5 +-- .../Objects/Fun/toys.rsi/plushie_nigel.png | Bin 796 -> 0 bytes 6 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png 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 56699daccd8..c4830ce12d1 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..38ca11b011b 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml @@ -461,37 +461,6 @@ 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 parent: BasePlushie id: PlushieBrizby @@ -1024,12 +993,6 @@ id: EvilPlushieBrizby suffix: Evil -- type: entity - name: evil Nigel plush - parent: PlushieNigel - id: EvilPlushieNigel - suffix: Evil - - type: entity name: evil Fern plush parent: PlushieFern diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/gambling_machines.yml index 1bff50e55b6..af302fa43f3 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 @@ -402,7 +401,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..240c372b362 100644 --- a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "BeeRobynn, George Gimme, and Ahti, Abductor by Shy Bandit, plushie_jvne by Jvne, plushie_samantha by SolsticeOfTheWinter, fern by Bobbble, plushie_nigel by SS14:gorgan_freemen/Discord:Dummy, plushie_mnwaar by ShieldAcrados based on the Einstein Engines shadowkin plushie, plushiemnwaar-inhand-left and plushiemnwaar-inhand-right by MarkerWicker, plushie_brizby and plushie_baldzby by Zethine, plushie_boggle and plushie_lehmin by KipperSkipp, plushie xeve by Yonsim, plushie holy by SDPowerStroke, TwoFish by Yero", + "copyright": "BeeRobynn, George Gimme, and Ahti, Abductor by Shy Bandit, plushie_jvne by Jvne, plushie_samantha by SolsticeOfTheWinter, fern by Bobbble, plushie_mnwaar by ShieldAcrados based on the Einstein Engines shadowkin plushie, plushiemnwaar-inhand-left and plushiemnwaar-inhand-right by MarkerWicker, plushie_brizby and plushie_baldzby by Zethine, plushie_boggle and plushie_lehmin by KipperSkipp, plushie xeve by Yonsim, plushie holy by SDPowerStroke, TwoFish by Yero", "size": { "x": 32, "y": 32 @@ -19,9 +19,6 @@ { "name": "plushie_fern" }, - { - "name": "plushie_nigel" - }, { "name": "plushie_mnwaar" }, diff --git a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png deleted file mode 100644 index b796cfd676dc0e3f1d90606d0dd4402a8fe4adeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 zcmV+%1LOROP)Px%yh%hsR9HvtmR(2`Q546|)=sdNmV-r$=z~J`Vg`v21hQa-Z6DiXvP2LPlxai? zCIuA|LG)o#4;4`e^%4c`YS4oSfe;FPJSEtJVnxbUY^@8sGI7puhP&g=%$;^(U%D@M zXYQH%|DE$c2i6BgUcMsh!+(H+E701gXrhfH6B$=`x(Y@iv!GQE$%427kQHYr83<_r z79YNS1G2vpq~Tw!!k*)&ECZyajz7C-aKtgK>h8u0Uq=l2-O$D+%{OwEME*i=g=xJq6}A5kfU6LD`)Sz(FbE&em?l4ivj2`_f{p=r>D_QG zHDUBnJ-nO&IDGL1X+1i>k9G#Qci|d6A33&5N?h6k1o$wo`x}acb1IPD+y=ky_X3~S zudjxouSpo2{3ey0V^H(94U~Pu%I_qcsB44pK^-FgEKa{gfOkv!q~MZ)umwmyJfQ6z z7^lmk8%t?lbM$gf1yGz9RzU<9z0wXVTKfNf3==mSHDz5TAcPqJvu{qk&Jo84GXTD` zgK)F}Ay$>D@c5}dYGdjS!vZmTCTWjP`_Q&n=XQFP`7sA-*My~xBLH9A*`#RLU}%Bp zz32y8Fz`nILxSMA+lk}36hK{7g|<8Rb6FFb{l@?X$Y~Ut2U`FX=5NnzS!*<**?&B^ z`d$b8IJ+Q~6yIwZEQ(_=Rsb#FNf5JValX_Igew3PUTF0000 Date: Sun, 7 Jun 2026 00:26:56 +0100 Subject: [PATCH 2/3] requested changes --- .../Entities/Objects/Fun/toys.yml | 37 ++++++++++++++++++ .../Objects/Fun/toys.rsi/meta.json | 2 +- .../Objects/Fun/toys.rsi/plushie_nigel.png | Bin 0 -> 796 bytes Resources/migration.yml | 3 ++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml index 38ca11b011b..d551854437d 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Fun/toys.yml @@ -461,6 +461,37 @@ sound: path: /Audio/_Goobstation/Wizard/charge.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 id: PlushieBrizby @@ -993,6 +1024,12 @@ id: EvilPlushieBrizby suffix: Evil +# - type: entity # Omu +# name: evil Nigel plush +# parent: PlushieNigel +# id: EvilPlushieNigel +# suffix: Evil + - type: entity name: evil Fern plush parent: PlushieFern diff --git a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json index 240c372b362..eaa7a4e269b 100644 --- a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "BeeRobynn, George Gimme, and Ahti, Abductor by Shy Bandit, plushie_jvne by Jvne, plushie_samantha by SolsticeOfTheWinter, fern by Bobbble, plushie_mnwaar by ShieldAcrados based on the Einstein Engines shadowkin plushie, plushiemnwaar-inhand-left and plushiemnwaar-inhand-right by MarkerWicker, plushie_brizby and plushie_baldzby by Zethine, plushie_boggle and plushie_lehmin by KipperSkipp, plushie xeve by Yonsim, plushie holy by SDPowerStroke, TwoFish by Yero", + "copyright": "BeeRobynn, George Gimme, and Ahti, Abductor by Shy Bandit, plushie_jvne by Jvne, plushie_samantha by SolsticeOfTheWinter, fern by Bobbble, plushie_nigel by SS14:gorgan_freemen/Discord:Dummy, plushie_mnwaar by ShieldAcrados based on the Einstein Engines shadowkin plushie, plushiemnwaar-inhand-left and plushiemnwaar-inhand-right by MarkerWicker, plushie_brizby and plushie_baldzby by Zethine, plushie_boggle and plushie_lehmin by KipperSkipp, plushie xeve by Yonsim, plushie holy by SDPowerStroke, TwoFish by Yero", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png b/Resources/Textures/_Goobstation/Objects/Fun/toys.rsi/plushie_nigel.png new file mode 100644 index 0000000000000000000000000000000000000000..b796cfd676dc0e3f1d90606d0dd4402a8fe4adeb GIT binary patch literal 796 zcmV+%1LOROP)Px%yh%hsR9HvtmR(2`Q546|)=sdNmV-r$=z~J`Vg`v21hQa-Z6DiXvP2LPlxai? zCIuA|LG)o#4;4`e^%4c`YS4oSfe;FPJSEtJVnxbUY^@8sGI7puhP&g=%$;^(U%D@M zXYQH%|DE$c2i6BgUcMsh!+(H+E701gXrhfH6B$=`x(Y@iv!GQE$%427kQHYr83<_r z79YNS1G2vpq~Tw!!k*)&ECZyajz7C-aKtgK>h8u0Uq=l2-O$D+%{OwEME*i=g=xJq6}A5kfU6LD`)Sz(FbE&em?l4ivj2`_f{p=r>D_QG zHDUBnJ-nO&IDGL1X+1i>k9G#Qci|d6A33&5N?h6k1o$wo`x}acb1IPD+y=ky_X3~S zudjxouSpo2{3ey0V^H(94U~Pu%I_qcsB44pK^-FgEKa{gfOkv!q~MZ)umwmyJfQ6z z7^lmk8%t?lbM$gf1yGz9RzU<9z0wXVTKfNf3==mSHDz5TAcPqJvu{qk&Jo84GXTD` zgK)F}Ay$>D@c5}dYGdjS!vZmTCTWjP`_Q&n=XQFP`7sA-*My~xBLH9A*`#RLU}%Bp zz32y8Fz`nILxSMA+lk}36hK{7g|<8Rb6FFb{l@?X$Y~Ut2U`FX=5NnzS!*<**?&B^ z`d$b8IJ+Q~6yIwZEQ(_=Rsb#FNf5JValX_Igew3PUTF0000 Date: Sun, 7 Jun 2026 17:55:01 +0100 Subject: [PATCH 3/3] Update migration.yml again --- Resources/migration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 3ecb29fbb5b..c8025a3583d 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -1138,8 +1138,8 @@ FoodDonutJellySlugcat: FoodDonutJellyScurret DVSmartFridgeMedical: SmartFridgeMedical # 2026-01-10 Goobstation Change Mapped Chem to Energy Chem by default -ChemDispenser: EnergyChemDispenser +# ChemDispenser: EnergyChemDispenser #omu edit # 2026-06-07 PlushieNigel: null -# ChemDispenser: EnergyChemDispenser #omu edit +