Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm

code/game/objects/structures/alien/alien.dm

@@ -0,0 +1,61 @@
+/obj/structure/alien
+	name = "alien thing"
+	desc = "There's something alien about this."
+	icon = 'icons/mob/alien.dmi'
+	var/health = 50
+
+/obj/structure/alien/proc/healthcheck()
+	if(health <=0)
+		density = 0
+		qdel(src)
+	return
+
+/obj/structure/alien/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	healthcheck()
+	return
+
+/obj/structure/alien/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			health-=50
+		if(2.0)
+			health-=50
+		if(3.0)
+			if (prob(50))
+				health-=50
+			else
+				health-=25
+	healthcheck()
+	return
+
+/obj/structure/alien/hitby(AM as mob|obj)
+	..()
+	visible_message("<span class='danger'>\The [src] was hit by \the [AM].</span>")
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 10
+	else
+		tforce = AM:throwforce
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	health = max(0, health - tforce)
+	healthcheck()
+	..()
+	return
+
+/obj/structure/alien/attack_generic()
+	attack_hand(usr)
+
+/obj/structure/alien/attackby(var/obj/item/weapon/W, var/mob/user)
+	health = max(0, health - W.force)
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	healthcheck()
+	..()
+	return
+
+/obj/structure/alien/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group) return 0
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return !opacity
+	return !density

code/game/objects/structures/alien/egg.dm

@@ -0,0 +1,96 @@
+#define MAX_PROGRESS 100
+
+/obj/structure/alien/egg
+	desc = "It looks like a weird egg."
+	name = "egg"
+	icon_state = "egg_growing"
+	density = 0
+	anchored = 1
+	var/progress = 0
+
+/obj/structure/alien/egg/New()
+	..()
+	processing_objects += src
+
+/obj/structure/alien/egg/Destroy()
+	processing_objects -= src
+	..()
+
+/obj/structure/alien/egg/CanUseTopic(var/mob/user)
+	return isobserver(user) ? STATUS_INTERACTIVE : STATUS_CLOSE
+
+/obj/structure/alien/egg/Topic(href, href_list)
+	if(..())
+		return 1
+
+	if(href_list["spawn"])
+		attack_ghost(usr)
+
+/obj/structure/alien/egg/process()
+	progress++
+	if(progress >= MAX_PROGRESS)
+		for(var/mob/M in dead_mob_list)
+			if(istype(M,/mob/dead) && M.client && M.client.prefs && (M.client.prefs.be_special & BE_ALIEN))
+				M << "<span class='notice'>An alien is ready to hatch! ([ghost_follow_link(src, M)]) (<a href='byond://?src=\ref[src];spawn=1'>spawn</a>)</span>"
+		processing_objects -= src
+		update_icon()
+
+/obj/structure/alien/egg/update_icon()
+	if(progress == -1)
+		icon_state = "egg_hatched"
+	else if(progress < MAX_PROGRESS)
+		icon_state = "egg_growing"
+	else
+		icon_state = "egg"
+
+/obj/structure/alien/egg/attack_ghost(var/mob/dead/observer/user)
+	if(progress == -1) //Egg has been hatched.
+		return
+
+	if(progress < MAX_PROGRESS)
+		user << "\The [src] has not yet matured."
+		return
+
+	if(!user.MayRespawn(1))
+		return
+
+	// Check for bans properly.
+	if(jobban_isbanned(user, "Xenomorph"))
+		user << "<span class='danger'>You are banned from playing a Xenomorph.</span>"
+		return
+
+	var/confirm = alert(user, "Are you sure you want to join as a Xenomorph larva?", "Become Larva", "No", "Yes")
+
+	if(!src || confirm != "Yes")
+		return
+
+	if(!user || !user.ckey)
+		return
+
+	if(progress == -1) //Egg has been hatched.
+		user << "Too slow..."
+		return
+
+	flick("egg_opening",src)
+	progress = -1 // No harvesting pls.
+	sleep(5)
+
+	if(!src || !user)
+		visible_message("<span class='alium'>\The [src] writhes with internal motion, but nothing comes out.</span>")
+		progress = MAX_PROGRESS // Someone else can have a go.
+		return // What a pain.
+
+	// Create the mob, transfer over key.
+	var/mob/living/carbon/alien/larva/larva = new(get_turf(src))
+	larva.ckey = user.ckey
+	spawn(-1)
+		if(user) qdel(user) // Remove the keyless ghost if it exists.
+
+	visible_message("<span class='alium'>\The [src] splits open with a wet slithering noise, and \the [larva] writhes free!</span>")
+
+	// Turn us into a hatched egg.
+	name = "hatched alien egg"
+	desc += " This one has hatched."
+	update_icon()
+
+#undef MAX_PROGRESS

code/game/objects/structures/alien/node.dm

@@ -0,0 +1,19 @@
+/obj/structure/alien/node
+	name = "alien weed node"
+	desc = "Some kind of strange, pulsating structure."
+	icon_state = "weednode"
+	health = 100
+	layer = 3.1
+
+/obj/structure/alien/node/New()
+	..()
+	processing_objects += src
+
+/obj/structure/alien/node/Destroy()
+	processing_objects -= src
+	..()
+
+/obj/structure/alien/node/process()
+	if(locate(/obj/effect/plant) in loc)
+		return
+	new /obj/effect/plant(get_turf(src), plant_controller.seeds["xenomorph"])

code/game/objects/structures/alien/resin.dm

@@ -0,0 +1,50 @@
+/obj/structure/alien/resin
+	name = "resin"
+	desc = "Looks like some kind of slimy growth."
+	icon_state = "resin"
+
+	density = 1
+	opacity = 1
+	anchored = 1
+	health = 200
+
+/obj/structure/alien/resin/wall
+	name = "resin wall"
+	desc = "Purple slime solidified into a wall."
+	icon_state = "resinwall"
+
+/obj/structure/alien/resin/membrane
+	name = "resin membrane"
+	desc = "Purple slime just thin enough to let light pass through."
+	icon_state = "resinmembrane"
+	opacity = 0
+	health = 120
+
+/obj/structure/alien/resin/New()
+	..()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
+
+/obj/structure/alien/resin/Destroy()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = initial(T.thermal_conductivity)
+	..()
+
+/obj/structure/alien/resin/attack_hand(var/mob/user)
+	if (HULK in user.mutations)
+		visible_message("<span class='danger'>\The [user] destroys \the [name]!</span>")
+		health = 0
+	else
+		// Aliens can get straight through these.
+		if(istype(user,/mob/living/carbon))
+			var/mob/living/carbon/M = user
+			if(locate(/obj/item/organ/xenos/hivenode) in M.internal_organs)
+				visible_message("<span class='alium'>\The [user] strokes \the [name] and it melts away!</span>")
+				health = 0
+				healthcheck()
+				return
+		visible_message("<span class='danger'>\The [user] claws at \the [src]!</span>")
+		// Todo check attack datums.
+		health -= rand(5,10)
+	healthcheck()
+	return

code/game/objects/structures/crates_lockers/closets.dm

@@ -196,13 +196,6 @@
 
 	return
 
-// this should probably use dump_contents()
-/obj/structure/closet/blob_act()
-	if(prob(75))
-		for(var/atom/movable/A as mob|obj in src)
-			A.forceMove(src.loc)
-		qdel(src)
-
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -96,10 +96,6 @@
 		for(var/mob/M in src)
 			shatter(M)
 
-/obj/structure/closet/statue/blob_act()
-	for(var/mob/M in src)
-		shatter(M)
-
 /obj/structure/closet/statue/ex_act(severity)
 	for(var/mob/M in src)
 		M.ex_act(severity)

code/game/objects/structures/displaycase.dm

@@ -34,15 +34,6 @@
 	src.healthcheck()
 	return
 
-
-/obj/structure/displaycase/blob_act()
-	if (prob(75))
-		new /obj/item/weapon/material/shard( src.loc )
-		if (occupied)
-			new /obj/item/weapon/gun/energy/captain( src.loc )
-			occupied = 0
-		qdel(src)
-
 /obj/structure/displaycase/proc/healthcheck()
 	if (src.health <= 0)
 		if (!( src.destroyed ))

code/game/objects/structures/girders.dm

@@ -202,10 +202,6 @@
 		return
 	return ..()
 
-/obj/structure/girder/blob_act()
-	if(prob(40))
-		qdel(src)
-
 
 /obj/structure/girder/ex_act(severity)
 	switch(severity)

code/game/objects/structures/grille.dm

@@ -16,9 +16,6 @@
 /obj/structure/grille/ex_act(severity)
 	qdel(src)
 
-/obj/structure/grille/blob_act()
-	qdel(src)
-
 /obj/structure/grille/update_icon()
 	if(destroyed)
 		icon_state = "[initial(icon_state)]-b"

code/game/objects/structures/inflatable.dm

@@ -60,9 +60,6 @@
 				deflate(1)
 				return
 
-/obj/structure/inflatable/blob_act()
-	deflate(1)
-
 /obj/structure/inflatable/attack_hand(mob/user as mob)
 		add_fingerprint(user)
 		return

code/game/objects/structures/lamarr_cage.dm

@@ -1,94 +0,0 @@
-/obj/structure/lamarr
-	name = "lab cage"
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "labcage1"
-	desc = "A glass lab container for storing interesting creatures."
-	density = 1
-	anchored = 1
-	unacidable = 1//Dissolving the case would also delete Lamarr
-	var/health = 30
-	var/occupied = 1
-	var/destroyed = 0
-
-/obj/structure/lamarr/ex_act(severity)
-	switch(severity)
-		if (1)
-			new /obj/item/weapon/material/shard( src.loc )
-			Break()
-			qdel(src)
-		if (2)
-			if (prob(50))
-				src.health -= 15
-				src.healthcheck()
-		if (3)
-			if (prob(50))
-				src.health -= 5
-				src.healthcheck()
-
-
-/obj/structure/lamarr/bullet_act(var/obj/item/projectile/Proj)
-	health -= Proj.damage
-	..()
-	src.healthcheck()
-	return
-
-
-/obj/structure/lamarr/blob_act()
-	if (prob(75))
-		new /obj/item/weapon/material/shard( src.loc )
-		Break()
-		qdel(src)
-
-/obj/structure/lamarr/proc/healthcheck()
-	if (src.health <= 0)
-		if (!( src.destroyed ))
-			src.density = 0
-			src.destroyed = 1
-			new /obj/item/weapon/material/shard( src.loc )
-			playsound(src, "shatter", 70, 1)
-			Break()
-	else
-		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
-	return
-
-/obj/structure/lamarr/update_icon()
-	if(src.destroyed)
-		src.icon_state = "labcageb[src.occupied]"
-	else
-		src.icon_state = "labcage[src.occupied]"
-	return
-
-
-/obj/structure/lamarr/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	src.health -= W.force
-	src.healthcheck()
-	..()
-	return
-
-/obj/structure/lamarr/attack_hand(mob/user as mob)
-	if (src.destroyed)
-		return
-	else
-		usr << "<span class='notice'>You kick the lab cage.</span>"
-		for(var/mob/O in oviewers())
-			if ((O.client && !( O.blinded )))
-				O << "<span class='warning'>[usr] kicks the lab cage.</span>"
-		src.health -= 2
-		healthcheck()
-		return
-
-/obj/structure/lamarr/proc/Break()
-	if(occupied)
-		new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
-		occupied = 0
-	update_icon()
-	return
-
-/obj/item/clothing/mask/facehugger/lamarr
-	name = "Lamarr"
-	desc = "The worst she might do is attempt to... couple with your head."//hope we don't get sued over a harmless reference, rite?
-	sterile = 1
-	gender = FEMALE
-
-/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
-	return

code/game/objects/structures/lattice.dm

@@ -34,10 +34,6 @@
 			L.updateOverlays(src.loc)
 	..()
 
-/obj/structure/lattice/blob_act()
-	qdel(src)
-	return
-
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)
 		if(1.0)

code/game/objects/structures/safe.dm

@@ -160,10 +160,6 @@ FLOOR SAFES
 			return
 
 
-obj/structure/safe/blob_act()
-	return
-
-
 obj/structure/safe/ex_act(severity)
 	return
 

code/game/objects/structures/signs.dm

@@ -19,10 +19,6 @@
 		else
 	return
 
-/obj/structure/sign/blob_act()
-	qdel(src)
-	return
-
 /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
 	if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double))
 		user << "You unfasten the sign with your [tool]."

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -86,11 +86,6 @@
 				qdel(src)
 				return
 
-/obj/structure/bed/blob_act()
-	if(prob(75))
-		material.place_sheet(get_turf(src))
-		qdel(src)
-
 /obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -98,11 +98,6 @@ var/global/list/stool_cache = list() //haha stool
 				qdel(src)
 				return
 
-/obj/item/weapon/stool/blob_act()
-	if(prob(75))
-		material.place_sheet(get_turf(src))
-		qdel(src)
-
 /obj/item/weapon/stool/proc/dismantle()
 	if(material)
 		material.place_sheet(get_turf(src))

code/game/objects/structures/window.dm

@@ -122,10 +122,6 @@
 				shatter(0)
 				return
 
-
-/obj/structure/window/blob_act()
-	shatter()
-
 //TODO: Make full windows a separate type of window.
 //Once a full window, it will always be a full window, so there's no point
 //having the same type for both.