Skip to content

Commit

Permalink
i did a fucky wucky with the plushie (#3552)
Browse files Browse the repository at this point in the history
* 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 0515c9d, reversing
changes made to f7e63d1.

* Reapply "Merge remote-tracking branch 'upstream/master' into littlefuckerplushie"

This reverts commit 39e06d1.

* Update plushies.dm

* rasddfsafasd

* Update toys.dm

* Update toys.dm

* Update plushies.dm

* RAAAAAA
  • Loading branch information
TTNT789 authored Sep 25, 2024
1 parent 2846fbc commit c18511d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion monkestation/code/game/objects/items/plushies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions monkestation/code/modules/loadouts/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion monkestation/code/modules/store/store_items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c18511d

Please sign in to comment.