Another set of brainmed adjustment & miscellaneous things. (#11354)

This commit is contained in:
Matt Atlas
2021-03-05 23:35:58 +01:00
committed by GitHub
parent 607fe6680f
commit 80be3d88e1
10 changed files with 87 additions and 26 deletions
@@ -257,7 +257,7 @@
/obj/structure/bed/roller/attackby(obj/item/I, mob/user)
if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I))
return 1
if(iv_stand && !beaker && istype(I, /obj/item/reagent_containers))
if(iv_stand && !beaker && (istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/blood)))
if(!user.unEquip(I, target = src))
return
to_chat(user, SPAN_NOTICE("You attach \the [I] to \the [src]."))
@@ -314,7 +314,7 @@
..()
if(use_check(usr) || !Adjacent(usr))
return
if(!(ishuman(usr) || isrobot(usr)))
if(!ishuman(usr))
return
if(over_object == buckled && beaker)
if(iv_attached)
@@ -210,11 +210,12 @@
/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
..()
if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
if(!ishuman(usr))
return FALSE
if(buckled)
return FALSE
if(!ishuman(usr))
return FALSE
if(buckled)
return FALSE
if(!usr.Adjacent(src))
return FALSE
visible_message(SPAN_NOTICE("[usr] collapses [src]."))
var/obj/item/wheelchair/R = new(get_turf(src))
R.name = src.name