cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into StatusDisplay

Browse Source 
conflicts:
	maps/tgstation2.dmm
This commit is contained in:
PsiOmega
2014-08-26 14:21:29 +02:00
parent a3b683d10f f40298715f
commit a1dd07db38
73 changed files with 501 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/computer3/buildandrepair.dm
+2 -2
View File
@@ -154,7 +154,7 @@
user << "\red There's already \an [battery] in [src]!"
if(istype(P, /obj/item/weapon/cable_coil))
if(istype(P, /obj/item/stack/cable_coil))
if(P:amount >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
@@ -173,7 +173,7 @@
user << "\blue You remove the cables."
src.state = 2
src.icon_state = "2"
var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc )
var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
A.amount = 5
if(istype(P, /obj/item/weapon/crowbar)) // complicated check