cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

plushie love (#4964)

Browse Source 
* plushie love

* Kiss2

* good god why

* you can make severed heads kiss now :)

* [I] first

* [I] first2

* comma

* comma
This commit is contained in:
Belsima
2018-02-27 15:49:06 -05:00
committed by Anewbe
parent cf79159b31
commit a578eeeb85
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/toys.dm
View File

@@ -727,6 +727,7 @@
user.visible_message("<span class='notice'><b>\The [user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>") user.visible_message("<span class='notice'><b>\The [user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
visible_message("[src] says, \"[phrase]\"") visible_message("[src] says, \"[phrase]\"")
/obj/structure/plushie/ian /obj/structure/plushie/ian
name = "plush corgi" name = "plush corgi"
desc = "A plushie of an adorable corgi! Don't you just want to hug it and squeeze it and call it \"Ian\"?" desc = "A plushie of an adorable corgi! Don't you just want to hug it and squeeze it and call it \"Ian\"?"
@@ -788,6 +789,12 @@
to_chat(M, "You name the plushie [input], giving it a hug for good luck.") to_chat(M, "You name the plushie [input], giving it a hug for good luck.")
return 1 return 1
/obj/item/toy/plushie/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head))
user.visible_message("<span class='notice'>[user] makes \the [I] kiss \the [src]!.</span>", \
"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
return ..()
/obj/item/toy/plushie/nymph /obj/item/toy/plushie/nymph
name = "diona nymph plush" name = "diona nymph plush"
desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not." desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not."

6
code/modules/organs/subtypes/standard.dm
View File

@@ -306,6 +306,12 @@
owner.custom_pain("A jolt of pain surges through your [name]!",1) owner.custom_pain("A jolt of pain surges through your [name]!",1)
owner.eye_blurry += 20 //Specific level 2 'feature owner.eye_blurry += 20 //Specific level 2 'feature
/obj/item/organ/external/head/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/toy/plushie) || istype(I, /obj/item/organ/external/head))
user.visible_message("<span class='notice'>[user] makes \the [I] kiss \the [src]!.</span>", \
"<span class='notice'>You make \the [I] kiss \the [src]!.</span>")
return ..()
/obj/item/organ/external/head/skrell /obj/item/organ/external/head/skrell
eye_icon = "skrell_eyes_s" eye_icon = "skrell_eyes_s"