From fa305c2aecd4b3e3b7cbeff23dd0929afbb777f8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 3 Jun 2017 08:37:30 -0500 Subject: [PATCH] [MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300) * Fix NOPOWER being set incorrectly for holopads * Update hologram.dm * Delete hologram.dm.rej --- code/game/machinery/hologram.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 8301416f0c..8578096b3e 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -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 \ No newline at end of file +#undef HOLOGRAM_POWER_USAGE