Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme

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

@@ -56,6 +56,7 @@
 		return
 	if(src.allowed(user))
 		src.locked = !src.locked
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
 		for(var/mob/O in viewers(user, 3))
 			if((O.client && !( O.blinded )))
 				O << "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>"

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/stool_bed_chair_nest/wheelchair.dm

@@ -193,3 +193,31 @@
 		pulling = null
 		usr.pulledby = null
 	..()
+
+/obj/item/wheelchair
+	name = "wheelchair"
+	desc = "A folded wheelchair that can be carried around."
+	icon = 'icons/obj/furniture.dmi'
+	icon_state = "wheelchair_folded"
+	item_state = "wheelchair"
+	w_class = ITEMSIZE_HUGE // Can't be put in backpacks. Oh well.
+
+/obj/item/wheelchair/attack_self(mob/user)
+		var/obj/structure/bed/chair/wheelchair/R = new /obj/structure/bed/chair/wheelchair(user.loc)
+		R.add_fingerprint(user)
+		R.name = src.name
+		R.color = src.color
+		qdel(src)
+
+/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
+	..()
+	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
+		if(!ishuman(usr))	return
+		if(buckled_mob)	return 0
+		visible_message("[usr] collapses \the [src.name].")
+		var/obj/item/wheelchair/R = new/obj/item/wheelchair(get_turf(src))
+		R.name = src.name
+		R.color = src.color
+		spawn(0)
+			qdel(src)
+		return

code/game/objects/structures/window.dm

@@ -314,6 +314,8 @@
 
 /obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
 	if(reinf) damage *= 0.5
+	if(damage < 5)
+		return
 	take_damage(damage)
 	return