Merge pull request #12245 from Fox-McCloud/universal-damage

Universal Object Damage

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -107,11 +107,11 @@
 		to_chat(user, "<span class='notice'>You reverse the circulator's valve settings. The inlet of the circulator is now on the [get_inlet_side(dir)] side.</span>")
 		desc = "A gas circulator pump and heat exchanger. Its input port is on the [get_inlet_side(dir)] side, and its output port is on the [get_outlet_side(dir)] side."
 	else
-		..()
+		return ..()
 
 /obj/machinery/atmospherics/binary/circulator/update_icon()
 	..()
-	
+
 	if(stat & (BROKEN|NOPOWER))
 		icon_state = "circ[side]-p"
 	else if(last_pressure_delta > 0)

code/ATMOSPHERICS/components/binary_devices/valve.dm

@@ -17,7 +17,7 @@
 
 /obj/machinery/atmospherics/binary/valve/update_icon(animation)
 	..()
-	
+
 	if(animation)
 		flick("valve[src.open][!src.open]",src)
 	else
@@ -146,7 +146,7 @@
 	if(istype(W, /obj/item/multitool))
 		update_multitool_menu(user)
 		return 1
-	..()
+	return ..()
 
 /obj/machinery/atmospherics/binary/valve/digital/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return {"

code/ATMOSPHERICS/components/unary_devices/heat_exchanger.dm

@@ -10,7 +10,6 @@
 
 	var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null
 	var/update_cycle
-	burn_state = LAVA_PROOF
 
 /obj/machinery/atmospherics/unary/heat_exchanger/update_icon()
 	..()

code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm

@@ -4,6 +4,8 @@
 	use_power = IDLE_POWER_USE
 	layer = GAS_SCRUBBER_LAYER
 
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs
+
 	can_unwrench = 1
 
 	name = "air injector"
@@ -39,7 +41,7 @@
 
 /obj/machinery/atmospherics/unary/outlet_injector/update_icon()
 	..()
-	
+
 	if(!powered())
 		icon_state = "off"
 	else

code/ATMOSPHERICS/components/unary_devices/tank.dm

@@ -5,6 +5,8 @@
 	name = "pressure tank"
 	desc = "A large vessel containing pressurized gas."
 
+	max_integrity = 800
+
 	var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters ~tweaked it a little to simulate a pressure tank without needing to recode them yet
 
 	density = 1

code/ATMOSPHERICS/components/unary_devices/vent_pump.dm

@@ -333,6 +333,16 @@
 /obj/machinery/atmospherics/unary/vent_pump/can_crawl_through()
 	return !welded
 
+/obj/machinery/atmospherics/unary/vent_pump/attack_alien(mob/user)
+	if(!welded || !(do_after(user, 20, target = src)))
+		return
+	user.visible_message("<span class='warning'>[user] furiously claws at [src]!</span>", "<span class='notice'>You manage to clear away the stuff blocking the vent.</span>", "<span class='italics'>You hear loud scraping noises.</span>")
+	welded = FALSE
+	update_icon()
+	pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+	pipe_image.plane = ABOVE_HUD_PLANE
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 100, TRUE)
+
 /obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weldingtool))
 		var/obj/item/weldingtool/WT = W

code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm

@@ -382,6 +382,16 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/can_crawl_through()
 	return !welded
 
+/obj/machinery/atmospherics/unary/vent_scrubber/attack_alien(mob/user)
+	if(!welded || !(do_after(user, 20, target = src)))
+		return
+	user.visible_message("<span class='warning'>[user] furiously claws at [src]!</span>", "<span class='notice'>You manage to clear away the stuff blocking the scrubber.</span>", "<span class='italics'>You hear loud scraping noises.</span>")
+	welded = FALSE
+	update_icon()
+	pipe_image = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+	pipe_image.plane = ABOVE_HUD_PLANE
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 100, TRUE)
+
 /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
 	if(istype(W, /obj/item/weldingtool))
 		var/obj/item/weldingtool/WT = W