Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things

This commit is contained in:
Anewbe
2017-11-19 02:38:42 -06:00
295 changed files with 17587 additions and 15507 deletions

View File

@@ -681,13 +681,10 @@
else
flick("apc-spark", src)
if (do_after(user,6))
if(prob(50))
emagged = 1
locked = 0
to_chat(user,"<span class='notice'>You emag the APC interface.</span>")
update_icon()
else
to_chat(user,"<span class='warning'>The APC interface refused to unlock.</span>")
emagged = 1
locked = 0
to_chat(user,"<span class='notice'>You emag the APC interface.</span>")
update_icon()
return 1
/obj/machinery/power/apc/attack_hand(mob/user)

View File

@@ -4,6 +4,8 @@
than the alternative."
icon_state = "gridchecker_on"
circuit = /obj/item/weapon/circuitboard/grid_checker
density = 1
anchored = 1
var/power_failing = FALSE // Turns to TRUE when the grid check event is fired by the Game Master, or perhaps a cheeky antag.
// Wire stuff below.
var/datum/wires/grid_checker/wires