Revert "12/21 modernizations from TG live"

code/game/objects/structures/aliens.dm

@@ -9,44 +9,41 @@
 
 /obj/structure/alien
 	icon = 'icons/mob/alien.dmi'
-	obj_integrity = 100
-	max_integrity = 100
+	var/health = 100
 
-/obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
-	if(damage_flag == "melee")
-		switch(damage_type)
-			if(BRUTE)
-				damage_amount *= 0.25
-			if(BURN)
-				damage_amount *= 2
-	. = ..()
+/obj/structure/alien/attacked_by(obj/item/I, mob/user)
+	..()
+	var/damage = I.force
+	switch(I.damtype)
+		if(BRUTE)
+			damage *= 0.25
+		if(BURN)
+			damage *= 2
+		else
+			damage = 0 //stamina damage does no damage
+	take_damage(damage, I.damtype)
 
-/obj/structure/alien/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+/obj/structure/alien/proc/take_damage(amount, damage_type = BRUTE, sound_effect = 1)
 	switch(damage_type)
 		if(BRUTE)
-			if(damage_amount)
+			if(sound_effect)
 				playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
-			else
-				playsound(src, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			if(damage_amount)
+			if(sound_effect)
 				playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+		else
+			return
+	health = max(health - amount, 0)
+	if(!health)
+		Break()
 
-/*
- * Generic alien stuff, not related to the purple lizards but still alien-like
- */
-
-/obj/structure/alien/gelpod
-	name = "gelatinous mound"
-	desc = "A mound of jelly-like substance encasing something inside."
-	icon = 'icons/obj/fluff.dmi'
-	icon_state = "gelmound"
-
-/obj/structure/alien/gelpod/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-		new/obj/effect/mob_spawn/human/corpse/damaged(get_turf(src))
+/obj/structure/alien/proc/Break()
 	qdel(src)
 
+/obj/structure/alien/bullet_act(obj/item/projectile/P)
+	. = ..()
+	take_damage(P.damage, P.damage_type)
+
 /*
  * Resin
  */
@@ -59,11 +56,10 @@
 	opacity = 1
 	anchored = 1
 	canSmoothWith = list(/obj/structure/alien/resin)
-	obj_integrity = 200
-	max_integrity = 200
+	health = 200
 	smooth = SMOOTH_TRUE
 	var/resintype = null
-	CanAtmosPass = ATMOS_PASS_DENSITY
+
 
 
 /obj/structure/alien/resin/New(location)
@@ -76,6 +72,9 @@
 	..()
 	move_update_air(T)
 
+/obj/structure/alien/resin/CanAtmosPass()
+	return !density
+
 /obj/structure/alien/resin/wall
 	name = "resin wall"
 	desc = "Thick resin solidified into a wall."
@@ -93,15 +92,55 @@
 	icon = 'icons/obj/smooth_structures/alien/resin_membrane.dmi'
 	icon_state = "membrane0"
 	opacity = 0
-	obj_integrity = 160
-	max_integrity = 160
+	health = 160
 	resintype = "membrane"
 	canSmoothWith = list(/obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane)
 
+/obj/structure/alien/resin/ex_act(severity, target)
+	switch(severity)
+		if(1)
+			take_damage(150, BRUTE, 0)
+		if(2)
+			take_damage(100, BRUTE, 0)
+		if(3)
+			take_damage(50, BRUTE, 0)
+
+/obj/structure/alien/blob_act(obj/effect/blob/B)
+	take_damage(50, BRUTE, 0)
+
+/obj/structure/alien/resin/hitby(atom/movable/AM)
+	..()
+	var/tforce = 0
+	if(!isobj(AM))
+		tforce = 10
+	else
+		var/obj/O = AM
+		tforce = O.throwforce
+	take_damage(tforce)
+
+/obj/structure/alien/resin/attack_hulk(mob/living/carbon/human/user)
+	..(user, 1)
+	user.visible_message("<span class='danger'>[user] destroys [src]!</span>")
+	take_damage(200)
+
 /obj/structure/alien/resin/attack_paw(mob/user)
 	return attack_hand(user)
 
 
+/obj/structure/alien/resin/attack_alien(mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.do_attack_animation(src)
+	user.visible_message("<span class='danger'>[user] claws at the resin!</span>")
+	take_damage(50)
+
+/obj/structure/alien/resin/attack_animal(mob/living/simple_animal/M)
+	M.changeNext_move(CLICK_CD_MELEE)
+	M.do_attack_animation(src)
+	if(!M.melee_damage_upper)
+		return
+	visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>")
+	take_damage(M.melee_damage_upper, M.melee_damage_type)
+
 /obj/structure/alien/resin/CanPass(atom/movable/mover, turf/target, height=0)
 	return !density
 
@@ -120,8 +159,7 @@
 	density = 0
 	layer = TURF_LAYER
 	icon_state = "weeds"
-	obj_integrity = 15
-	max_integrity = 15
+	health = 15
 	var/obj/structure/alien/weeds/node/linked_node = null
 	canSmoothWith = list(/obj/structure/alien/weeds, /turf/closed/wall)
 	smooth = SMOOTH_MORE
@@ -140,7 +178,7 @@
 			if(3)
 				icon = 'icons/obj/smooth_structures/alien/weeds3.dmi'
 	linked_node = node
-	if(isspaceturf(loc))
+	if(istype(loc, /turf/open/space))
 		qdel(src)
 		return
 	addtimer(src, "Life", rand(150, 200))
@@ -153,7 +191,7 @@
 	set background = BACKGROUND_ENABLED
 	var/turf/U = get_turf(src)
 
-	if(isspaceturf(U))
+	if(istype(U, /turf/open/space))
 		qdel(src)
 		return
 
@@ -162,7 +200,7 @@
 
 	for(var/turf/T in U.GetAtmosAdjacentTurfs())
 
-		if (locate(/obj/structure/alien/weeds) in T || isspaceturf(T))
+		if (locate(/obj/structure/alien/weeds) in T || istype(T, /turf/open/space))
 			continue
 
 		new /obj/structure/alien/weeds(T, linked_node)
@@ -174,7 +212,7 @@
 
 /obj/structure/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
-		take_damage(5, BURN, 0, 0)
+		take_damage(5, BURN, 0)
 
 
 //Weed nodes
@@ -211,8 +249,7 @@
 	icon_state = "egg_growing"
 	density = 0
 	anchored = 1
-	obj_integrity = 100
-	max_integrity = 100
+	health = 100
 	var/status = GROWING	//can be GROWING, GROWN or BURST; all mutually exclusive
 	layer = MOB_LAYER
 
@@ -229,9 +266,6 @@
 /obj/structure/alien/egg/attack_paw(mob/living/user)
 	return attack_hand(user)
 
-/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
-	return attack_hand(user)
-
 /obj/structure/alien/egg/attack_hand(mob/living/user)
 	if(user.getorgan(/obj/item/organ/alien/plasmavessel))
 		switch(status)
@@ -283,18 +317,16 @@
 	remove_from_proximity_list(src, 1)
 	..()
 
-/obj/structure/alien/egg/deconstruct()
-	if(!(flags & NODECONSTRUCT))
-		if(status != BURST && status != BURSTING)
-			Burst()
-		else if(status == BURST)
-			qdel(src)	//Remove the egg after it has been hit after bursting.
-	else
-		qdel(src)
+/obj/structure/alien/egg/Break()
+	if(status != BURST && status != BURSTING)
+		Burst()
+	else if(status == BURST)
+		qdel(src)	//Remove the egg after it has been hit after bursting.
+
 
 /obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 500)
-		take_damage(5, BURN, 0, 0)
+		take_damage(5, BURN, 0)
 
 
 /obj/structure/alien/egg/HasProximity(atom/movable/AM)