Attempt to resolve merge conflict. I hope i won't break something.

This commit is contained in:
Atlantiscze
2014-09-12 20:07:21 +02:00
parent 03f2be3091
commit cbeff523ac
2 changed files with 5 additions and 1 deletions

View File

@@ -219,7 +219,7 @@
if(istype(W, /obj/item/stack/cable_coil) && !terminal && !building_terminal)
building_terminal = 1
var/obj/item/stack/cable_coil/CC = W
if (CC.amount < 10)
if (CC.get_amount() <= 10)
user << "<span class='warning'>You need more cables.</span>"
building_terminal = 0
return 0

View File

@@ -182,6 +182,10 @@
..()
/obj/machinery/power/smes/buildable/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
// No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences.
if (failing)
user << "<span class='warning'>The [src]'s screen is flashing with alerts. It seems to be overloaded! Touching it now is probably not a good idea.</span>"
return
// If parent returned 1:
// - Hatch is open, so we can modify the SMES
// - No action was taken in parent function (terminal de/construction atm).