Merge pull request #3181 from Zuhayr/master

Fixes solar control and SMES for borgs.
This commit is contained in:
Chinsky
2013-06-27 16:12:17 -07:00
2 changed files with 3 additions and 3 deletions

View File

@@ -177,7 +177,7 @@
/obj/machinery/power/smes/interact(mob/user)
if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon))
user.unset_machine()
user << browse(null, "window=smes")
return
@@ -364,4 +364,4 @@
return rate
#undef SMESRATE
#undef SMESRATE

View File

@@ -395,7 +395,7 @@ var/list/solars_list = list()
/obj/machinery/power/solar_control/interact(mob/user)
if(stat & (BROKEN | NOPOWER)) return
if ( (get_dist(src, user) > 1 ))
if (!istype(user, /mob/living/silicon/ai))
if (!istype(user, /mob/living/silicon))
user.unset_machine()
user << browse(null, "window=solcon")
return