[MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)

* Fix NOPOWER being set incorrectly for holopads

* Update hologram.dm

* Delete hologram.dm.rej
This commit is contained in:
CitadelStationBot
2017-06-03 08:37:30 -05:00
committed by kevinz000
parent 1330b9f733
commit fa305c2aec
+2 -2
View File
@@ -74,7 +74,7 @@ Possible to do for anyone motivated enough:
if (powered())
stat &= ~NOPOWER
else
stat |= ~NOPOWER
stat |= NOPOWER
/obj/machinery/holopad/RefreshParts()
var/holograph_range = 4
@@ -402,4 +402,4 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
#undef HOLOPAD_PASSIVE_POWER_USAGE
#undef HOLOGRAM_POWER_USAGE
#undef HOLOGRAM_POWER_USAGE