diff --git a/code/game/machinery/feeding_tube.dm b/code/game/machinery/feeding_tube.dm index a492780f..6f927d42 100644 --- a/code/game/machinery/feeding_tube.dm +++ b/code/game/machinery/feeding_tube.dm @@ -4,7 +4,7 @@ #define FEEDTUBE_INJECTING 1 /obj/machinery/feeding_tube - name = "\improper Feeding Tube" + name = "\improper Feeding tube" desc = "something something test." icon = 'icons/obj/feeding_tube.dmi' icon_state = "feeding_tube" @@ -68,7 +68,7 @@ return if(attached) - visible_message("[attached] is detached from [src]'s mouth.") + visible_message("[attached] is detached from [src].") attached = null update_icon() return @@ -157,7 +157,7 @@ if(!ishuman(user)) return if(attached) - visible_message("[attached] is detached from [src]'s mouth") + visible_message("[attached] is detached from the feeding tube.") attached = null update_icon() return @@ -168,7 +168,7 @@ /obj/machinery/feeding_tube/verb/eject_beaker() set category = "Object" - set name = "Remove Feeding Container" + set name = "Remove feeding container" set src in view(1) if(!isliving(usr)) @@ -189,15 +189,13 @@ // set name = "Toggle Mode" // set src in view(1) -// if(!isliving(usr)) -// to_chat(usr, "You can't do that!") -// return + if(!isliving(usr)) + to_chat(usr, "You can't do that!") + return -// if(usr.incapacitated()) -// return -// mode = !mode -// to_chat(usr, "The feeding hose is now [mode ? "injecting" : "taking blood"].") -// update_icon() + if(usr.incapacitated()) + return + update_icon() /obj/machinery/feeding_tube/examine(mob/user) . = ..() diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 93d57252..cc25d1d3 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -1037,6 +1037,12 @@ item_state = "melony" attack_verb = list("bleated", "wobbled", "Melony'd") +/obj/item/toy/plush/rose + desc = "An energetic looking snake toy with a silly little rose hanging from the side of his head.." + icon_state = "rose" + item_state = "rose" + attack_verb = list("hissed", "nibbled", "squished") + /obj/item/toy/plush/mammal/fox icon_state = "fox" item_state = "fox" diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 0f06b833..6fb35b1c 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ