Cooonflicts
This commit is contained in:
@@ -1575,5 +1575,5 @@
|
||||
/obj/item/electronics/apc
|
||||
name = "power control module"
|
||||
icon_state = "power_mod"
|
||||
custom_price = 50
|
||||
custom_price = PRICE_CHEAP
|
||||
desc = "Heavy-duty switching circuits for power control."
|
||||
|
||||
@@ -488,7 +488,7 @@ By design, d1 is the smallest direction and d2 is the highest
|
||||
|
||||
/obj/item/stack/cable_coil
|
||||
name = "cable coil"
|
||||
custom_price = 75
|
||||
custom_price = PRICE_CHEAP_AS_FREE
|
||||
gender = NEUTER //That's a cable coil sounds better than that's some cable coils
|
||||
icon = 'icons/obj/power.dmi'
|
||||
icon_state = "coil"
|
||||
|
||||
@@ -506,7 +506,7 @@
|
||||
cell = null
|
||||
qdel(src)
|
||||
|
||||
/obj/machinery/light/attacked_by(obj/item/I, mob/living/user)
|
||||
/obj/machinery/light/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
|
||||
..()
|
||||
if(status == LIGHT_BROKEN || status == LIGHT_EMPTY)
|
||||
if(on && (I.flags_1 & CONDUCT_1))
|
||||
|
||||
Reference in New Issue
Block a user