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

Merge branch 'dev' into PowerTwo

Browse Source 
Conflicts:
	code/modules/power/solar.dm
This commit is contained in:
PsiOmega
2014-10-24 13:32:36 +02:00
parent 3a7066c6c1 f5d43128cc
commit 8e3861141c
228 changed files with 3066 additions and 2725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/power/singularity/collector.dm
View File

@@ -66,6 +66,7 @@ var/global/list/rad_collectors = list()
src.P = W
W.loc = src
update_icons()
return 1
else if(istype(W, /obj/item/weapon/crowbar))
if(P && !src.locked)
eject()
@@ -83,6 +84,7 @@ var/global/list/rad_collectors = list()
connect_to_network()
else
disconnect_from_network()
return 1
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
if(active)
@@ -93,10 +95,8 @@ var/global/list/rad_collectors = list()
user << "\red The controls can only be locked when the [src] is active"
else
user << "\red Access denied!"
return 1
else
..()
return 1
return ..()
/obj/machinery/power/rad_collector/examine()
..()