Cooonflicts

This commit is contained in:
Artur
2020-06-16 01:23:42 +03:00
278 changed files with 41483 additions and 37549 deletions
@@ -36,7 +36,7 @@
/obj/item/electronics/airalarm
name = "air alarm electronics"
icon_state = "airalarm_electronics"
custom_price = 50
custom_price = PRICE_CHEAP
/obj/item/wallframe/airalarm
name = "air alarm frame"
@@ -162,6 +162,9 @@
to_chat(user, "<span class='danger'>Access denied.</span>")
return UI_CLOSE
/obj/machinery/atmospherics/components/attack_ghost(mob/dead/observer/O)
. = ..()
atmosanalyzer_scan(airs, O, src, FALSE)
// Tool acts
@@ -111,3 +111,10 @@
pipe_color = paint_color
update_node_icon()
return TRUE
/obj/machinery/atmospherics/pipe/attack_ghost(mob/dead/observer/O)
. = ..()
if(parent)
atmosanalyzer_scan(parent.air, O, src, FALSE)
else
to_chat(O, "<span class='warning'>[src] doesn't have a pipenet, which is probably a bug.</span>")
@@ -147,10 +147,14 @@
/obj/machinery/portable_atmospherics/analyzer_act(mob/living/user, obj/item/I)
atmosanalyzer_scan(air_contents, user, src)
/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user)
/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user, attackchain_flags = NONE, damage_multiplier = 1)
if(I.force < 10 && !(stat & BROKEN))
take_damage(0)
else
investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS)
add_fingerprint(user)
..()
/obj/machinery/portable_atmospherics/attack_ghost(mob/dead/observer/O)
. = ..()
atmosanalyzer_scan(air_contents, O, src, FALSE)