Deconflict

code/game/objects/buckling.dm

@@ -1,4 +1,6 @@
-/obj
+
+
+/atom/movable
 	var/can_buckle = 0
 	var/buckle_movable = 0
 	var/buckle_dir = 0
@@ -6,28 +8,34 @@
 	var/buckle_require_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes
 	var/mob/living/buckled_mob = null
 
-/obj/attack_hand(mob/living/user)
+
+/atom/movable/attack_hand(mob/living/user)
 	. = ..()
 	if(can_buckle && buckled_mob)
 		user_unbuckle_mob(user)
 
+/obj/proc/attack_alien(mob/user as mob) //For calling in the event of Xenomorph or other alien checks.
+	return
+
 /obj/attack_robot(mob/living/user)
 	if(Adjacent(user) && buckled_mob) //Checks if what we're touching is adjacent to us and has someone buckled to it. This should prevent interacting with anti-robot manual valves among other things.
 		return attack_hand(user) //Process as if we're a normal person touching the object.
 	return ..() //Otherwise, treat this as an AI click like usual.
 
-/obj/MouseDrop_T(mob/living/M, mob/living/user)
+/atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
 	. = ..()
 	if(can_buckle && istype(M))
 		user_buckle_mob(M, user)
 
-/obj/Destroy()
+/atom/movable/Destroy()
 	unbuckle_mob()
 	return ..()
 
 
-/obj/proc/buckle_mob(mob/living/M)
-	if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.pinned.len || (buckle_require_restraints && !M.restrained()))
+/atom/movable/proc/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE)
+	if((!can_buckle && !forced) || !istype(M) || M.buckled || M.pinned.len || (buckle_require_restraints && !M.restrained()))
+		return 0
+	if(check_loc && M.loc != loc)
 		return 0
 	if(buckled_mob) //Handles trying to buckle yourself to the chair when someone is on it
 		M  << "<span class='notice'>\The [src] already has someone buckled to it.</span>"
@@ -43,7 +51,7 @@
 	post_buckle_mob(M)
 	return 1
 
-/obj/proc/unbuckle_mob()
+/atom/movable/proc/unbuckle_mob()
 	if(buckled_mob && buckled_mob.buckled == src)
 		. = buckled_mob
 		buckled_mob.buckled = null
@@ -54,19 +62,16 @@
 
 		post_buckle_mob(.)
 
-/obj/proc/post_buckle_mob(mob/living/M)
+/atom/movable/proc/post_buckle_mob(mob/living/M)
 	return
 
-/obj/proc/user_buckle_mob(mob/living/M, mob/user)
+/atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = FALSE)
 	if(!ticker)
 		user << "<span class='warning'>You can't buckle anyone in before the game starts.</span>"
 	if(!user.Adjacent(M) || user.restrained() || user.lying || user.stat || istype(user, /mob/living/silicon/pai))
 		return
 	if(M == buckled_mob)
 		return
-	if(istype(M, /mob/living/carbon/slime))
-		user << "<span class='warning'>The [M] is too squishy to buckle in.</span>"
-		return
 
 	add_fingerprint(user)
 	unbuckle_mob()
@@ -75,20 +80,21 @@
 	if(M.loc != src.loc)
 		step_towards(M, src)
 
-	. = buckle_mob(M)
+	. = buckle_mob(M, forced)
 	if(.)
-		if(M == user)
-			M.visible_message(\
-				"<span class='notice'>[M.name] buckles themselves to [src].</span>",\
-				"<span class='notice'>You buckle yourself to [src].</span>",\
-				"<span class='notice'>You hear metal clanking.</span>")
-		else
-			M.visible_message(\
-				"<span class='danger'>[M.name] is buckled to [src] by [user.name]!</span>",\
-				"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
-				"<span class='notice'>You hear metal clanking.</span>")
+		if(!silent)
+			if(M == user)
+				M.visible_message(\
+					"<span class='notice'>[M.name] buckles themselves to [src].</span>",\
+					"<span class='notice'>You buckle yourself to [src].</span>",\
+					"<span class='notice'>You hear metal clanking.</span>")
+			else
+				M.visible_message(\
+					"<span class='danger'>[M.name] is buckled to [src] by [user.name]!</span>",\
+					"<span class='danger'>You are buckled to [src] by [user.name]!</span>",\
+					"<span class='notice'>You hear metal clanking.</span>")
 
-/obj/proc/user_unbuckle_mob(mob/user)
+/atom/movable/proc/user_unbuckle_mob(mob/user)
 	var/mob/living/M = unbuckle_mob()
 	if(M)
 		if(M != user)
@@ -104,3 +110,19 @@
 		add_fingerprint(user)
 	return M
 
+/atom/movable/proc/handle_buckled_mob_movement(newloc,direct)
+	if(buckled_mob)
+//		if(!buckled_mob.Move(newloc, direct))
+		if(!buckled_mob.forceMove(newloc, direct))
+			loc = buckled_mob.loc
+			last_move = buckled_mob.last_move
+			buckled_mob.inertia_dir = last_move
+			return FALSE
+		else
+			buckled_mob.set_dir(dir)
+	return TRUE
+
+/atom/movable/Move(atom/newloc, direct = 0)
+	. = ..()
+	if(. && buckled_mob && !handle_buckled_mob_movement(newloc, direct)) //movement failed due to buckled mob(s)
+		. = 0

code/game/objects/effects/alien/aliens.dm

@@ -0,0 +1,443 @@
+/* Alien Effects!
+ * Contains:
+ *		effect/alien
+ *		Resin
+ *		Weeds
+ *		Acid
+ *		Egg
+ */
+
+/*
+ * effect/alien
+ */
+/obj/effect/alien
+	name = "alien thing"
+	desc = "theres something alien about this"
+	icon = 'icons/mob/alien.dmi'
+
+/*
+ * Resin
+ */
+/obj/effect/alien/resin
+	name = "resin"
+	desc = "Looks like some kind of slimy growth."
+	icon_state = "resin"
+
+	density = 1
+	opacity = 1
+	anchored = 1
+	var/health = 200
+	//var/mob/living/affecting = null
+
+/obj/effect/alien/resin/wall
+	name = "resin wall"
+	desc = "Purple slime solidified into a wall."
+	icon_state = "resinwall" //same as resin, but consistency ho!
+
+/obj/effect/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/effect/alien/resin/New()
+	..()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
+
+/obj/effect/alien/resin/Destroy()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = initial(T.thermal_conductivity)
+	..()
+
+/obj/effect/alien/resin/proc/healthcheck()
+	if(health <=0)
+		density = 0
+		qdel(src)
+	return
+
+/obj/effect/alien/resin/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	healthcheck()
+	return
+
+/obj/effect/alien/resin/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/effect/alien/resin/hitby(AM as mob|obj)
+	..()
+	for(var/mob/O in viewers(src, null))
+		O.show_message("<span class='danger'>[src] was hit by [AM].</span>", 1)
+	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/effect/alien/resin/attack_hand()
+	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if (HULK in usr.mutations)
+		usr << "<span class='notice'>You easily destroy the [name].</span>"
+		for(var/mob/O in oviewers(src))
+			O.show_message("<span class='warning'>[usr] destroys the [name]!</span>", 1)
+		health = 0
+	else
+
+		// Aliens can get straight through these.
+		if(istype(usr,/mob/living/carbon))
+			var/mob/living/carbon/M = usr
+			if(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
+				for(var/mob/O in oviewers(src))
+					O.show_message("<span class='warning'>[usr] strokes the [name] and it melts away!</span>", 1)
+				health = 0
+				healthcheck()
+				return
+
+		usr << "<span class='notice'>You claw at the [name].</span>"
+		for(var/mob/O in oviewers(src))
+			O.show_message("<span class='warning'>[usr] claws at the [name]!</span>", 1)
+		health -= rand(5,10)
+	healthcheck()
+	return
+
+/obj/effect/alien/resin/attackby(obj/item/weapon/W as obj, mob/user as mob)
+
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	var/aforce = W.force
+	health = max(0, health - aforce)
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	healthcheck()
+	..()
+	return
+
+/obj/effect/alien/resin/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
+
+
+/*
+ * Weeds
+ */
+#define NODERANGE 3
+
+/obj/effect/alien/weeds
+	name = "weeds"
+	desc = "Weird purple weeds."
+	icon_state = "weeds"
+
+	anchored = 1
+	density = 0
+	layer = 2
+	var/health = 15
+	var/obj/effect/alien/weeds/node/linked_node = null
+
+/obj/effect/alien/weeds/node
+	icon_state = "weednode"
+	name = "purple sac"
+	desc = "Weird purple octopus-like thing."
+	layer = 3
+	light_range = NODERANGE
+	var/node_range = NODERANGE
+
+/obj/effect/alien/weeds/node/New()
+	..(src.loc, src)
+
+
+/obj/effect/alien/weeds/New(pos, node)
+	..()
+	if(istype(loc, /turf/space))
+		qdel(src)
+		return
+	linked_node = node
+	if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2")
+	spawn(rand(150, 200))
+		if(src)
+			Life()
+	return
+
+/obj/effect/alien/weeds/proc/Life()
+	set background = 1
+	var/turf/U = get_turf(src)
+/*
+	if (locate(/obj/movable, U))
+		U = locate(/obj/movable, U)
+		if(U.density == 1)
+			qdel(src)
+			return
+Alien plants should do something if theres a lot of poison
+	if(U.poison> 200000)
+		health -= round(U.poison/200000)
+		update()
+		return
+*/
+	if (istype(U, /turf/space))
+		qdel(src)
+		return
+
+	if(!linked_node || (get_dist(linked_node, src) > linked_node.node_range) )
+		return
+
+	direction_loop:
+		for(var/dirn in cardinal)
+			var/turf/T = get_step(src, dirn)
+
+			if (!istype(T) || T.density || locate(/obj/effect/alien/weeds) in T || istype(T.loc, /area/arrival) || istype(T, /turf/space))
+				continue
+
+	//		if (locate(/obj/movable, T)) // don't propogate into movables
+	//			continue
+
+			for(var/obj/O in T)
+				if(O.density)
+					continue direction_loop
+
+			new /obj/effect/alien/weeds(T, linked_node)
+
+
+/obj/effect/alien/weeds/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			qdel(src)
+		if(2.0)
+			if (prob(50))
+				qdel(src)
+		if(3.0)
+			if (prob(5))
+				qdel(src)
+	return
+
+/obj/effect/alien/weeds/attackby(var/obj/item/weapon/W, var/mob/user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if(W.attack_verb.len)
+		visible_message("<span class='danger'>\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
+	else
+		visible_message("<span class='danger'>\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
+
+	var/damage = W.force / 4.0
+
+	if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+
+		if(WT.remove_fuel(0, user))
+			damage = 15
+			playsound(loc, 'sound/items/Welder.ogg', 100, 1)
+
+	health -= damage
+	healthcheck()
+
+/obj/effect/alien/weeds/proc/healthcheck()
+	if(health <= 0)
+		qdel(src)
+
+
+/obj/effect/alien/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 300 + T0C)
+		health -= 5
+		healthcheck()
+
+#undef NODERANGE
+
+
+/*
+ * Acid
+ */
+/obj/effect/alien/acid
+	name = "acid"
+	desc = "Burbling corrossive stuff. I wouldn't want to touch it."
+	icon_state = "acid"
+
+	density = 0
+	opacity = 0
+	anchored = 1
+
+	var/atom/target
+	var/ticks = 0
+	var/target_strength = 0
+
+/obj/effect/alien/acid/New(loc, target)
+	..(loc)
+	src.target = target
+
+	if(isturf(target)) // Turf take twice as long to take down.
+		target_strength = 8
+	else
+		target_strength = 4
+	tick()
+
+/obj/effect/alien/acid/proc/tick()
+	if(!target)
+		qdel(src)
+
+	ticks += 1
+
+	if(ticks >= target_strength)
+
+		for(var/mob/O in hearers(src, null))
+			O.show_message("<span class='alium'>[src.target] collapses under its own weight into a puddle of goop and undigested debris!</span>", 1)
+
+		if(istype(target, /turf/simulated/wall)) // I hate turf code.
+			var/turf/simulated/wall/W = target
+			W.dismantle_wall(1)
+		else
+			qdel(target)
+		qdel(src)
+		return
+
+	switch(target_strength - ticks)
+		if(6)
+			visible_message("<span class='alium'>[src.target] is holding up against the acid!</span>")
+		if(4)
+			visible_message("<span class='alium'>[src.target]\s structure is being melted by the acid!</span>")
+		if(2)
+			visible_message("<span class='alium'>[src.target] is struggling to withstand the acid!</span>")
+		if(0 to 1)
+			visible_message("<span class='alium'>[src.target] begins to crumble under the acid!</span>")
+	spawn(rand(150, 200)) tick()
+
+/*
+ * Egg
+ */
+/var/const //for the status var
+	BURST = 0
+	BURSTING = 1
+	GROWING = 2
+	GROWN = 3
+
+	MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger
+	MAX_GROWTH_TIME = 3000
+
+/obj/effect/alien/egg
+	desc = "It looks like a weird egg"
+	name = "egg"
+//	icon_state = "egg_growing" // So the egg looks 'grown', even though it's not.
+	icon_state = "egg"
+	density = 0
+	anchored = 1
+
+	var/health = 100
+	var/status = BURST //can be GROWING, GROWN or BURST; all mutually exclusive
+	flags = PROXMOVE
+
+/obj/effect/alien/egg/New()
+/*
+	if(config.aliens_allowed)
+		..()
+		spawn(rand(MIN_GROWTH_TIME,MAX_GROWTH_TIME))
+			Grow()
+	else
+		qdel(src)
+*/
+/obj/effect/alien/egg/attack_hand(user as mob)
+
+	var/mob/living/carbon/M = user
+	if(!istype(M) || !(locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs))
+		return attack_hand(user)
+
+	switch(status)
+		if(BURST)
+			user << "<span class='warning'>You clear the hatched egg.</span>"
+			qdel(src)
+			return
+/*		if(GROWING)
+			user << "<span class='warning'>The child is not developed yet.</span>"
+			return
+		if(GROWN)
+			user << "<span class='warning'>You retrieve the child.</span>"
+			Burst(0)
+			return
+
+/obj/effect/alien/egg/proc/GetFacehugger() // Commented out for future edit.
+	return locate(/obj/item/clothing/mask/facehugger) in contents
+
+/obj/effect/alien/egg/proc/Grow()
+	icon_state = "egg"
+//	status = GROWN
+	status = BURST
+//	new /obj/item/clothing/mask/facehugger(src)
+	return
+*/
+/obj/effect/alien/egg/proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining
+	if(status == GROWN || status == GROWING)
+//		var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+		icon_state = "egg_hatched"
+/*		flick("egg_opening", src)
+		status = BURSTING
+		spawn(15)
+			status = BURST
+			child.loc = get_turf(src)
+
+			if(kill && istype(child))
+				child.Die()
+			else
+				for(var/mob/M in range(1,src))
+					if(CanHug(M))
+						child.Attach(M)
+						break
+*/
+/obj/effect/alien/egg/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	healthcheck()
+	return
+
+
+/obj/effect/alien/egg/attackby(var/obj/item/weapon/W, var/mob/user)
+	if(health <= 0)
+		return
+	if(W.attack_verb.len)
+		src.visible_message("<span class='danger'>\The [src] has been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]</span>")
+	else
+		src.visible_message("<span class='danger'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
+	var/damage = W.force / 4.0
+
+	if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+
+		if(WT.remove_fuel(0, user))
+			damage = 15
+			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+
+	src.health -= damage
+	src.healthcheck()
+
+
+/obj/effect/alien/egg/proc/healthcheck()
+	if(health <= 0)
+		Burst()
+
+/obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 500 + T0C)
+		health -= 5
+		healthcheck()
+/*
+/obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj)
+	if(status == GROWN)
+		if(!CanHug(AM))
+			return
+
+		var/mob/living/carbon/C = AM
+		if(C.stat == CONSCIOUS && C.status_flags & XENO_HOST)
+			return
+
+		Burst(0)
+*/

code/game/objects/effects/landmarks.dm

@@ -87,9 +87,11 @@
 	if(delete_me)
 		qdel(src)
 
-/obj/effect/landmark/Destroy()
-	landmarks_list -= src
-	return ..()
+/obj/effect/landmark/Destroy(var/force = FALSE)
+	if(delete_me || force)
+		landmarks_list -= src
+		return ..()
+	return QDEL_HINT_LETMELIVE
 
 /obj/effect/landmark/start
 	name = "start"

code/game/objects/items/devices/defib.dm

@@ -230,7 +230,7 @@
 
 /obj/item/weapon/shockpaddles/update_held_icon()
 	var/mob/living/M = loc
-	if(istype(M) && !issmall(M) && M.item_is_in_hands(src) && !M.hands_are_full())
+	if(istype(M) && M.item_is_in_hands(src) && !M.hands_are_full())
 		wielded = 1
 		name = "[initial(name)] (wielded)"
 	else

code/game/objects/items/devices/flashlight.dm

@@ -449,10 +449,11 @@
 /obj/item/device/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"
-	desc = "A glowing ball of what appears to be amber."
+	desc = "A slimy ball that appears to be glowing from bioluminesence."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "floor1" //not a slime extract sprite but... something close enough!
 	item_state = "slime"
+	light_color = "#FFF423"
 	w_class = ITEMSIZE_TINY
 	brightness_on = 6
 	on = 1 //Bio-luminesence has one setting, on.

code/game/objects/items/devices/scanners.dm

@@ -364,32 +364,38 @@ REAGENT SCANNER
 	matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
 
 /obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
-	if (!isslime(M))
+	if(!isslime(M))
 		user << "<B>This device can only scan slimes!</B>"
 		return
-	var/mob/living/carbon/slime/T = M
+	var/mob/living/simple_animal/slime/S = M
 	user.show_message("Slime scan results:")
-	user.show_message(text("[T.colour] [] slime", T.is_adult ? "adult" : "baby"))
-	user.show_message(text("Nutrition: [T.nutrition]/[]", T.get_max_nutrition()))
-	if (T.nutrition < T.get_starve_nutrition())
-		user.show_message("<span class='alert'>Warning: slime is starving!</span>")
-	else if (T.nutrition < T.get_hunger_nutrition())
-		user.show_message("<span class='warning'>Warning: slime is hungry</span>")
-	user.show_message("Electric change strength: [T.powerlevel]")
-	user.show_message("Health: [T.health]")
-	if (T.slime_mutation[4] == T.colour)
-		user.show_message("This slime does not evolve any further")
-	else
-		if (T.slime_mutation[3] == T.slime_mutation[4])
-			if (T.slime_mutation[2] == T.slime_mutation[1])
-				user.show_message(text("Possible mutation: []", T.slime_mutation[3]))
-				user.show_message("Genetic destability: [T.mutation_chance/2]% chance of mutation on splitting")
-			else
-				user.show_message(text("Possible mutations: [], [], [] (x2)", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3]))
-				user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting")
-		else
-			user.show_message(text("Possible mutations: [], [], [], []", T.slime_mutation[1], T.slime_mutation[2], T.slime_mutation[3], T.slime_mutation[4]))
-			user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting")
-	if (T.cores > 1)
-		user.show_message("Anomalious slime core amount detected")
-	user.show_message("Growth progress: [T.amount_grown]/10")
+	user.show_message(text("[S.slime_color] [] slime", S.is_adult ? "adult" : "baby"))
+
+	user.show_message("Health: [S.health]")
+	user.show_message("Mutation Probability: [S.mutation_chance]")
+
+	var/list/mutations = list()
+	for(var/potential_color in S.slime_mutation)
+		var/mob/living/simple_animal/slime/slime = potential_color
+		mutations.Add(initial(slime.slime_color))
+
+	user.show_message("Potental to mutate into [english_list(mutations)] colors.")
+	user.show_message("Extract potential: [S.cores]")
+
+	user.show_message(text("Nutrition: [S.nutrition]/[]", S.get_max_nutrition()))
+	if (S.nutrition < S.get_starve_nutrition())
+		user.show_message("<span class='alert'>Warning: Subject is starving!</span>")
+	else if (S.nutrition < S.get_hunger_nutrition())
+		user.show_message("<span class='warning'>Warning: Subject is hungry.</span>")
+	user.show_message("Electric change strength: [S.power_charge]")
+
+	if(S.resentment)
+		user.show_message("<span class='warning'>Warning: Subject is harboring resentment.</span>")
+	if(S.docile)
+		user.show_message("Subject has been pacified.")
+	if(S.rabid)
+		user.show_message("<span class='danger'>Subject is enraged and extremely dangerous!</span>")
+	if(S.unity)
+		user.show_message("Subject is friendly to other slime colors.")
+
+	user.show_message("Growth progress: [S.amount_grown]/10")

code/game/objects/items/robot/robot_upgrades.dm

@@ -12,7 +12,7 @@
 
 /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R)
 	if(R.stat == DEAD)
-		usr << "<span class='warning'>The [src] will not function on a deceased robot.</span>"
+		to_chat(usr, "<span class='warning'>The [src] will not function on a deceased robot.</span>")
 		return 1
 	return 0
 
@@ -68,7 +68,7 @@
 
 /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R)
 	if(R.health < 0)
-		usr << "You have to repair the robot before using this module!"
+		to_chat(usr, "You have to repair the robot before using this module!")
 		return 0
 
 	if(!R.key)
@@ -112,8 +112,8 @@
 	if(..()) return 0
 
 	if(!R.module || !(type in R.module.supported_upgrades))
-		R << "Upgrade mounting error!  No suitable hardpoint detected!"
-		usr << "There's no mounting point for the module!"
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
 		return 0
 
 	var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in R.module
@@ -122,12 +122,12 @@
 	if(!T)
 		T = locate() in R.module.modules
 	if(!T)
-		usr << "This robot has had its taser removed!"
+		to_chat(usr, "<span class='warning'>This robot has had its taser removed!</span>")
 		return 0
 
 	if(T.recharge_time <= 2)
-		R << "Maximum cooling achieved for this hardpoint!"
-		usr << "There's no room for another cooling unit!"
+		to_chat(R, "Maximum cooling achieved for this hardpoint!")
+		to_chat(usr, "There's no room for another cooling unit!")
 		return 0
 
 	else
@@ -137,7 +137,7 @@
 
 /obj/item/borg/upgrade/jetpack
 	name = "mining robot jetpack"
-	desc = "A carbon dioxide jetpack suitable for low-gravity mining operations."
+	desc = "A carbon dioxide jetpack suitable for low-gravity operations."
 	icon_state = "cyborg_upgrade3"
 	item_state = "cyborg_upgrade"
 	require_module = 1
@@ -145,17 +145,20 @@
 /obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
 
-	if(!R.module || !(type in R.module.supported_upgrades))
-		R << "Upgrade mounting error!  No suitable hardpoint detected!"
-		usr << "There's no mounting point for the module!"
-		return 0
-	else
+	var/obj/item/weapon/tank/jetpack/carbondioxide/T = locate() in R.module
+	if(!T)
+		T = locate() in R.module.contents
+	if(!T)
+		T = locate() in R.module.modules
+	if(!T)
 		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
 		for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
 			R.internals = src
-		//R.icon_state="Miner+j"
 		return 1
-
+	if(T)
+		to_chat(R, "Upgrade mounting error!  No suitable hardpoint detected!")
+		to_chat(usr, "There's no mounting point for the module!")
+		return 0
 
 /obj/item/borg/upgrade/syndicate/
 	name = "scrambled equipment module"

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -84,23 +84,20 @@
 	desc = "A piece of blue carpet. It is the same size as a normal floor tile!"
 	icon_state = "tile-bluecarpet"
 
-// VOREStation Edit
-// TODO - Add descriptions to these
 /obj/item/stack/tile/carpet/bcarpet
-	icon_state = "tile-bcarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/blucarpet
-	icon_state = "tile-blucarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/turcarpet
-	icon_state = "tile-turcarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/sblucarpet
-	icon_state = "tile-sblucarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/gaycarpet
-	icon_state = "tile-gaycarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/purcarpet
-	icon_state = "tile-purcarpet"
+	icon_state = "tile-carpet"
 /obj/item/stack/tile/carpet/oracarpet
-	icon_state = "tile-oracarpet"
-// VOREStation Edit End
+	icon_state = "tile-carpet"
 
 /obj/item/stack/tile/floor
 	name = "floor tile"
@@ -187,4 +184,4 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = 0

code/game/objects/items/toys.dm

@@ -773,6 +773,7 @@
 	var/phrase = "I don't want to exist anymore!"
 
 /obj/structure/plushie/attack_hand(mob/user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>\The [user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
 	else if (user.a_intent == I_HURT)
@@ -813,8 +814,11 @@
 	desc = "A very generic small plushie. It seems to not want to exist."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "nymphplushie"
+	var/last_message = 0
 
 /obj/item/toy/plushie/attack_self(mob/user as mob)
+	if(world.time - last_message <= 1 SECOND)
+		return
 	if(user.a_intent == I_HELP)
 		user.visible_message("<span class='notice'><b>\The [user]</b> hugs [src]!</span>","<span class='notice'>You hug [src]!</span>")
 	else if (user.a_intent == I_HURT)
@@ -823,6 +827,7 @@
 		user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes the [src].</span>","<span class='notice'>You poke the [src].</span>")
+	last_message = world.time
 
 /obj/item/toy/plushie/nymph
 	name = "diona nymph plush"

code/game/objects/items/weapons/implants/implantchair.dm

@@ -76,13 +76,14 @@
 
 	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
 		if(istype(G, /obj/item/weapon/grab))
-			if(!ismob(G:affecting))
+			var/obj/item/weapon/grab/grab = G
+			if(!ismob(grab.affecting))
 				return
-			for(var/mob/living/carbon/slime/M in range(1,G:affecting))
-				if(M.Victim == G:affecting)
-					usr << "[G:affecting:name] will not fit into the [src.name] because they have a slime latched onto their head."
+			for(var/mob/living/simple_animal/slime/M in range(1,grab.affecting))
+				if(M.victim == grab.affecting)
+					usr << "[grab.affecting.name] will not fit into the [src.name] because they have a slime latched onto their head."
 					return
-			var/mob/M = G:affecting
+			var/mob/M = grab.affecting
 			if(put_mob(M))
 				qdel(G)
 		src.updateUsrDialog()

code/game/objects/items/weapons/policetape.dm

@@ -59,6 +59,18 @@ var/list/tape_roll_applications = list()
 		hazard_overlays["[WEST]"]	= new/image('icons/effects/warning_stripes.dmi', icon_state = "W")
 	update_icon()
 
+/obj/item/taperoll/medical
+	name = "medical tape"
+	desc = "A roll of medical tape used to block off patients from the public."
+	tape_type = /obj/item/tape/medical
+	color = COLOR_WHITE
+
+/obj/item/tape/medical
+	name = "medical tape"
+	desc = "A length of medical tape.  Do not cross."
+	req_access = list(access_medical)
+	color = COLOR_WHITE
+
 /obj/item/taperoll/police
 	name = "police tape"
 	desc = "A roll of police tape used to block off crime scenes from the public."
@@ -339,4 +351,4 @@ var/list/tape_roll_applications = list()
 			qdel(T)
 
 	qdel(src) //TODO: Dropping a trash item holding fibers/fingerprints of all broken tape parts
-	return
+	return

code/game/objects/items/weapons/power_cells.dm

@@ -14,6 +14,8 @@
 	var/maxcharge = 1000
 	var/rigged = 0		// true if rigged to explode
 	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
+	var/self_recharge = FALSE // If true, the cell will recharge itself.
+	var/charge_amount = 25 // How much power to give, if self_recharge is true.  The number is in absolute cell charge, as it gets divided by CELLRATE later.
 	matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
 
 	suicide_act(mob/user)
@@ -125,8 +127,10 @@
 /obj/item/weapon/cell/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with phoron, it crackles with power."
-	origin_tech = list(TECH_POWER = 2, TECH_BIO = 4)
+	origin_tech = list(TECH_POWER = 4, TECH_BIO = 5)
 	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
 	icon_state = "yellow slime extract" //"potato_battery"
+	description_info = "This 'cell' holds a max charge of 10k and self recharges over time."
 	maxcharge = 10000
 	matter = null
+	self_recharge = TRUE

code/game/objects/items/weapons/storage/toolbox.dm

@@ -72,12 +72,12 @@
 /obj/item/weapon/storage/toolbox/syndicate/New()
 	..()
 	new /obj/item/clothing/gloves/yellow(src)
-	new /obj/item/weapon/screwdriver(src)
-	new /obj/item/weapon/wrench(src)
+	new /obj/item/weapon/screwdriver/power(src)
+	new /obj/item/stack/cable_coil/random(src,30)
 	new /obj/item/weapon/weldingtool/experimental(src)
-	new /obj/item/weapon/crowbar(src)
-	new /obj/item/weapon/wirecutters(src)
+	new /obj/item/weapon/crowbar/power(src)
 	new /obj/item/device/multitool(src)
+	new /obj/item/device/analyzer(src)
 
 /obj/item/weapon/storage/toolbox/lunchbox
 	max_storage_space = ITEMSIZE_COST_SMALL * 4 //slightly smaller than a toolbox

code/game/objects/items/weapons/stunbaton.dm

@@ -90,7 +90,7 @@
 		icon_state = "[initial(name)]"
 
 	if(icon_state == "[initial(name)]_active")
-		set_light(1.5, 1, lightcolor)
+		set_light(2, 1, lightcolor)
 	else
 		set_light(0)
 
@@ -237,4 +237,16 @@
 			else
 				user << "<span class='notice'>[src] already has a cell.</span>"
 		else
-			user << "<span class='notice'>This cell is not fitted for [src].</span>"
+			user << "<span class='notice'>This cell is not fitted for [src].</span>"
+
+/obj/item/weapon/melee/baton/get_description_interaction()
+	var/list/results = list()
+
+	if(bcell)
+		results += "[desc_panel_image("offhand")]to remove the weapon cell."
+	else
+		results += "[desc_panel_image("weapon cell")]to add a new weapon cell."
+
+	results += ..()
+
+	return results

code/game/objects/items/weapons/tools.dm

@@ -53,7 +53,7 @@
 	icon_state = "drill_bolt"
 	item_state = "drill"
 	usesound = 'sound/items/drill_use.ogg'
-	matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50, MAT_TITANIUM = 25)
+	matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50)
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
 	force = 8
 	w_class = ITEMSIZE_SMALL
@@ -155,7 +155,7 @@
 	desc = "A simple powered hand drill. It's fitted with a screw bit."
 	icon_state = "drill_screw"
 	item_state = "drill"
-	matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50, MAT_TITANIUM = 25)
+	matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50)
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
 
 	force = 8
@@ -240,7 +240,7 @@
 	icon_state = "jaws_cutter"
 	item_state = "jawsoflife"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2)
-	matter = list(MAT_METAL=150, MAT_SILVER=50, MAT_TITANIUM=25)
+	matter = list(MAT_METAL=150, MAT_SILVER=50)
 	usesound = 'sound/items/jaws_cut.ogg'
 	force = 15
 	toolspeed = 0.25
@@ -377,7 +377,7 @@
 
 /obj/item/weapon/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity)
 	if(!proximity) return
-	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && !welding)
+	if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1)
 		if(!welding && max_fuel)
 			O.reagents.trans_to_obj(src, max_fuel)
 			user << "<span class='notice'>Welder refueled</span>"
@@ -845,7 +845,7 @@
 	desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head."
 	icon_state = "jaws_pry"
 	item_state = "jawsoflife"
-	matter = list(MAT_METAL=150, MAT_SILVER=50, MAT_TITANIUM=25)
+	matter = list(MAT_METAL=150, MAT_SILVER=50)
 	origin_tech = list(TECH_MATERIALS = 2, TECH_ENGINEERING = 2)
 	usesound = 'sound/items/jaws_pry.ogg'
 	force = 15

code/game/objects/random/random.dm

@@ -842,7 +842,6 @@ something, make sure it's not in one of the other lists.*/
 /obj/random/maintenance/research/item_to_spawn()
 	return pick(prob(320);/obj/random/maintenance/clean,
 				prob(3);/obj/item/device/analyzer/plant_analyzer,
-				prob(2);/obj/item/device/analyzer/xeno_analyzer,
 				prob(1);/obj/item/device/flash/synthetic,
 				prob(2);/obj/item/weapon/bucket_sensor,
 				prob(1);/obj/item/weapon/cell/device/weapon,

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

@@ -17,6 +17,8 @@
 	new /obj/item/clothing/under/swimsuit/green(src)
 	new /obj/item/clothing/under/swimsuit/purple(src)
 	new /obj/item/clothing/under/swimsuit/striped(src)
+	new /obj/item/clothing/under/swimsuit/white(src)
+	new /obj/item/clothing/under/swimsuit/earth(src) //Maybe at some point make it randomly choose swimsuits, so that it doesn't overflow as we add more.
 	new /obj/item/clothing/mask/snorkel(src)
 	new /obj/item/clothing/mask/snorkel(src)
 	new /obj/item/clothing/shoes/swimmingfins(src)

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

@@ -67,6 +67,11 @@
 	new /obj/item/clothing/suit/bio_suit/scientist(src)
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 
+/obj/structure/closet/l3closet/scientist/double/New()
+	..()
+	new /obj/item/clothing/suit/bio_suit/scientist(src)
+	new /obj/item/clothing/head/bio_hood/scientist(src)
+
 
 /obj/structure/closet/l3closet/medical
 	icon_state = "bio_scientist"

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

@@ -72,35 +72,35 @@
 		new /obj/item/clothing/head/nursehat (src)
 		switch(pick("blue", "green", "purple", "black", "navyblue"))
 			if ("blue")
-				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs(src)
 				new /obj/item/clothing/head/surgery/blue(src)
 			if ("green")
-				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/green(src)
 				new /obj/item/clothing/head/surgery/green(src)
 			if ("purple")
-				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
 				new /obj/item/clothing/head/surgery/purple(src)
 			if ("black")
-				new /obj/item/clothing/under/rank/medical/black(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/black(src)
 				new /obj/item/clothing/head/surgery/black(src)
 			if ("navyblue")
-				new /obj/item/clothing/under/rank/medical/navyblue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
 				new /obj/item/clothing/head/surgery/navyblue(src)
 		switch(pick("blue", "green", "purple", "black", "navyblue"))
 			if ("blue")
-				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs(src)
 				new /obj/item/clothing/head/surgery/blue(src)
 			if ("green")
-				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/green(src)
 				new /obj/item/clothing/head/surgery/green(src)
 			if ("purple")
-				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
 				new /obj/item/clothing/head/surgery/purple(src)
 			if ("black")
-				new /obj/item/clothing/under/rank/medical/black(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/black(src)
 				new /obj/item/clothing/head/surgery/black(src)
 			if ("navyblue")
-				new /obj/item/clothing/under/rank/medical/navyblue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
 				new /obj/item/clothing/head/surgery/navyblue(src)
 		new /obj/item/clothing/under/rank/medical(src)
 		new /obj/item/clothing/under/rank/nurse(src)
@@ -154,6 +154,7 @@
 		new /obj/item/weapon/extinguisher/mini(src)
 		new /obj/item/weapon/storage/box/freezer(src)
 		new /obj/item/clothing/accessory/storage/white_vest(src)
+		new /obj/item/taperoll/medical(src)
 		return
 
 /obj/structure/closet/secure_closet/CMO
@@ -179,19 +180,19 @@
 		new /obj/item/clothing/shoes/white(src)
 		switch(pick("blue", "green", "purple", "black", "navyblue"))
 			if ("blue")
-				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs(src)
 				new /obj/item/clothing/head/surgery/blue(src)
 			if ("green")
-				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/green(src)
 				new /obj/item/clothing/head/surgery/green(src)
 			if ("purple")
-				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
 				new /obj/item/clothing/head/surgery/purple(src)
 			if ("black")
-				new /obj/item/clothing/under/rank/medical/black(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/black(src)
 				new /obj/item/clothing/head/surgery/black(src)
 			if ("navyblue")
-				new /obj/item/clothing/under/rank/medical/navyblue(src)
+				new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
 				new /obj/item/clothing/head/surgery/navyblue(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
@@ -209,6 +210,7 @@
 		new /obj/item/clothing/shoes/boots/winter/medical(src)
 		new /obj/item/weapon/storage/box/freezer(src)
 		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/taperoll/medical(src)
 		return
 
 

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

@@ -276,7 +276,7 @@
 
 	New()
 		..()
-		new /obj/item/clothing/accessory/armband/medgreen(src)
+		new /obj/item/clothing/accessory/armband/medblue(src)
 		new /obj/item/device/encryptionkey/headset_med(src)
 		return
 

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

@@ -88,6 +88,15 @@
 	new /obj/item/weapon/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
+/obj/structure/closet/firecloset/full/double/New()
+	..()
+	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/weapon/tank/oxygen/red(src)
+	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/clothing/head/hardhat/red(src)
+
 /obj/structure/closet/firecloset/update_icon()
 	if(!opened)
 		icon_state = icon_closed
@@ -176,6 +185,12 @@
 	new /obj/item/clothing/shoes/black( src )
 	new /obj/item/clothing/head/bomb_hood( src )
 
+/obj/structure/closet/bombcloset/double/New() // Makes two suits.
+	..()
+	new /obj/item/clothing/suit/bomb_suit( src )
+	new /obj/item/clothing/under/color/black( src )
+	new /obj/item/clothing/shoes/black( src )
+	new /obj/item/clothing/head/bomb_hood( src )
 
 /obj/structure/closet/bombclosetsecurity
 	name = "\improper EOD closet"

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

@@ -475,11 +475,11 @@
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical/skirt(src)
 	new /obj/item/clothing/under/rank/medical/skirt(src)
-	new /obj/item/clothing/under/rank/medical/blue(src)
-	new /obj/item/clothing/under/rank/medical/green(src)
-	new /obj/item/clothing/under/rank/medical/purple(src)
-	new /obj/item/clothing/under/rank/medical/black(src)
-	new /obj/item/clothing/under/rank/medical/navyblue(src)
+	new /obj/item/clothing/under/rank/medical/scrubs(src)
+	new /obj/item/clothing/under/rank/medical/scrubs/green(src)
+	new /obj/item/clothing/under/rank/medical/scrubs/purple(src)
+	new /obj/item/clothing/under/rank/medical/scrubs/black(src)
+	new /obj/item/clothing/under/rank/medical/scrubs/navyblue(src)
 	new /obj/item/clothing/head/surgery/navyblue(src)
 	new /obj/item/clothing/head/surgery/purple(src)
 	new /obj/item/clothing/head/surgery/blue(src)

code/game/objects/structures/signs.dm

@@ -242,7 +242,7 @@
 
 /obj/structure/sign/kiddieplaque
 	name = "\improper AI developers plaque"
-	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be developmentally disabled. Beneath the image, someone has scratched the word \"PACKETS\""
+	desc = "Next to the extremely long list of names and job titles. Beneath the image, someone has scratched the word \"PACKETS\""
 	icon_state = "kiddieplaque"
 
 /obj/structure/sign/atmosplaque

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

@@ -0,0 +1,85 @@
+#define NEST_RESIST_TIME 1200
+
+/obj/structure/bed/nest
+	name = "alien nest"
+	desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "nest"
+	var/health = 100
+
+/obj/structure/bed/nest/update_icon()
+	return
+
+/obj/structure/bed/nest/user_unbuckle_mob(mob/user as mob)
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)
+			if(buckled_mob != user)
+				buckled_mob.visible_message(\
+					"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the sticky nest!</span>",\
+					"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
+					"<span class='notice'>You hear squelching...</span>")
+				buckled_mob.pixel_y = 0
+				buckled_mob.old_y = 0
+				unbuckle_mob()
+			else
+				if(world.time <= buckled_mob.last_special+NEST_RESIST_TIME)
+					return
+				buckled_mob.last_special = world.time
+				buckled_mob.visible_message(\
+					"<span class='warning'>[buckled_mob.name] struggles to break free of the gelatinous resin...</span>",\
+					"<span class='warning'>You struggle to break free from the gelatinous resin...</span>",\
+					"<span class='notice'>You hear squelching...</span>")
+				spawn(NEST_RESIST_TIME)
+					if(user && buckled_mob && user.buckled == src)
+						buckled_mob.last_special = world.time
+						buckled_mob.pixel_y = 0
+						buckled_mob.old_y = 0
+						unbuckle_mob()
+			src.add_fingerprint(user)
+	return
+
+/obj/structure/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
+	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
+		return
+
+	unbuckle_mob()
+
+	var/mob/living/carbon/xenos = user
+	var/mob/living/carbon/victim = M
+
+	if(istype(victim) && locate(/obj/item/organ/internal/xenos/hivenode) in victim.internal_organs)
+		return
+
+	if(istype(xenos) && !(locate(/obj/item/organ/internal/xenos/hivenode) in xenos.internal_organs))
+		return
+
+	if(M == usr)
+		return
+	else
+		M.visible_message(\
+			"<span class='notice'>[user.name] secretes a thick vile goo, securing [M.name] into [src]!</span>",\
+			"<span class='warning'>[user.name] drenches you in a foul-smelling resin, trapping you in the [src]!</span>",\
+			"<span class='notice'>You hear squelching...</span>")
+	M.buckled = src
+	M.loc = src.loc
+	M.set_dir(src.dir)
+	M.update_canmove()
+	M.pixel_y = 6
+	M.old_y = 6
+	src.buckled_mob = M
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	var/aforce = W.force
+	health = max(0, health - aforce)
+	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+	for(var/mob/M in viewers(src, 7))
+		M.show_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
+	healthcheck()
+
+/obj/structure/bed/nest/proc/healthcheck()
+	if(health <=0)
+		density = 0
+		qdel(src)
+	return

code/game/objects/structures/watercloset.dm

@@ -449,6 +449,7 @@
 /obj/structure/sink/puddle	//splishy splashy ^_^
 	name = "puddle"
 	icon_state = "puddle"
+	desc = "A small pool of some liquid, ostensibly water."
 
 /obj/structure/sink/puddle/attack_hand(mob/M as mob)
 	icon_state = "puddle-splash"

code/game/objects/structures/window.dm

@@ -59,10 +59,13 @@
 			playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
 		if(health < maxhealth / 4 && initialhealth >= maxhealth / 4)
 			visible_message("[src] looks like it's about to shatter!" )
+			update_icon()
 		else if(health < maxhealth / 2 && initialhealth >= maxhealth / 2)
 			visible_message("[src] looks seriously damaged!" )
+			update_icon()
 		else if(health < maxhealth * 3/4 && initialhealth >= maxhealth * 3/4)
 			visible_message("Cracks begin to appear in [src]!" )
+			update_icon()
 	return
 
 /obj/structure/window/proc/apply_silicate(var/amount)
@@ -204,6 +207,8 @@
 		return
 	if(damage >= 10)
 		visible_message("<span class='danger'>[user] smashes into [src]!</span>")
+		if(reinf)
+			damage = damage / 2
 		take_damage(damage)
 	else
 		visible_message("<span class='notice'>\The [user] bonks \the [src] harmlessly.</span>")
@@ -212,6 +217,24 @@
 
 /obj/structure/window/attackby(obj/item/W as obj, mob/user as mob)
 	if(!istype(W)) return//I really wish I did not need this
+
+	// Fixing.
+	if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP)
+		var/obj/item/weapon/weldingtool/WT = W
+		if(health < maxhealth)
+			if(WT.remove_fuel(1 ,user))
+				to_chat(user, "<span class='notice'>You begin repairing [src]...</span>")
+				playsound(src, WT.usesound, 50, 1)
+				if(do_after(user, 40 * WT.toolspeed, target = src))
+					health = maxhealth
+			//		playsound(src, 'sound/items/Welder.ogg', 50, 1)
+					update_icon()
+					to_chat(user, "<span class='notice'>You repair [src].</span>")
+		else
+			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
+		return
+
+	// Slamming.
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if(istype(G.affecting,/mob/living))
@@ -410,6 +433,15 @@
 		var/image/I = image(icon, "[basestate][connections[i]]", dir = 1<<(i-1))
 		overlays += I
 
+	// Damage overlays.
+	var/ratio = health / maxhealth
+	ratio = Ceiling(ratio * 4) * 25
+
+	if(ratio > 75)
+		return
+	var/image/I = image(icon, "damage[ratio]", layer + 0.1)
+	overlays += I
+
 	return
 
 /obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -439,6 +471,10 @@
 	damage_per_fire_tick = 1.0
 	maxhealth = 40.0
 
+/obj/structure/window/phoronbasic/full
+	dir = SOUTHWEST
+	maxhealth = 80
+
 /obj/structure/window/phoronreinforced
 	name = "reinforced borosilicate window"
 	desc = "A borosilicate alloy window, with rods supporting it. It seems to be very strong."
@@ -451,6 +487,9 @@
 	damage_per_fire_tick = 1.0 // This should last for 80 fire ticks if the window is not damaged at all. The idea is that borosilicate windows have something like ablative layer that protects them for a while.
 	maxhealth = 80.0
 
+/obj/structure/window/phoronreinforced/full
+	dir = SOUTHWEST
+	maxhealth = 160
 
 /obj/structure/window/reinforced
 	name = "reinforced window"
@@ -472,9 +511,9 @@
 		state = 0
 
 /obj/structure/window/reinforced/full
-	dir = 5
+	dir = SOUTHWEST
 	icon_state = "fwindow"
-	maxhealth = 60
+	maxhealth = 80
 
 /obj/structure/window/reinforced/tinted
 	name = "tinted window"