[MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes * Update bananashoes.dm
This commit is contained in:
committed by
Poojawa
parent
ec65e75b10
commit
8ef3861b0b
@@ -1643,7 +1643,7 @@
|
||||
/obj/item/toy/talking/griffin,
|
||||
/obj/item/toy/nuke,
|
||||
/obj/item/toy/minimeteor,
|
||||
/obj/item/toy/carpplushie,
|
||||
/obj/item/toy/plush/carpplushie,
|
||||
/obj/item/coin/antagtoken,
|
||||
/obj/item/stack/tile/fakespace/loaded,
|
||||
/obj/item/gun/ballistic/shotgun/toy/crossbow,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/obj/item/clothing/shoes/proc/step_action() //this was made to rewrite clown shoes squeaking
|
||||
SendSignal(COMSIG_SHOES_STEP_ACTION)
|
||||
|
||||
/obj/item/clothing/shoes/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?</span>")
|
||||
@@ -79,15 +80,11 @@
|
||||
item_state = "clown_shoes"
|
||||
slowdown = SHOES_SLOWDOWN+1
|
||||
item_color = "clown"
|
||||
var/footstep = 1 //used for squeeks whilst walking
|
||||
pockets = /obj/item/storage/internal/pocket/shoes/clown
|
||||
|
||||
/obj/item/clothing/shoes/clown_shoes/step_action()
|
||||
if(footstep > 1)
|
||||
playsound(src, "clownstep", 50, 1)
|
||||
footstep = 0
|
||||
else
|
||||
footstep++
|
||||
/obj/item/clothing/shoes/clown_shoes/Initialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50)
|
||||
|
||||
/obj/item/clothing/shoes/clown_shoes/jester
|
||||
name = "jester shoes"
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
/obj/item/toy/foamblade,
|
||||
/obj/item/toy/prize/ripley,
|
||||
/obj/item/toy/prize/honk,
|
||||
/obj/item/toy/carpplushie,
|
||||
/obj/item/toy/plush/carpplushie,
|
||||
/obj/item/toy/redbutton,
|
||||
/obj/item/clothing/head/collectable/rabbitears)
|
||||
new won(where)
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
/mob/living/simple_animal/mouse/Initialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100)
|
||||
if(!body_color)
|
||||
body_color = pick( list("brown","gray","white") )
|
||||
icon_state = "mouse_[body_color]"
|
||||
@@ -58,7 +59,6 @@
|
||||
if(!stat)
|
||||
var/mob/M = AM
|
||||
to_chat(M, "<span class='notice'>[icon2html(src, M)] Squeek!</span>")
|
||||
playsound(src, 'sound/effects/mousesqueek.ogg', 100, 1)
|
||||
..()
|
||||
|
||||
/mob/living/simple_animal/mouse/handle_automated_action()
|
||||
|
||||
@@ -160,8 +160,8 @@
|
||||
cube.Expand()
|
||||
|
||||
// Dehydrated carp
|
||||
else if(istype(O, /obj/item/toy/carpplushie/dehy_carp))
|
||||
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
|
||||
else if(istype(O, /obj/item/toy/plush/carpplushie/dehy_carp))
|
||||
var/obj/item/toy/plush/carpplushie/dehy_carp/dehy = O
|
||||
dehy.Swell() // Makes a carp
|
||||
|
||||
else if(istype(O, /obj/item/stack/sheet/hairlesshide))
|
||||
|
||||
@@ -710,7 +710,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
|
||||
name = "Dehydrated Space Carp"
|
||||
desc = "Looks like a plush toy carp, but just add water and it becomes a real-life space carp! Activate in \
|
||||
your hand before use so it knows not to kill you."
|
||||
item = /obj/item/toy/carpplushie/dehy_carp
|
||||
item = /obj/item/toy/plush/carpplushie/dehy_carp
|
||||
cost = 1
|
||||
|
||||
/datum/uplink_item/stealthy_weapons/soap_clusterbang
|
||||
|
||||
Reference in New Issue
Block a user