mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-06 07:22:42 +00:00
Attempt to resolve merge conflict. I hope i won't break something.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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).
|
||||
|
||||
Reference in New Issue
Block a user