Skip to content

Commit

Permalink
eeble plushie (#3540)
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
  • Loading branch information
TTNT789 authored Sep 24, 2024
1 parent 3f96a09 commit 9fc7dc5
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions monkestation/code/game/objects/items/plushies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,11 @@
icon = 'monkestation/icons/obj/plushes.dmi'
icon_state = "durrcell"
squeak_override = list('monkestation/sound/voice/durrcell-squeak.ogg'=1)

/obj/item/toy/plush/eeble
name = "Eeble plushie"
attack_verb_simple = list("Eeble","prybar")
attack_verb_continuous = list("Eebles","prybars")
desc = "Eeble is Eeble"
icon = 'monkestation/icons/obj/plushes.dmi'
icon_state = "eeble"
Binary file modified monkestation/code/modules/blueshift/icons/plushes.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions monkestation/code/modules/blueshift/items/plushies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -586,3 +586,4 @@
attack_verb_continuous = list("beeps", "washes", "mops", "squirts", "soaps")
attack_verb_simple = list("beep", "wash", "mop", "squirt", "soap")
//squeak_override = list('sound/machines/twobeep.ogg' = 1)

1 change: 1 addition & 0 deletions monkestation/code/modules/donator/code/item/plush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,4 @@
desc = "Hello there."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "toadie_wan_kenfrogi"

Empty file.
5 changes: 5 additions & 0 deletions monkestation/code/modules/store/store_items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,8 @@ GLOBAL_LIST_INIT(store_toys, generate_store_items(/datum/store_item/toys))
store_desc = "''Behold, Man''"
item_path = /obj/item/toy/plush/durrcell
item_cost = 6969
/datum/store_item/toys/Eeble
name = "Eeble Plush"
store_desc = "Eeble is Eeble"
item_path = /obj/item/toy/plush/eeble
item_cost = 5000
Binary file modified monkestation/icons/obj/plushes.dmi
Binary file not shown.

0 comments on commit 9fc7dc5

Please sign in to comment.