From c18511d48fd75154bdd3e2c6940b00c6f4879e79 Mon Sep 17 00:00:00 2001 From: TTNT789 <105447889+TTNT789@users.noreply.github.com> Date: Wed, 25 Sep 2024 08:04:53 -0600 Subject: [PATCH] i did a fucky wucky with the plushie (#3552) * creates a file path for all the fauna * Merge remote-tracking branch 'upstream/master' * littlefuckermade theittybittylittletinyfuckerhasbeenmade * Revert "Merge remote-tracking branch 'upstream/master' into littlefuckerplushie" This reverts commit 0515c9db63fce495630efbb7e879d6ef86531272, reversing changes made to f7e63d18709e93c44aa80b72ad6ca87762226254. * Reapply "Merge remote-tracking branch 'upstream/master' into littlefuckerplushie" This reverts commit 39e06d1c7f82ac91eeb26eeb39950fbf662945d1. * Update plushies.dm * rasddfsafasd * Update toys.dm * Update toys.dm * Update plushies.dm * RAAAAAA --- monkestation/code/game/objects/items/plushies.dm | 2 +- monkestation/code/modules/loadouts/items/toys.dm | 4 ++++ monkestation/code/modules/store/store_items/toys.dm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/monkestation/code/game/objects/items/plushies.dm b/monkestation/code/game/objects/items/plushies.dm index 553a33115aa2..2ceb89b5135c 100644 --- a/monkestation/code/game/objects/items/plushies.dm +++ b/monkestation/code/game/objects/items/plushies.dm @@ -62,7 +62,7 @@ icon_state = "durrcell" squeak_override = list('monkestation/sound/voice/durrcell-squeak.ogg'=1) -/obj/item/toy/plush/eeble +/obj/item/toy/plush/Eeble name = "Eeble plushie" attack_verb_simple = list("Eeble","prybar") attack_verb_continuous = list("Eebles","prybars") diff --git a/monkestation/code/modules/loadouts/items/toys.dm b/monkestation/code/modules/loadouts/items/toys.dm index cb6e2d2e4947..61984f523ab6 100644 --- a/monkestation/code/modules/loadouts/items/toys.dm +++ b/monkestation/code/modules/loadouts/items/toys.dm @@ -221,3 +221,7 @@ GLOBAL_LIST_INIT(loadout_toys, generate_loadout_items(/datum/loadout_item/toys)) /datum/loadout_item/toys/durrcell name = "Durrcell Plush" item_path = /obj/item/toy/plush/durrcell + +/datum/loadout_item/toys/Eeble + name = "Eeble Plushie" + item_path = /obj/item/toy/plush/Eeble diff --git a/monkestation/code/modules/store/store_items/toys.dm b/monkestation/code/modules/store/store_items/toys.dm index 18b200c5bdb4..3f4f2df80112 100644 --- a/monkestation/code/modules/store/store_items/toys.dm +++ b/monkestation/code/modules/store/store_items/toys.dm @@ -226,5 +226,5 @@ GLOBAL_LIST_INIT(store_toys, generate_store_items(/datum/store_item/toys)) /datum/store_item/toys/Eeble name = "Eeble Plush" store_desc = "Eeble is Eeble" - item_path = /obj/item/toy/plush/eeble + item_path = /obj/item/toy/plush/Eeble item_cost = 5000