cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3142 from Alek2ander/master"

Browse Source 
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
This commit is contained in:
Razharas
2014-03-29 18:02:54 +04:00
parent e63a01aff0
commit 6cb3ae5183
23 changed files with 247 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -20,7 +20,6 @@
var/assembled = 0
var/parts = null
var/datum/wires/particle_acc/control_box/wires = null
paiallowed = 1
/obj/machinery/particle_accelerator/control_box/New()
wires = new(src)
@@ -35,21 +34,11 @@
/obj/machinery/particle_accelerator/control_box/attack_hand(mob/user as mob)
if(construction_state >= 3)
interact(user)
else if(construction_state == 2 && (get_dist(src, user) <= 1)) // Wires exposed
else if(construction_state == 2) // Wires exposed
wires.Interact(user)
/obj/machinery/particle_accelerator/control_box/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/device/paicard))
var/obj/item/device/paicard/C = W
if(C.pai && (C.pai.stat != DEAD) && C.pai.pairing)
C.pai.pair(src)
else
..()
/obj/machinery/particle_accelerator/control_box/update_state()
if(construction_state < 3)
if(paired)
paired.unpair()
use_power = 0
assembled = 0
active = 0
@@ -147,8 +136,6 @@
/obj/machinery/particle_accelerator/control_box/power_change()
..()
if(stat & NOPOWER)
if(paired)
paired.unpair()
active = 0
use_power = 0
else if(!stat && construction_state <= 3)