Code updates

This commit is contained in:
Razgriz
2020-11-04 03:03:00 -07:00
parent 54755b9e2b
commit 10be6bb563

View File

@@ -1,13 +1,11 @@
/obj/machinery/feeder /obj/machinery/feeder
name = "\improper Feeder" name = "\improper Feeder"
icon = 'icons/obj/feeder.dmi' icon = 'icons/obj/feeder.dmi'
desc = "This is a feeder. Put in a regent container, then click and drag the feeder to someone!" desc = "This is a feeder. Put in a reagent container, then click and drag the feeder to someone!"
anchored = 0 anchored = FALSE
density = 0 density = FALSE
var/mob/living/carbon/human/attached = null
var/obj/item/weapon/reagent_containers/beaker = null
/obj/machinery/feeder/var/mob/living/carbon/human/attached = null
/obj/machinery/feeder/var/obj/item/weapon/reagent_containers/beaker = null
/obj/machinery/feeder/update_icon() /obj/machinery/feeder/update_icon()
if(attached) if(attached)
@@ -15,7 +13,7 @@
else else
icon_state = "" icon_state = ""
overlays = null overlays.Cut()
if(beaker) if(beaker)
var/datum/reagents/reagents = beaker.reagents var/datum/reagents/reagents = beaker.reagents
@@ -42,7 +40,7 @@
return return
if(attached) if(attached)
visible_message("The feeding tube is pulled out of [attached]") visible_message("The feeding tube is pulled out of [attached].")
attached = null attached = null
update_icon() update_icon()
return return
@@ -56,18 +54,19 @@
/obj/machinery/feeder/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/machinery/feeder/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/reagent_containers)) if(istype(W, /obj/item/weapon/reagent_containers))
if(!isnull(beaker)) if(!isnull(beaker))
user << "There is already a reagent container inserted!" . += "There is already a reagent container inserted!"
return return
user.drop_item() user.drop_item()
W.loc = src W.loc = src
beaker = W beaker = W
user << "You insert \the [W] into \the [src]." . += "You insert \the [W] into \the [src]."
update_icon() update_icon()
return return
if(default_deconstruction_screwdriver(user, W)) if(default_deconstruction_screwdriver(user, W))
if(do_after(user, 15)) if(do_after(user, 15))
to_chat(user, "You deconstruct the feeder.")
var/obj/item/stack/material/plastic/A = new /obj/item/stack/material/plastic(src.loc) var/obj/item/stack/material/plastic/A = new /obj/item/stack/material/plastic(src.loc)
A.amount = 4 A.amount = 4
if(beaker) if(beaker)
@@ -104,18 +103,18 @@
return ..() return ..()
/obj/machinery/feeder/examine(mob/user) /obj/machinery/feeder/examine(mob/user)
..(user) .=..()
if(!(user in view(2)) && user != src.loc) return if(!(user in view(2)) && user != src.loc) return
if(beaker) if(beaker)
if(beaker.reagents && beaker.reagents.reagent_list.len) if(beaker.reagents && beaker.reagents.reagent_list.len)
usr << "<span class='notice'>Inserted is \a [beaker] with [beaker.reagents.total_volume] units of liquid.</span>" . += "<span class='notice'>Inserted is \a [beaker] with [beaker.reagents.total_volume] units of liquid.</span>"
else else
usr << "<span class='notice'>Inserted is an empty [beaker].</span>" . += "<span class='notice'>Inserted is an empty [beaker].</span>"
else else
usr << "<span class='notice'>No container is inserted.</span>" . += "<span class='notice'>No container is inserted.</span>"
usr << "<span class='notice'>[attached ? attached : "No one"] is being fed by it.</span>" . += "<span class='notice'>[attached ? attached : "No one"] is being fed by it.</span>"
/obj/machinery/feeder/CanPass(atom/movable/mover, turf/target, height = 0, air_group = 0) /obj/machinery/feeder/CanPass(atom/movable/mover, turf/target, height = 0, air_group = 0)
if(height && istype(mover) && mover.checkpass(PASSTABLE)) //allow bullets, beams, thrown objects, mice, drones, and the like through. if(height && istype(mover) && mover.checkpass(PASSTABLE)) //allow bullets, beams, thrown objects, mice, drones, and the like through.