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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix

Browse Source
This commit is contained in:
Ccomp5950
2013-12-05 04:42:28 -06:00
parent 157b67404c ad4782babe
commit dd94adc765
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/power/apc.dm
View File

@@ -800,7 +800,8 @@
if(!can_use(usr, 1))
return
src.add_fingerprint(usr)
usr.set_machine(src)
if(usingUI) // If we set their machine and they're not using the UI, it'll cause the UI to pop up.
usr.set_machine(src)
if (href_list["apcwires"])
var/t1 = text2num(href_list["apcwires"])
if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))