cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3181 from Zuhayr/master

Browse Source 
Fixes solar control and SMES for borgs.
This commit is contained in:
Chinsky
2013-06-27 16:12:17 -07:00
parent 5d912b70b2 6f207a3a14
commit 12a79e4ade
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/smes.dm
View File

@@ -177,7 +177,7 @@
/obj/machinery/power/smes/interact(mob/user) /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.unset_machine()
user << browse(null, "window=smes") user << browse(null, "window=smes")
return return

2
code/modules/power/solar.dm
View File

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