one extra fix to feeding tube, rose plush

- fwend acquired :)
- fixed some naming issues in the feeding tube
This commit is contained in:
Sonoida
2022-12-15 15:05:27 +01:00
parent 290a1de761
commit 9880b65240
3 changed files with 16 additions and 12 deletions
+10 -12
View File
@@ -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("<span class='warning'>[attached] is detached from [src]'s mouth.</span>")
visible_message("<span class='warning'>[attached] is detached from [src].</span>")
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, "<span class='warning'>You can't do that!</span>")
// return
if(!isliving(usr))
to_chat(usr, "<span class='warning'>You can't do that!</span>")
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)
. = ..()
+6
View File
@@ -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"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB