Initial Commit

code/game/objects/structures/barsign.dm

@@ -0,0 +1,12 @@
+/obj/structure/sign/double/barsign
+	icon = 'icons/obj/barsigns.dmi'
+	icon_state = "empty"
+	anchored = 1
+	New()
+		ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead"))
+		return
+	proc/ChangeSign(var/Text)
+		src.icon_state = "[Text]"
+		//on = 0
+		//brightness_on = 4 //uncomment these when the lighting fixes get in
+		return

code/game/objects/structures/bedsheet_bin.dm

@@ -0,0 +1,191 @@
+/*
+CONTAINS:
+BEDSHEETS
+LINEN BINS
+*/
+
+/obj/item/weapon/bedsheet
+	name = "bedsheet"
+	desc = "A surprisingly soft linen bedsheet."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "sheet"
+	item_state = "bedsheet"
+	layer = 4.0
+	throwforce = 1
+	throw_speed = 1
+	throw_range = 2
+	w_class = 1.0
+	item_color = "white"
+
+
+/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
+	user.drop_item()
+	if(layer == initial(layer))
+		layer = 5
+	else
+		layer = initial(layer)
+	add_fingerprint(user)
+	return
+
+
+/obj/item/weapon/bedsheet/blue
+	icon_state = "sheetblue"
+	item_color = "blue"
+
+/obj/item/weapon/bedsheet/green
+	icon_state = "sheetgreen"
+	item_color = "green"
+
+/obj/item/weapon/bedsheet/orange
+	icon_state = "sheetorange"
+	item_color = "orange"
+
+/obj/item/weapon/bedsheet/purple
+	icon_state = "sheetpurple"
+	item_color = "purple"
+
+/obj/item/weapon/bedsheet/rainbow
+	icon_state = "sheetrainbow"
+	item_color = "rainbow"
+
+/obj/item/weapon/bedsheet/red
+	icon_state = "sheetred"
+	item_color = "red"
+
+/obj/item/weapon/bedsheet/yellow
+	icon_state = "sheetyellow"
+	item_color = "yellow"
+
+/obj/item/weapon/bedsheet/mime
+	icon_state = "sheetmime"
+	item_color = "mime"
+
+/obj/item/weapon/bedsheet/clown
+	icon_state = "sheetclown"
+	item_color = "clown"
+
+/obj/item/weapon/bedsheet/captain
+	icon_state = "sheetcaptain"
+	item_color = "captain"
+
+/obj/item/weapon/bedsheet/rd
+	icon_state = "sheetrd"
+	item_color = "director"
+
+/obj/item/weapon/bedsheet/medical
+	icon_state = "sheetmedical"
+	item_color = "medical"
+
+/obj/item/weapon/bedsheet/hos
+	icon_state = "sheethos"
+	item_color = "hosred"
+
+/obj/item/weapon/bedsheet/hop
+	icon_state = "sheethop"
+	item_color = "hop"
+
+/obj/item/weapon/bedsheet/ce
+	icon_state = "sheetce"
+	item_color = "chief"
+
+/obj/item/weapon/bedsheet/brown
+	icon_state = "sheetbrown"
+	item_color = "brown"
+
+
+
+
+/obj/structure/bedsheetbin
+	name = "linen bin"
+	desc = "A linen bin. It looks rather cosy."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "linenbin-full"
+	anchored = 1
+	var/amount = 20
+	var/list/sheets = list()
+	var/obj/item/hidden = null
+
+
+/obj/structure/bedsheetbin/examine()
+	usr << desc
+	if(amount < 1)
+		usr << "There are no bed sheets in the bin."
+		return
+	if(amount == 1)
+		usr << "There is one bed sheet in the bin."
+		return
+	usr << "There are [amount] bed sheets in the bin."
+
+
+/obj/structure/bedsheetbin/update_icon()
+	switch(amount)
+		if(0)				icon_state = "linenbin-empty"
+		if(1 to amount / 2)	icon_state = "linenbin-half"
+		else				icon_state = "linenbin-full"
+
+
+/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I, /obj/item/weapon/bedsheet))
+		user.drop_item()
+		I.loc = src
+		sheets.Add(I)
+		amount++
+		user << "<span class='notice'>You put [I] in [src].</span>"
+	else if(amount && !hidden && I.w_class < 4)	//make sure there's sheets to hide it among, make sure nothing else is hidden in there.
+		user.drop_item()
+		I.loc = src
+		hidden = I
+		user << "<span class='notice'>You hide [I] among the sheets.</span>"
+
+
+
+/obj/structure/bedsheetbin/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
+
+/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
+	if(amount >= 1)
+		amount--
+
+		var/obj/item/weapon/bedsheet/B
+		if(sheets.len > 0)
+			B = sheets[sheets.len]
+			sheets.Remove(B)
+
+		else
+			B = new /obj/item/weapon/bedsheet(loc)
+
+		B.loc = user.loc
+		user.put_in_hands(B)
+		user << "<span class='notice'>You take [B] out of [src].</span>"
+
+		if(hidden)
+			hidden.loc = user.loc
+			user << "<span class='notice'>[hidden] falls out of [B]!</span>"
+			hidden = null
+
+
+	add_fingerprint(user)
+
+/obj/structure/bedsheetbin/attack_tk(mob/user as mob)
+	if(amount >= 1)
+		amount--
+
+		var/obj/item/weapon/bedsheet/B
+		if(sheets.len > 0)
+			B = sheets[sheets.len]
+			sheets.Remove(B)
+
+		else
+			B = new /obj/item/weapon/bedsheet(loc)
+
+		B.loc = loc
+		user << "<span class='notice'>You telekinetically remove [B] from [src].</span>"
+		update_icon()
+
+		if(hidden)
+			hidden.loc = loc
+			hidden = null
+
+
+	add_fingerprint(user)

code/game/objects/structures/coathanger.dm

@@ -0,0 +1,53 @@
+/obj/structure/coatrack
+	name = "coat rack"
+	desc = "Rack that holds coats."
+	icon = 'icons/obj/coatrack.dmi'
+	icon_state = "coatrack0"
+	var/obj/item/clothing/suit/coat
+	var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit)
+
+/obj/structure/coatrack/attack_hand(mob/user as mob)
+	user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")
+	if(!user.put_in_active_hand(coat))
+		coat.loc = get_turf(user)
+	coat = null
+	update_icon()
+
+/obj/structure/coatrack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	var/can_hang = 0
+	for (var/T in allowed)
+		if(istype(W,T))
+			can_hang = 1
+	if (can_hang && !coat)
+		user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src]")
+		coat = W
+		user.drop_item(src)
+		coat.loc = src
+		update_icon()
+	else
+		user << "<span class='notice'>You cannot hang [W] on [src]</span>"
+		return ..()
+
+/obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	var/can_hang = 0
+	for (var/T in allowed)
+		if(istype(mover,T))
+			can_hang = 1
+
+	if (can_hang && !coat)
+		src.visible_message("[mover] lands on \the [src].")
+		coat = mover
+		coat.loc = src
+		update_icon()
+		return 0
+	else
+		return 1
+
+/obj/structure/coatrack/update_icon()
+	overlays.Cut()
+	if (istype(coat, /obj/item/clothing/suit/storage/labcoat))
+		overlays += image(icon, icon_state = "coat_lab")
+	if (istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo))
+		overlays += image(icon, icon_state = "coat_cmo")
+	if (istype(coat, /obj/item/clothing/suit/storage/det_suit))
+		overlays += image(icon, icon_state = "coat_det")

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

@@ -0,0 +1,287 @@
+/obj/structure/closet
+	name = "closet"
+	desc = "It's a basic storage unit."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "closed"
+	density = 1
+	flags = FPRINT
+	var/icon_closed = "closed"
+	var/icon_opened = "open"
+	var/opened = 0
+	var/welded = 0
+	var/wall_mounted = 0 //never solid (You can always pass over it)
+	var/health = 100
+	var/lastbang
+	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate
+							  //then open it in a populated area to crash clients.
+
+/obj/structure/closet/New()
+	..()
+	spawn(1)
+		if(!opened)		// if closed, any item at the crate's loc is put in the contents
+			for(var/obj/item/I in src.loc)
+				if(I.density || I.anchored || I == src) continue
+				I.loc = src
+
+/obj/structure/closet/alter_health()
+	return get_turf(src)
+
+/obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0 || wall_mounted)) return 1
+	return (!density)
+
+/obj/structure/closet/proc/can_open()
+	if(src.welded)
+		return 0
+	return 1
+
+/obj/structure/closet/proc/can_close()
+	for(var/obj/structure/closet/closet in get_turf(src))
+		if(closet != src)
+			return 0
+	return 1
+
+/obj/structure/closet/proc/dump_contents()
+	//Cham Projector Exception
+	for(var/obj/effect/dummy/chameleon/AD in src)
+		AD.loc = src.loc
+
+	for(var/obj/I in src)
+		I.loc = src.loc
+
+	for(var/mob/M in src)
+		M.loc = src.loc
+		if(M.client)
+			M.client.eye = M.client.mob
+			M.client.perspective = MOB_PERSPECTIVE
+
+/obj/structure/closet/proc/open()
+	if(src.opened)
+		return 0
+
+	if(!src.can_open())
+		return 0
+
+	src.dump_contents()
+
+	src.icon_state = src.icon_opened
+	src.opened = 1
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
+	else
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	density = 0
+	return 1
+
+/obj/structure/closet/proc/close()
+	if(!src.opened)
+		return 0
+	if(!src.can_close())
+		return 0
+
+	var/itemcount = 0
+
+	//Cham Projector Exception
+	for(var/obj/effect/dummy/chameleon/AD in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		AD.loc = src
+		itemcount++
+
+	for(var/obj/item/I in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		if(!I.anchored)
+			I.loc = src
+			itemcount++
+
+	for(var/mob/M in src.loc)
+		if(itemcount >= storage_capacity)
+			break
+		if(istype (M, /mob/dead/observer))
+			continue
+		if(M.buckled)
+			continue
+
+		if(M.client)
+			M.client.perspective = EYE_PERSPECTIVE
+			M.client.eye = src
+
+		M.loc = src
+		itemcount++
+
+	src.icon_state = src.icon_closed
+	src.opened = 0
+	if(istype(src, /obj/structure/closet/body_bag))
+		playsound(src.loc, 'sound/items/zip.ogg', 15, 1, -3)
+	else
+		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	density = 1
+	return 1
+
+/obj/structure/closet/proc/toggle(mob/user as mob)
+	. = src.opened ? src.close() : src.open()
+	if(!.)
+		user << "<span class='notice'>It won't budge!</span>"
+	return
+
+// this should probably use dump_contents()
+/obj/structure/closet/ex_act(severity)
+	switch(severity)
+		if(1)
+			for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
+				A.loc = src.loc
+				A.ex_act(severity++)
+			del(src)
+		if(2)
+			if(prob(50))
+				for (var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					A.ex_act(severity++)
+				del(src)
+		if(3)
+			if(prob(5))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					A.ex_act(severity++)
+				del(src)
+
+/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	if(health <= 0)
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.loc
+		del(src)
+
+	return
+
+/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
+	if(user.wall_smash)
+		visible_message("\red [user] destroys the [src]. ")
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.loc
+		del(src)
+
+// 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.loc = src.loc
+		del(src)
+
+/obj/structure/closet/meteorhit(obj/O as obj)
+	if(O.icon_state == "flaming")
+		for(var/mob/M in src)
+			M.meteorhit(O)
+		src.dump_contents()
+		del(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))
+			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
+		if(istype(W,/obj/item/tk_grab))
+			return 0
+		if(istype(W, /obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = W
+			if(!WT.remove_fuel(0,user))
+				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+				return
+			new /obj/item/stack/sheet/metal(src.loc)
+			for(var/mob/M in viewers(src))
+				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
+			del(src)
+			return
+		if(isrobot(user))
+			return
+		usr.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
+	else if(istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(!WT.remove_fuel(0,user))
+			user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+			return
+		src.welded = !src.welded
+		src.update_icon()
+		for(var/mob/M in viewers(src))
+			M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 3, "You hear welding.", 2)
+	else
+		src.attack_hand(user)
+	return
+
+/obj/structure/closet/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	if(istype(O, /obj/screen))	//fix for HUD elements making their way into the world	-Pete
+		return
+	if(O.loc == user)
+		return
+	if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis)
+		return
+	if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
+		return
+	if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems
+		return
+	if(!istype(user.loc, /turf)) // are you in a container/closet/pod/etc?
+		return
+	if(!src.opened)
+		return
+	if(istype(O, /obj/structure/closet))
+		return
+	step_towards(O, src.loc)
+	if(user != O)
+		user.show_viewers("<span class='danger'>[user] stuffs [O] into [src]!</span>")
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/closet/relaymove(mob/user as mob)
+	if(user.stat || !isturf(src.loc))
+		return
+
+	if(!src.open())
+		user << "<span class='notice'>It won't budge!</span>"
+		if(!lastbang)
+			lastbang = 1
+			for (var/mob/M in hearers(src, null))
+				M << text("<FONT size=[]>BANG, bang!</FONT>", max(0, 5 - get_dist(src, M)))
+			spawn(30)
+				lastbang = 0
+
+
+/obj/structure/closet/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/closet/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	src.toggle(user)
+
+// tk grab then use on self
+/obj/structure/closet/attack_self_tk(mob/user as mob)
+	src.add_fingerprint(user)
+	if(!src.toggle())
+		usr << "<span class='notice'>It won't budge!</span>"
+
+/obj/structure/closet/verb/verb_toggleopen()
+	set src in oview(1)
+	set category = "Object"
+	set name = "Toggle Open"
+
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.toggle(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+	overlays.Cut()
+	if(!opened)
+		icon_state = icon_closed
+		if(welded)
+			overlays += "welded"
+	else
+		icon_state = icon_opened

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

@@ -0,0 +1,12 @@
+/obj/structure/closet/coffin
+	name = "coffin"
+	desc = "It's a burial receptacle for the dearly departed."
+	icon_state = "coffin"
+	icon_closed = "coffin"
+	icon_opened = "coffin_open"
+
+/obj/structure/closet/coffin/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened

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

@@ -0,0 +1,6 @@
+/obj/structure/closet/crate/critter
+	name = "critter crate"
+	desc = "A crate which can sustain life for a while."
+	icon_state = "critter"
+	icon_opened = "critteropen"
+	icon_closed = "critter"

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

@@ -0,0 +1,207 @@
+//I still dont think this should be a closet but whatever
+/obj/structure/closet/fireaxecabinet
+	name = "Fire Axe Cabinet"
+	desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
+	var/obj/item/weapon/twohanded/fireaxe/fireaxe = new/obj/item/weapon/twohanded/fireaxe
+	icon_state = "fireaxe1000"
+	icon_closed = "fireaxe1000"
+	icon_opened = "fireaxe1100"
+	anchored = 1
+	density = 0
+	var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
+	opened = 1
+	var/hitstaken = 0
+	var/locked = 1
+	var/smashed = 0
+
+	attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+		//..() //That's very useful, Erro
+
+		var/hasaxe = 0       //gonna come in handy later~
+		if(fireaxe)
+			hasaxe = 1
+
+		if (isrobot(usr) || src.locked)
+			if(istype(O, /obj/item/device/multitool))
+				user << "\red Resetting circuitry..."
+				playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
+				sleep(50) // Sleeping time~
+				src.locked = 0
+				user << "\blue You disable the locking modules."
+				update_icon()
+				return
+			else if(istype(O, /obj/item/weapon))
+				var/obj/item/weapon/W = O
+				if(src.smashed || src.localopened)
+					if(localopened)
+						localopened = 0
+						icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+						spawn(10) update_icon()
+					return
+				else
+					playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time
+				if(W.force < 15)
+					user << "\blue The cabinet's protective glass glances off the hit."
+				else
+					src.hitstaken++
+					if(src.hitstaken == 4)
+						playsound(user, 'sound/effects/Glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
+						src.smashed = 1
+						src.locked = 0
+						src.localopened = 1
+				update_icon()
+			return
+		if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened)
+			if(!fireaxe)
+				if(O:wielded)
+					user << "\red Unwield the axe first."
+					return
+				fireaxe = O
+				user.drop_item(O)
+				src.contents += O
+				user << "\blue You place the fire axe back in the [src.name]."
+				update_icon()
+			else
+				if(src.smashed)
+					return
+				else
+					localopened = !localopened
+					if(localopened)
+						icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+						spawn(10) update_icon()
+					else
+						icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+						spawn(10) update_icon()
+		else
+			if(src.smashed)
+				return
+			if(istype(O, /obj/item/device/multitool))
+				if(localopened)
+					localopened = 0
+					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
+					return
+				else
+					user << "\red Resetting circuitry..."
+					sleep(50)
+					src.locked = 1
+					user << "\blue You re-enable the locking modules."
+					playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
+					return
+			else
+				localopened = !localopened
+				if(localopened)
+					icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
+				else
+					icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+					spawn(10) update_icon()
+
+
+
+
+	attack_hand(mob/user as mob)
+
+		var/hasaxe = 0
+		if(fireaxe)
+			hasaxe = 1
+
+		if(src.locked)
+			user <<"\red The cabinet won't budge!"
+			return
+		if(localopened)
+			if(fireaxe)
+				user.put_in_hands(fireaxe)
+				fireaxe = null
+				user << "\blue You take the fire axe from the [name]."
+				src.add_fingerprint(user)
+				update_icon()
+			else
+				if(src.smashed)
+					return
+				else
+					localopened = !localopened
+					if(localopened)
+						src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+						spawn(10) update_icon()
+					else
+						src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+						spawn(10) update_icon()
+
+		else
+			localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
+			if(localopened)
+				src.icon_state = text("fireaxe[][][][]opening",hasaxe,src.localopened,src.hitstaken,src.smashed)
+				spawn(10) update_icon()
+			else
+				src.icon_state = text("fireaxe[][][][]closing",hasaxe,src.localopened,src.hitstaken,src.smashed)
+				spawn(10) update_icon()
+
+	attack_tk(mob/user as mob)
+		if(localopened && fireaxe)
+			fireaxe.loc = loc
+			user << "\blue You telekinetically remove the fire axe."
+			fireaxe = null
+			update_icon()
+			return
+		attack_hand(user)
+
+	verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
+		set name = "Open/Close"
+		set category = "Object"
+
+		if (isrobot(usr) || src.locked || src.smashed)
+			if(src.locked)
+				usr << "\red The cabinet won't budge!"
+			else if(src.smashed)
+				usr << "\blue The protective glass is broken!"
+			return
+
+		localopened = !localopened
+		update_icon()
+
+	verb/remove_fire_axe()
+		set name = "Remove Fire Axe"
+		set category = "Object"
+
+		if (isrobot(usr))
+			return
+
+		if (localopened)
+			if(fireaxe)
+				usr.put_in_hands(fireaxe)
+				fireaxe = null
+				usr << "\blue You take the Fire axe from the [name]."
+			else
+				usr << "\blue The [src.name] is empty."
+		else
+			usr << "\blue The [src.name] is closed."
+		update_icon()
+
+	attack_paw(mob/user as mob)
+		attack_hand(user)
+		return
+
+	attack_ai(mob/user as mob)
+		if(src.smashed)
+			user << "\red The security of the cabinet is compromised."
+			return
+		else
+			locked = !locked
+			if(locked)
+				user << "\red Cabinet locked."
+			else
+				user << "\blue Cabinet unlocked."
+			return
+
+	update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
+		var/hasaxe = 0
+		if(fireaxe)
+			hasaxe = 1
+		icon_state = text("fireaxe[][][][]",hasaxe,src.localopened,src.hitstaken,src.smashed)
+
+	open()
+		return
+
+	close()
+		return

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

@@ -0,0 +1,79 @@
+/obj/structure/closet/athletic_mixed
+	name = "athletic wardrobe"
+	desc = "It's a storage unit for athletic wear."
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/athletic_mixed/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/under/shorts/grey(src)
+	new /obj/item/clothing/under/shorts/black(src)
+	new /obj/item/clothing/under/shorts/red(src)
+	new /obj/item/clothing/under/shorts/blue(src)
+	new /obj/item/clothing/under/shorts/green(src)
+	new /obj/item/clothing/under/swimsuit/red(src)
+	new /obj/item/clothing/under/swimsuit/black(src)
+	new /obj/item/clothing/under/swimsuit/blue(src)
+	new /obj/item/clothing/under/swimsuit/green(src)
+	new /obj/item/clothing/under/swimsuit/purple(src)
+	new /obj/item/clothing/mask/snorkel(src)
+	new /obj/item/clothing/mask/snorkel(src)
+	new /obj/item/clothing/shoes/swimmingfins(src)
+	new /obj/item/clothing/shoes/swimmingfins(src)
+
+
+
+/obj/structure/closet/boxinggloves
+	name = "boxing gloves"
+	desc = "It's a storage unit for gloves for use in the boxing ring."
+
+/obj/structure/closet/boxinggloves/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/gloves/boxing/blue(src)
+	new /obj/item/clothing/gloves/boxing/green(src)
+	new /obj/item/clothing/gloves/boxing/yellow(src)
+	new /obj/item/clothing/gloves/boxing(src)
+
+
+/obj/structure/closet/masks
+	name = "mask closet"
+	desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
+
+/obj/structure/closet/masks/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/mask/luchador(src)
+	new /obj/item/clothing/mask/luchador/rudos(src)
+	new /obj/item/clothing/mask/luchador/tecnicos(src)
+
+
+/obj/structure/closet/lasertag/red
+	name = "red laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/lasertag/red/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/gun/energy/laser/redtag(src)
+	new /obj/item/weapon/gun/energy/laser/redtag(src)
+	new /obj/item/clothing/suit/redtag(src)
+	new /obj/item/clothing/suit/redtag(src)
+
+
+/obj/structure/closet/lasertag/blue
+	name = "blue laser tag equipment"
+	desc = "It's a storage unit for laser tag equipment."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/lasertag/blue/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/gun/energy/laser/bluetag(src)
+	new /obj/item/weapon/gun/energy/laser/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)

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

@@ -0,0 +1,142 @@
+/obj/structure/closet/cabinet
+	name = "cabinet"
+	desc = "Old will forever be in fashion."
+	icon_state = "cabinet_closed"
+	icon_closed = "cabinet_closed"
+	icon_opened = "cabinet_open"
+
+/obj/structure/closet/cabinet/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened
+
+/obj/structure/closet/acloset
+	name = "strange closet"
+	desc = "It looks alien!"
+	icon_state = "acloset"
+	icon_closed = "acloset"
+	icon_opened = "aclosetopen"
+
+
+/obj/structure/closet/gimmick
+	name = "administrative supply closet"
+	desc = "It's a storage unit for things that have no right being here."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+	anchored = 0
+
+/obj/structure/closet/gimmick/russian
+	name = "russian surplus closet"
+	desc = "It's a storage unit for Russian standard-issue surplus."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/gimmick/russian/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/head/ushanka(src)
+	new /obj/item/clothing/under/soviet(src)
+	new /obj/item/clothing/under/soviet(src)
+	new /obj/item/clothing/under/soviet(src)
+	new /obj/item/clothing/under/soviet(src)
+	new /obj/item/clothing/under/soviet(src)
+
+
+/obj/structure/closet/gimmick/tacticool
+	name = "tacticool gear closet"
+	desc = "It's a storage unit for Tacticool gear."
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/gimmick/tacticool/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/glasses/eyepatch(src)
+	new /obj/item/clothing/glasses/sunglasses(src)
+	new /obj/item/clothing/gloves/swat(src)
+	new /obj/item/clothing/gloves/swat(src)
+	new /obj/item/clothing/head/helmet/swat(src)
+	new /obj/item/clothing/head/helmet/swat(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/shoes/swat(src)
+	new /obj/item/clothing/shoes/swat(src)
+	new /obj/item/clothing/suit/armor/swat(src)
+	new /obj/item/clothing/suit/armor/swat(src)
+	new /obj/item/clothing/under/syndicate/tacticool(src)
+	new /obj/item/clothing/under/syndicate/tacticool(src)
+
+
+/obj/structure/closet/thunderdome
+	name = "\improper Thunderdome closet"
+	desc = "Everything you need!"
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+	anchored = 1
+
+/obj/structure/closet/thunderdome/New()
+	..()
+	sleep(2)
+
+/obj/structure/closet/thunderdome/tdred
+	name = "red-team Thunderdome closet"
+
+/obj/structure/closet/thunderdome/tdred/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/clothing/suit/armor/tdome/red(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+
+/obj/structure/closet/thunderdome/tdgreen
+	name = "green-team Thunderdome closet"
+	icon_state = "syndicate1"
+	icon_closed = "syndicate1"
+	icon_opened = "syndicate1open"
+
+/obj/structure/closet/thunderdome/tdgreen/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/clothing/suit/armor/tdome/green(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/melee/energy/sword(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/gun/energy/laser(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/melee/baton(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+	new /obj/item/clothing/head/helmet/thunderdome(src)
+

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

@@ -0,0 +1,76 @@
+/* Closets for specific jobs
+ * Contains:
+ *		Bartender
+ *		Janitor
+ *		Lawyer
+ */
+
+/*
+ * Bartender
+ */
+/obj/structure/closet/gmcloset
+	name = "formal closet"
+	desc = "It's a storage unit for formal clothing."
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/gmcloset/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/hairflower
+	new /obj/item/clothing/under/sl_suit(src)
+	new /obj/item/clothing/under/sl_suit(src)
+	new /obj/item/clothing/under/rank/bartender(src)
+	new /obj/item/clothing/under/rank/bartender(src)
+	new /obj/item/clothing/under/dress/dress_saloon
+	new /obj/item/clothing/suit/wcoat(src)
+	new /obj/item/clothing/suit/wcoat(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+
+/*
+ * Janitor
+ */
+/obj/structure/closet/jcloset
+	name = "custodial closet"
+	desc = "It's a storage unit for janitorial clothes and gear."
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/jcloset/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/under/rank/janitor(src)
+	new /obj/item/weapon/cartridge/janitor(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/head/soft/purple(src)
+	new /obj/item/device/flashlight(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/weapon/caution(src)
+	new /obj/item/device/lightreplacer(src)
+	new /obj/item/weapon/storage/bag/trash(src)
+	new /obj/item/clothing/shoes/galoshes(src)
+
+/*
+ * Lawyer
+ */
+/obj/structure/closet/lawcloset
+	name = "legal closet"
+	desc = "It's a storage unit for courtroom apparel and items."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/lawcloset/New()
+	new /obj/item/clothing/under/lawyer/female(src)
+	new /obj/item/clothing/under/lawyer/black(src)
+	new /obj/item/clothing/under/lawyer/red(src)
+	new /obj/item/clothing/under/lawyer/bluesuit(src)
+	new /obj/item/clothing/suit/storage/lawyer/bluejacket(src)
+	new /obj/item/clothing/under/lawyer/purpsuit(src)
+	new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/black(src)

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

@@ -0,0 +1,79 @@
+/obj/structure/closet/l3closet
+	name = "level-3 biohazard suit closet"
+	desc = "It's a storage unit for level-3 biohazard gear."
+	icon_state = "bio"
+	icon_closed = "bio"
+	icon_opened = "bioopen"
+
+/obj/structure/closet/l3closet/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/bio_suit/general( src )
+	new /obj/item/clothing/head/bio_hood/general( src )
+
+
+/obj/structure/closet/l3closet/general
+	icon_state = "bio_general"
+	icon_closed = "bio_general"
+	icon_opened = "bio_generalopen"
+
+/obj/structure/closet/l3closet/general/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/general( src )
+	new /obj/item/clothing/head/bio_hood/general( src )
+
+
+/obj/structure/closet/l3closet/virology
+	icon_state = "bio_virology"
+	icon_closed = "bio_virology"
+	icon_opened = "bio_virologyopen"
+
+/obj/structure/closet/l3closet/virology/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/virology( src )
+	new /obj/item/clothing/head/bio_hood/virology( src )
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/oxygen(src)
+
+
+/obj/structure/closet/l3closet/security
+	icon_state = "bio_security"
+	icon_closed = "bio_security"
+	icon_opened = "bio_securityopen"
+
+/obj/structure/closet/l3closet/security/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/security( src )
+	new /obj/item/clothing/head/bio_hood/security( src )
+
+
+/obj/structure/closet/l3closet/janitor
+	icon_state = "bio_janitor"
+	icon_closed = "bio_janitor"
+	icon_opened = "bio_janitoropen"
+
+/obj/structure/closet/l3closet/janitor/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/janitor( src )
+	new /obj/item/clothing/head/bio_hood/janitor( src )
+
+
+/obj/structure/closet/l3closet/scientist
+	icon_state = "bio_scientist"
+	icon_closed = "bio_scientist"
+	icon_opened = "bio_scientistopen"
+
+/obj/structure/closet/l3closet/scientist/New()
+	..()
+	sleep(2)
+	contents = list()
+	new /obj/item/clothing/suit/bio_suit/scientist( src )
+	new /obj/item/clothing/head/bio_hood/scientist( src )

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

@@ -0,0 +1,17 @@
+
+/obj/structure/closet/malf/suits
+	desc = "It's a storage unit for operational gear."
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+
+/obj/structure/closet/malf/suits/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/tank/jetpack/void(src)
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/head/helmet/space/nasavoid(src)
+	new /obj/item/clothing/suit/space/nasavoid(src)
+	new /obj/item/weapon/crowbar(src)
+	new /obj/item/weapon/cell(src)
+	new /obj/item/device/multitool(src)

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

@@ -0,0 +1,37 @@
+/obj/structure/closet/secure_closet/bar
+	name = "Booze"
+	req_access = list(access_bar)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/cans/beer( src )
+		return
+
+/obj/structure/closet/secure_closet/bar/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

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

@@ -0,0 +1,45 @@
+/obj/structure/closet/secure_closet/cargotech
+	name = "Cargo Technician's Locker"
+	req_access = list(access_cargo)
+	icon_state = "securecargo1"
+	icon_closed = "securecargo"
+	icon_locked = "securecargo1"
+	icon_opened = "securecargoopen"
+	icon_broken = "securecargobroken"
+	icon_off = "securecargooff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/cargotech(src)
+		new /obj/item/clothing/shoes/black(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/clothing/head/soft(src)
+//		new /obj/item/weapon/cartridge/quartermaster(src)
+		return
+
+/obj/structure/closet/secure_closet/quartermaster
+	name = "Quartermaster's Locker"
+	req_access = list(access_qm)
+	icon_state = "secureqm1"
+	icon_closed = "secureqm"
+	icon_locked = "secureqm1"
+	icon_opened = "secureqmopen"
+	icon_broken = "secureqmbroken"
+	icon_off = "secureqmoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/cargo(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
+		new /obj/item/clothing/gloves/black(src)
+//		new /obj/item/weapon/cartridge/quartermaster(src)
+		new /obj/item/clothing/suit/fire/firefighter(src)
+		new /obj/item/weapon/tank/emergency_oxygen(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/clothing/glasses/meson(src)
+		new /obj/item/clothing/head/soft(src)
+		return

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

@@ -0,0 +1,154 @@
+/obj/structure/closet/secure_closet/engineering_chief
+	name = "Chief Engineer's Locker"
+	req_access = list(access_ce)
+	icon_state = "securece1"
+	icon_closed = "securece"
+	icon_locked = "securece1"
+	icon_opened = "secureceopen"
+	icon_broken = "securecebroken"
+	icon_off = "secureceoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
+		new /obj/item/blueprints(src)
+		new /obj/item/clothing/under/rank/chief_engineer(src)
+		new /obj/item/clothing/head/hardhat/white(src)
+		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/cartridge/ce(src)
+		new /obj/item/device/radio/headset/heads/ce(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/clothing/suit/storage/hazardvest(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/taperoll/engineering(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/engineering_electrical
+	name = "Electrical Supplies"
+	req_access = list(access_engine_equip)
+	icon_state = "secureengelec1"
+	icon_closed = "secureengelec"
+	icon_locked = "secureengelec1"
+	icon_opened = "toolclosetopen"
+	icon_broken = "secureengelecbroken"
+	icon_off = "secureengelecoff"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/clothing/gloves/yellow(src)
+		new /obj/item/weapon/storage/toolbox/electrical(src)
+		new /obj/item/weapon/storage/toolbox/electrical(src)
+		new /obj/item/weapon/storage/toolbox/electrical(src)
+		new /obj/item/weapon/module/power_control(src)
+		new /obj/item/weapon/module/power_control(src)
+		new /obj/item/weapon/module/power_control(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/device/multitool(src)
+		new /obj/item/device/multitool(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/engineering_welding
+	name = "Welding Supplies"
+	req_access = list(access_construction)
+	icon_state = "secureengweld1"
+	icon_closed = "secureengweld"
+	icon_locked = "secureengweld1"
+	icon_opened = "toolclosetopen"
+	icon_broken = "secureengweldbroken"
+	icon_off = "secureengweldoff"
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/head/welding(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		new /obj/item/weapon/weldingtool/largetank(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/engineering_personal
+	name = "Engineer's Locker"
+	req_access = list(access_engine_equip)
+	icon_state = "secureeng1"
+	icon_closed = "secureeng"
+	icon_locked = "secureeng1"
+	icon_opened = "secureengopen"
+	icon_broken = "secureengbroken"
+	icon_off = "secureengoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
+		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/device/radio/headset/headset_eng(src)
+		new /obj/item/clothing/suit/storage/hazardvest(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/clothing/glasses/meson(src)
+		new /obj/item/weapon/cartridge/engineering(src)
+		new /obj/item/taperoll/engineering(src)
+		return
+/obj/structure/closet/secure_closet/atmos_personal
+	name = "Technician's Locker"
+	req_access = list(access_atmospherics)
+	icon_state = "secureeng1"
+	icon_closed = "secureeng"
+	icon_locked = "secureeng1"
+	icon_opened = "secureengopen"
+	icon_broken = "secureengbroken"
+	icon_off = "secureengoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/industrial(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_eng(src)
+		if (prob(70))
+			new /obj/item/clothing/tie/storage/brown_vest(src)
+		else
+			new /obj/item/clothing/tie/storage/webbing(src)
+		new /obj/item/clothing/suit/fire/firefighter(src)
+		new /obj/item/device/flashlight(src)
+		new /obj/item/weapon/extinguisher(src)
+		new /obj/item/device/radio/headset/headset_eng(src)
+		new /obj/item/clothing/suit/storage/hazardvest(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/weapon/cartridge/atmos(src)
+		new /obj/item/taperoll/engineering(src)
+		return

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

@@ -0,0 +1,103 @@
+/obj/structure/closet/secure_closet/freezer
+
+/obj/structure/closet/secure_closet/freezer/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/freezer/kitchen
+	name = "Kitchen Cabinet"
+	req_access = list(access_kitchen)
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 3, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/flour(src)
+		new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+		return
+
+
+/obj/structure/closet/secure_closet/freezer/kitchen/mining
+	req_access = list()
+
+
+
+/obj/structure/closet/secure_closet/freezer/meat
+	name = "Meat Fridge"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 4, i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/freezer/fridge
+	name = "Refrigerator"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/milk(src)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src)
+		for(var/i = 0, i < 2, i++)
+			new /obj/item/weapon/storage/fancy/egg_box(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/freezer/money
+	name = "Freezer"
+	icon_state = "fridge1"
+	icon_closed = "fridge"
+	icon_locked = "fridge1"
+	icon_opened = "fridgeopen"
+	icon_broken = "fridgebroken"
+	icon_off = "fridge1"
+	req_access = list(access_heads_vault)
+
+
+	New()
+		..()
+		sleep(2)
+		for(var/i = 0, i < 3, i++)
+			new /obj/item/weapon/spacecash/c1000(src)
+		for(var/i = 0, i < 5, i++)
+			new /obj/item/weapon/spacecash/c500(src)
+		for(var/i = 0, i < 6, i++)
+			new /obj/item/weapon/spacecash/c200(src)
+		return
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,53 @@
+/obj/structure/closet/secure_closet/guncabinet
+	name = "gun cabinet"
+	req_access = list(access_armory)
+	icon = 'icons/obj/guncabinet.dmi'
+	icon_state = "base"
+	icon_off ="base"
+	icon_broken ="base"
+	icon_locked ="base"
+	icon_closed ="base"
+	icon_opened = "base"
+
+/obj/structure/closet/secure_closet/guncabinet/New()
+	..()
+	update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/toggle()
+	..()
+	update_icon()
+
+/obj/structure/closet/secure_closet/guncabinet/update_icon()
+	overlays.Cut()
+	if(opened)
+		overlays += icon(icon,"door_open")
+	else
+		var/lazors = 0
+		var/shottas = 0
+		for (var/obj/item/weapon/gun/G in contents)
+			if (istype(G, /obj/item/weapon/gun/energy))
+				lazors++
+			if (istype(G, /obj/item/weapon/gun/projectile/))
+				shottas++
+		if (lazors || shottas)
+			for (var/i = 0 to 2)
+				var/image/gun = image(icon(src.icon))
+
+				if (lazors > 0 && (shottas <= 0 || prob(50)))
+					lazors--
+					gun.icon_state = "laser"
+				else if (shottas > 0)
+					shottas--
+					gun.icon_state = "projectile"
+
+				gun.pixel_x = i*4
+				overlays += gun
+
+		overlays += icon(src.icon,"door")
+
+		if(broken)
+			overlays += icon(src.icon,"broken")
+		else if (locked)
+			overlays += icon(src.icon,"locked")
+		else
+			overlays += icon(src.icon,"open")

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

@@ -0,0 +1,27 @@
+/obj/structure/closet/secure_closet/hydroponics
+	name = "Botanist's locker"
+	req_access = list(access_hydroponics)
+	icon_state = "hydrosecure1"
+	icon_closed = "hydrosecure"
+	icon_locked = "hydrosecure1"
+	icon_opened = "hydrosecureopen"
+	icon_broken = "hydrosecurebroken"
+	icon_off = "hydrosecureoff"
+
+
+	New()
+		..()
+		sleep(2)
+		switch(rand(1,2))
+			if(1)
+				new /obj/item/clothing/suit/apron(src)
+			if(2)
+				new /obj/item/clothing/suit/apron/overalls(src)
+		new /obj/item/weapon/storage/bag/plants(src)
+		new /obj/item/clothing/under/rank/hydroponics(src)
+		new /obj/item/device/analyzer/plant_analyzer(src)
+		new /obj/item/clothing/head/greenbandana(src)
+		new /obj/item/weapon/minihoe(src)
+		new /obj/item/weapon/hatchet(src)
+		new /obj/item/weapon/bee_net(src)
+		return

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

@@ -0,0 +1,209 @@
+/obj/structure/closet/secure_closet/medical1
+	name = "Medicine Closet"
+	desc = "Filled with medical junk."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_medical)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/box/autoinjectors(src)
+		new /obj/item/weapon/storage/box/syringes(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/medical2
+	name = "Anesthetic"
+	desc = "Used to knock people out."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_surgery)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/weapon/tank/anesthetic(src)
+		new /obj/item/clothing/mask/breath/medical(src)
+		new /obj/item/clothing/mask/breath/medical(src)
+		new /obj/item/clothing/mask/breath/medical(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/medical3
+	name = "Medical Doctor's Locker"
+	req_access = list(access_surgery)
+	icon_state = "securemed1"
+	icon_closed = "securemed"
+	icon_locked = "securemed1"
+	icon_opened = "securemedopen"
+	icon_broken = "securemedbroken"
+	icon_off = "securemedoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/medic(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_med(src)
+		new /obj/item/clothing/under/rank/nursesuit (src)
+		new /obj/item/clothing/head/nursehat (src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/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/head/surgery/purple(src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/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/head/surgery/purple(src)
+		new /obj/item/clothing/under/rank/medical(src)
+		new /obj/item/clothing/under/rank/nurse(src)
+		new /obj/item/clothing/under/rank/orderly(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/suit/storage/fr_jacket(src)
+		new /obj/item/clothing/shoes/white(src)
+//		new /obj/item/weapon/cartridge/medical(src)
+		new /obj/item/device/radio/headset/headset_med(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/CMO
+	name = "Chief Medical Officer's Locker"
+	req_access = list(access_cmo)
+	icon_state = "cmosecure1"
+	icon_closed = "cmosecure"
+	icon_locked = "cmosecure1"
+	icon_opened = "cmosecureopen"
+	icon_broken = "cmosecurebroken"
+	icon_off = "cmosecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/medic(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_med(src)
+		new /obj/item/clothing/suit/bio_suit/cmo(src)
+		new /obj/item/clothing/head/bio_hood/cmo(src)
+		new /obj/item/clothing/shoes/white(src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/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/head/surgery/purple(src)
+		new /obj/item/clothing/under/rank/chief_medical_officer(src)
+		new /obj/item/clothing/suit/storage/labcoat/cmo(src)
+		new /obj/item/weapon/cartridge/cmo(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/shoes/brown	(src)
+		new /obj/item/device/radio/headset/heads/cmo(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/reagent_containers/hypospray(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/animal
+	name = "Animal Control"
+	req_access = list(access_surgery)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/device/assembly/signaler(src)
+		new /obj/item/device/radio/electropack(src)
+		new /obj/item/device/radio/electropack(src)
+		new /obj/item/device/radio/electropack(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/chemical
+	name = "Chemical Closet"
+	desc = "Store dangerous chemicals in here."
+	icon_state = "medical1"
+	icon_closed = "medical"
+	icon_locked = "medical1"
+	icon_opened = "medicalopen"
+	icon_broken = "medicalbroken"
+	icon_off = "medicaloff"
+	req_access = list(access_chemistry)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/storage/box/pillbottles(src)
+		new /obj/item/weapon/storage/box/pillbottles(src)
+		return
+
+/obj/structure/closet/secure_closet/medical_wall
+	name = "First Aid Closet"
+	desc = "It's a secure wall-mounted storage unit for first aid supplies."
+	icon_state = "medical_wall_locked"
+	icon_closed = "medical_wall_unlocked"
+	icon_locked = "medical_wall_locked"
+	icon_opened = "medical_wall_open"
+	icon_broken = "medical_wall_spark"
+	icon_off = "medical_wall_off"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+	req_access = list(access_medical)
+
+/obj/structure/closet/secure_closet/medical_wall/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

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

@@ -0,0 +1,97 @@
+/obj/structure/closet/secure_closet/personal
+	desc = "It's a secure locker for personnel. The first card swiped gains control."
+	name = "personal closet"
+	req_access = list(access_all_personal_lockers)
+	var/registered_name = null
+
+/obj/structure/closet/secure_closet/personal/New()
+	..()
+	spawn(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_norm(src)
+		new /obj/item/device/radio/headset( src )
+	return
+
+
+/obj/structure/closet/secure_closet/personal/patient
+	name = "patient's closet"
+
+/obj/structure/closet/secure_closet/personal/patient/New()
+	..()
+	spawn(4)
+		contents = list()
+		new /obj/item/clothing/under/color/white( src )
+		new /obj/item/clothing/shoes/white( src )
+	return
+
+
+
+/obj/structure/closet/secure_closet/personal/cabinet
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/personal/cabinet/New()
+	..()
+	spawn(4)
+		contents = list()
+		new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
+		new /obj/item/device/radio/headset( src )
+	return
+
+/obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (src.opened)
+		if (istype(W, /obj/item/weapon/grab))
+			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
+		user.drop_item()
+		if (W) W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/card/id))
+		if(src.broken)
+			user << "\red It appears to be broken."
+			return
+		var/obj/item/weapon/card/id/I = W
+		if(!I || !I.registered_name)	return
+		if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
+			//they can open all lockers, or nobody owns this, or they own this locker
+			src.locked = !( src.locked )
+			if(src.locked)	src.icon_state = src.icon_locked
+			else	src.icon_state = src.icon_closed
+
+			if(!src.registered_name)
+				src.registered_name = I.registered_name
+				src.desc = "Owned by [I.registered_name]."
+		else
+			user << "\red Access Denied"
+	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		broken = 1
+		locked = 0
+		desc = "It appears to be broken."
+		icon_state = src.icon_broken
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
+			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+			spark_system.set_up(5, 0, src.loc)
+			spark_system.start()
+			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src.loc, "sparks", 50, 1)
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("\blue The locker has been sliced open by [user] with an energy blade!", 1, "\red You hear metal being sliced and sparks flying.", 2)
+	else
+		user << "\red Access Denied"
+	return

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

@@ -0,0 +1,53 @@
+/obj/structure/closet/secure_closet/scientist
+	name = "Scientist's Locker"
+	req_access = list(access_tox_storage)
+	icon_state = "secureres1"
+	icon_closed = "secureres"
+	icon_locked = "secureres1"
+	icon_opened = "secureresopen"
+	icon_broken = "secureresbroken"
+	icon_off = "secureresoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/scientist(src)
+		//new /obj/item/clothing/suit/labcoat/science(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/clothing/shoes/white(src)
+//		new /obj/item/weapon/cartridge/signal/toxins(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/RD
+	name = "Research Director's Locker"
+	req_access = list(access_rd)
+	icon_state = "rdsecure1"
+	icon_closed = "rdsecure"
+	icon_locked = "rdsecure1"
+	icon_opened = "rdsecureopen"
+	icon_broken = "rdsecurebroken"
+	icon_off = "rdsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/suit/bio_suit/scientist(src)
+		new /obj/item/clothing/head/bio_hood/scientist(src)
+		new /obj/item/clothing/under/rank/research_director(src)
+		new /obj/item/clothing/under/rank/research_director/rdalt(src)
+		new /obj/item/clothing/under/rank/research_director/dress_rd(src)
+		new /obj/item/clothing/suit/storage/labcoat(src)
+		new /obj/item/weapon/cartridge/rd(src)
+		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/shoes/leather(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/device/radio/headset/heads/rd(src)
+		new /obj/item/weapon/tank/air(src)
+		new /obj/item/clothing/mask/gas(src)
+		new /obj/item/device/flash(src)
+		return

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

@@ -0,0 +1,134 @@
+/obj/structure/closet/secure_closet
+	name = "secure locker"
+	desc = "It's an immobile card-locked storage unit."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "secure1"
+	density = 1
+	opened = 0
+	var/locked = 1
+	var/broken = 0
+	var/large = 1
+	icon_closed = "secure"
+	var/icon_locked = "secure1"
+	icon_opened = "secureopen"
+	var/icon_broken = "securebroken"
+	var/icon_off = "secureoff"
+	wall_mounted = 0 //never solid (You can always pass over it)
+	health = 200
+
+/obj/structure/closet/secure_closet/can_open()
+	if(src.locked)
+		return 0
+	return ..()
+
+/obj/structure/closet/secure_closet/close()
+	if(..())
+		if(broken)
+			icon_state = src.icon_off
+		return 1
+	else
+		return 0
+
+/obj/structure/closet/secure_closet/emp_act(severity)
+	for(var/obj/O in src)
+		O.emp_act(severity)
+	if(!broken)
+		if(prob(50/severity))
+			src.locked = !src.locked
+			src.update_icon()
+		if(prob(20/severity) && !opened)
+			if(!locked)
+				open()
+			else
+				src.req_access = list()
+				src.req_access += pick(get_all_accesses())
+	..()
+
+/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
+	if(src.opened)
+		user << "<span class='notice'>Close the locker first.</span>"
+		return
+	if(src.broken)
+		user << "<span class='warning'>The locker appears to be broken.</span>"
+		return
+	if(user.loc == src)
+		user << "<span class='notice'>You can't reach the lock from inside.</span>"
+		return
+	if(src.allowed(user))
+		src.locked = !src.locked
+		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>"
+		update_icon()
+	else
+		user << "<span class='notice'>Access Denied</span>"
+
+/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/grab))
+			if(src.large)
+				src.MouseDrop_T(W:affecting, user)	//act like they were dragged onto the closet
+			else
+				user << "<span class='notice'>The locker is too small to stuff [W:affecting] into!</span>"
+		if(isrobot(user))
+			return
+		user.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		broken = 1
+		locked = 0
+		desc = "It appears to be broken."
+		icon_state = icon_off
+		flick(icon_broken, src)
+		if(istype(W, /obj/item/weapon/melee/energy/blade))
+			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+			spark_system.set_up(5, 0, src.loc)
+			spark_system.start()
+			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src.loc, "sparks", 50, 1)
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("<span class='warning'>The locker has been sliced open by [user] with an energy blade!</span>", 1, "You hear metal being sliced and sparks flying.", 2)
+		else
+			for(var/mob/O in viewers(user, 3))
+				O.show_message("<span class='warning'>The locker has been broken by [user] with an electromagnetic card!</span>", 1, "You hear a faint electrical spark.", 2)
+	else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
+		return ..(W,user)
+	else
+		togglelock(user)
+
+/obj/structure/closet/secure_closet/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	if(src.locked)
+		src.togglelock(user)
+	else
+		src.toggle(user)
+
+/obj/structure/closet/secure_closet/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/closet/secure_closet/verb/verb_togglelock()
+	set src in oview(1) // One square distance
+	set category = "Object"
+	set name = "Toggle Lock"
+
+	if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.togglelock(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+	overlays.Cut()
+	if(!opened)
+		if(locked)
+			icon_state = icon_locked
+		else
+			icon_state = icon_closed
+		if(welded)
+			overlays += "welded"
+	else
+		icon_state = icon_opened

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

@@ -0,0 +1,351 @@
+/obj/structure/closet/secure_closet/captains
+	name = "Captain's Locker"
+	req_access = list(access_captain)
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/captain(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_cap(src)
+		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/suit/captunic/capjacket(src)
+		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/under/rank/captain(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/weapon/cartridge/captain(src)
+		new /obj/item/clothing/head/helmet/swat(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/heads/captain(src)
+		new /obj/item/clothing/gloves/captain(src)
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/clothing/suit/armor/captain(src)
+		new /obj/item/weapon/melee/telebaton(src)
+		new /obj/item/clothing/under/dress/dress_cap(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hop
+	name = "Head of Personnel's Locker"
+	req_access = list(access_hop)
+	icon_state = "hopsecure1"
+	icon_closed = "hopsecure"
+	icon_locked = "hopsecure1"
+	icon_opened = "hopsecureopen"
+	icon_broken = "hopsecurebroken"
+	icon_off = "hopsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/glasses/sunglasses(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/head/helmet(src)
+		new /obj/item/weapon/cartridge/hop(src)
+		new /obj/item/device/radio/headset/heads/hop(src)
+		new /obj/item/weapon/storage/box/ids(src)
+		new /obj/item/weapon/storage/box/ids( src )
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/device/flash(src)
+		return
+
+/obj/structure/closet/secure_closet/hop2
+	name = "Head of Personnel's Attire"
+	req_access = list(access_hop)
+	icon_state = "hopsecure1"
+	icon_closed = "hopsecure"
+	icon_locked = "hopsecure1"
+	icon_opened = "hopsecureopen"
+	icon_broken = "hopsecurebroken"
+	icon_off = "hopsecureoff"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/rank/head_of_personnel(src)
+		new /obj/item/clothing/under/dress/dress_hop(src)
+		new /obj/item/clothing/under/dress/dress_hr(src)
+		new /obj/item/clothing/under/lawyer/female(src)
+		new /obj/item/clothing/under/lawyer/black(src)
+		new /obj/item/clothing/under/lawyer/red(src)
+		new /obj/item/clothing/under/lawyer/oldman(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/clothing/shoes/black(src)
+		new /obj/item/clothing/shoes/leather(src)
+		new /obj/item/clothing/shoes/white(src)
+		new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/hos
+	name = "Head of Security's Locker"
+	req_access = list(access_hos)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/head/helmet/HoS(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
+		new /obj/item/clothing/under/rank/head_of_security/corp(src)
+		new /obj/item/clothing/suit/armor/hos/jensen(src)
+		new /obj/item/clothing/suit/armor/hos(src)
+		new /obj/item/clothing/head/helmet/HoS/dermal(src)
+		new /obj/item/weapon/cartridge/hos(src)
+		new /obj/item/device/radio/headset/heads/hos(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/weapon/shield/riot(src)
+		new /obj/item/weapon/storage/lockbox/loyalty(src)
+		new /obj/item/weapon/storage/box/flashbangs(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/gun(src)
+		new /obj/item/clothing/tie/holster/waist(src)
+		new /obj/item/weapon/melee/telebaton(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/warden
+	name = "Warden's Locker"
+	req_access = list(access_armory)
+	icon_state = "wardensecure1"
+	icon_closed = "wardensecure"
+	icon_locked = "wardensecure1"
+	icon_opened = "wardensecureopen"
+	icon_broken = "wardensecurebroken"
+	icon_off = "wardensecureoff"
+
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/under/rank/warden(src)
+		new /obj/item/clothing/under/rank/warden/corp(src)
+		new /obj/item/clothing/suit/armor/vest/warden(src)
+		new /obj/item/clothing/head/helmet/warden(src)
+//		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/weapon/storage/box/flashbangs(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/storage/box/holobadge(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/security
+	name = "Security Officer's Locker"
+	req_access = list(access_security)
+	icon_state = "sec1"
+	icon_closed = "sec"
+	icon_locked = "sec1"
+	icon_opened = "secopen"
+	icon_broken = "secbroken"
+	icon_off = "secoff"
+
+	New()
+		..()
+		sleep(2)
+		if(prob(50))
+			new /obj/item/weapon/storage/backpack/security(src)
+		else
+			new /obj/item/weapon/storage/backpack/satchel_sec(src)
+		new /obj/item/clothing/suit/armor/vest/security(src)
+		new /obj/item/clothing/head/helmet(src)
+//		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/device/flash(src)
+		new /obj/item/weapon/reagent_containers/spray/pepper(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/device/hailer(src)
+		new /obj/item/clothing/tie/storage/black_vest(src)
+		new /obj/item/clothing/head/soft/sec/corp(src)
+		new /obj/item/clothing/under/rank/security/corp(src)
+		return
+
+
+/obj/structure/closet/secure_closet/security/cargo
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/cargo(src)
+		new /obj/item/device/encryptionkey/headset_cargo(src)
+		return
+
+/obj/structure/closet/secure_closet/security/engine
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/engine(src)
+		new /obj/item/device/encryptionkey/headset_eng(src)
+		return
+
+/obj/structure/closet/secure_closet/security/science
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/science(src)
+		new /obj/item/device/encryptionkey/headset_sci(src)
+		return
+
+/obj/structure/closet/secure_closet/security/med
+
+	New()
+		..()
+		new /obj/item/clothing/tie/armband/medgreen(src)
+		new /obj/item/device/encryptionkey/headset_med(src)
+		return
+
+
+/obj/structure/closet/secure_closet/detective
+	name = "Detective's Cabinet"
+	req_access = list(access_forensics_lockers)
+	icon_state = "cabinetdetective_locked"
+	icon_closed = "cabinetdetective"
+	icon_locked = "cabinetdetective_locked"
+	icon_opened = "cabinetdetective_open"
+	icon_broken = "cabinetdetective_broken"
+	icon_off = "cabinetdetective_broken"
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/under/det(src)
+		new /obj/item/clothing/under/det/black(src)
+		new /obj/item/clothing/under/det/slob(src)
+		new /obj/item/clothing/suit/storage/det_suit(src)
+		new /obj/item/clothing/suit/storage/det_suit/black(src)
+		new /obj/item/clothing/suit/storage/forensics/blue(src)
+		new /obj/item/clothing/suit/storage/forensics/red(src)
+		new /obj/item/clothing/gloves/black(src)
+		new /obj/item/clothing/head/det_hat(src)
+		new /obj/item/clothing/head/det_hat/black(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/storage/box/evidence(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/device/detective_scanner(src)
+		new /obj/item/clothing/suit/armor/det_suit(src)
+		new /obj/item/ammo_magazine/c45r(src)
+		new /obj/item/ammo_magazine/c45r(src)
+		new /obj/item/taperoll/police(src)
+		new /obj/item/weapon/gun/projectile/detective/semiauto(src)
+		new /obj/item/clothing/tie/holster/armpit(src)
+		return
+
+/obj/structure/closet/secure_closet/detective/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/injection
+	name = "Lethal Injections"
+	req_access = list(access_captain)
+
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+		return
+
+
+
+/obj/structure/closet/secure_closet/brig
+	name = "Brig Locker"
+	req_access = list(access_brig)
+	anchored = 1
+	var/id = null
+
+	New()
+		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/shoes/orange( src )
+		return
+
+
+
+/obj/structure/closet/secure_closet/courtroom
+	name = "Courtroom Locker"
+	req_access = list(access_court)
+
+	New()
+		..()
+		sleep(2)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/paper/Court (src)
+		new /obj/item/weapon/pen (src)
+		new /obj/item/clothing/suit/judgerobe (src)
+		new /obj/item/clothing/head/powdered_wig (src)
+		new /obj/item/weapon/storage/briefcase(src)
+		return
+
+/obj/structure/closet/secure_closet/wall
+	name = "wall locker"
+	req_access = list(access_security)
+	icon_state = "wall-locker1"
+	density = 1
+	icon_closed = "wall-locker"
+	icon_locked = "wall-locker1"
+	icon_opened = "wall-lockeropen"
+	icon_broken = "wall-lockerbroken"
+	icon_off = "wall-lockeroff"
+
+	//too small to put a man in
+	large = 0
+
+/obj/structure/closet/secure_closet/wall/update_icon()
+	if(broken)
+		icon_state = icon_broken
+	else
+		if(!opened)
+			if(locked)
+				icon_state = icon_locked
+			else
+				icon_state = icon_closed
+		else
+			icon_state = icon_opened

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

@@ -0,0 +1,139 @@
+/obj/structure/closet/syndicate
+	name = "armoury closet"
+	desc = "Why is this here?"
+	icon_state = "syndicate"
+	icon_closed = "syndicate"
+	icon_opened = "syndicateopen"
+
+
+/obj/structure/closet/syndicate/personal
+	desc = "It's a storage unit for operative gear."
+
+/obj/structure/closet/syndicate/personal/New()
+	..()
+	sleep(2)
+	new /obj/item/weapon/tank/jetpack/oxygen(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/clothing/under/syndicate(src)
+	new /obj/item/clothing/head/helmet/space/rig/syndi(src)
+	new /obj/item/clothing/suit/space/rig/syndi(src)
+	new /obj/item/weapon/crowbar/red(src)
+	new /obj/item/weapon/cell/high(src)
+	new /obj/item/weapon/card/id/syndicate(src)
+	new /obj/item/device/multitool(src)
+	new /obj/item/weapon/shield/energy(src)
+	new /obj/item/clothing/shoes/magboots(src)
+
+
+/obj/structure/closet/syndicate/nuclear
+	desc = "It's a storage unit for nuclear-operative gear."
+
+/obj/structure/closet/syndicate/nuclear/New()
+	..()
+	sleep(2)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/ammo_magazine/a12mm(src)
+	new /obj/item/weapon/storage/box/handcuffs(src)
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/gun/energy/gun(src)
+	new /obj/item/weapon/pinpointer/nukeop(src)
+	new /obj/item/weapon/pinpointer/nukeop(src)
+	new /obj/item/weapon/pinpointer/nukeop(src)
+	new /obj/item/weapon/pinpointer/nukeop(src)
+	new /obj/item/weapon/pinpointer/nukeop(src)
+	new /obj/item/device/pda/syndicate(src)
+	var/obj/item/device/radio/uplink/U = new(src)
+	U.hidden_uplink.uses = 40
+	return
+
+/obj/structure/closet/syndicate/resources/
+	desc = "An old, dusty locker."
+
+	New()
+		..()
+		var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
+		var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
+		var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
+		var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
+
+
+		sleep(2)
+
+		var/pickednum = rand(1, 50)
+
+		//Sad trombone
+		if(pickednum == 1)
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src)
+			P.name = "IOU"
+			P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
+
+		//Metal (common ore)
+		if(pickednum >= 2)
+			new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
+
+		//Glass (common ore)
+		if(pickednum >= 5)
+			new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
+
+		//Plasteel (common ore) Because it has a million more uses then plasma
+		if(pickednum >= 10)
+			new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
+
+		//Plasma (rare ore)
+		if(pickednum >= 15)
+			new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
+
+		//Silver (rare ore)
+		if(pickednum >= 20)
+			new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
+
+		//Gold (rare ore)
+		if(pickednum >= 30)
+			new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
+
+		//Uranium (rare ore)
+		if(pickednum >= 40)
+			new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
+
+		//Diamond (rare HONK)
+		if(pickednum >= 45)
+			new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
+
+		//Jetpack (You hit the jackpot!)
+		if(pickednum == 50)
+			new /obj/item/weapon/tank/jetpack/carbondioxide(src)
+
+		return
+
+/obj/structure/closet/syndicate/resources/everything
+	desc = "It's an emergency storage closet for repairs."
+
+	New()
+		var/list/resources = list(
+		/obj/item/stack/sheet/metal,
+		/obj/item/stack/sheet/glass,
+		/obj/item/stack/sheet/mineral/gold,
+		/obj/item/stack/sheet/mineral/silver,
+		/obj/item/stack/sheet/mineral/plasma,
+		/obj/item/stack/sheet/mineral/uranium,
+		/obj/item/stack/sheet/mineral/diamond,
+		/obj/item/stack/sheet/mineral/clown,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/rods
+		)
+
+		sleep(2)
+
+		for(var/i = 0, i<2, i++)
+			for(var/res in resources)
+				var/obj/item/stack/R = new res(src)
+				R.amount = R.max_amount
+
+		return

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

@@ -0,0 +1,232 @@
+/* Utility Closets
+ * Contains:
+ *		Emergency Closet
+ *		Fire Closet
+ *		Tool Closet
+ *		Radiation Closet
+ *		Bombsuit Closet
+ *		Hydrant
+ *		First Aid
+ */
+
+/*
+ * Emergency Closet
+ */
+/obj/structure/closet/emcloset
+	name = "emergency closet"
+	desc = "It's a storage unit for emergency breathmasks and o2 tanks."
+	icon_state = "emergency"
+	icon_closed = "emergency"
+	icon_opened = "emergencyopen"
+
+/obj/structure/closet/emcloset/New()
+	..()
+
+	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
+		if ("small")
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/clothing/mask/breath(src)
+		if ("aid")
+			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
+		if ("tank")
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+		if ("both")
+			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
+		if ("nothing")
+			// doot
+
+		// teehee - Ah, tg coders...
+		if ("delete")
+			del(src)
+
+		//If you want to re-add fire, just add "fire" = 15 to the pick list.
+		/*if ("fire")
+			new /obj/structure/closet/firecloset(src.loc)
+			del(src)*/
+
+/obj/structure/closet/emcloset/legacy/New()
+	new /obj/item/weapon/tank/oxygen(src)
+	new /obj/item/clothing/mask/gas(src)
+
+/*
+ * Fire Closet
+ */
+/obj/structure/closet/firecloset
+	name = "fire-safety closet"
+	desc = "It's a storage unit for fire-fighting supplies."
+	icon_state = "firecloset"
+	icon_closed = "firecloset"
+	icon_opened = "fireclosetopen"
+
+/obj/structure/closet/firecloset/New()
+	..()
+
+	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/mask/gas(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/full/New()
+	..()
+	sleep(4)
+	contents = list()
+
+	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
+	else
+		icon_state = icon_opened
+
+
+/*
+ * Tool Closet
+ */
+/obj/structure/closet/toolcloset
+	name = "tool closet"
+	desc = "It's a storage unit for tools."
+	icon_state = "toolcloset"
+	icon_closed = "toolcloset"
+	icon_opened = "toolclosetopen"
+
+/obj/structure/closet/toolcloset/New()
+	if(prob(40))
+		new /obj/item/clothing/suit/storage/hazardvest(src)
+	if(prob(70))
+		new /obj/item/device/flashlight(src)
+	if(prob(70))
+		new /obj/item/weapon/screwdriver(src)
+	if(prob(70))
+		new /obj/item/weapon/wrench(src)
+	if(prob(70))
+		new /obj/item/weapon/weldingtool(src)
+	if(prob(70))
+		new /obj/item/weapon/crowbar(src)
+	if(prob(70))
+		new /obj/item/weapon/wirecutters(src)
+	if(prob(70))
+		new /obj/item/device/t_scanner(src)
+	if(prob(20))
+		new /obj/item/weapon/storage/belt/utility(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(30))
+		new /obj/item/weapon/cable_coil/random(src)
+	if(prob(20))
+		new /obj/item/device/multitool(src)
+	if(prob(5))
+		new /obj/item/clothing/gloves/yellow(src)
+	if(prob(40))
+		new /obj/item/clothing/head/hardhat(src)
+
+
+/*
+ * Radiation Closet
+ */
+/obj/structure/closet/radiation
+	name = "radiation suit closet"
+	desc = "It's a storage unit for rad-protective suits."
+	icon_state = "radsuitcloset"
+	icon_opened = "toolclosetopen"
+	icon_closed = "radsuitcloset"
+
+/obj/structure/closet/radiation/New()
+	..()
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+
+/*
+ * Bombsuit closet
+ */
+/obj/structure/closet/bombcloset
+	name = "\improper EOD closet"
+	desc = "It's a storage unit for explosion-protective suits."
+	icon_state = "bombsuit"
+	icon_closed = "bombsuit"
+	icon_opened = "bombsuitopen"
+
+/obj/structure/closet/bombcloset/New()
+	..()
+	sleep(2)
+	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"
+	desc = "It's a storage unit for explosion-protective suits."
+	icon_state = "bombsuitsec"
+	icon_closed = "bombsuitsec"
+	icon_opened = "bombsuitsecopen"
+
+/obj/structure/closet/bombclosetsecurity/New()
+	..()
+	sleep(2)
+	new /obj/item/clothing/suit/bomb_suit/security( src )
+	new /obj/item/clothing/under/rank/security( src )
+	new /obj/item/clothing/shoes/brown( src )
+	new /obj/item/clothing/head/bomb_hood/security( src )
+
+/*
+ * Hydrant
+ */
+/obj/structure/closet/hydrant //wall mounted fire closet
+	name = "fire-safety closet"
+	desc = "It's a storage unit for fire-fighting supplies."
+	icon_state = "hydrant"
+	icon_closed = "hydrant"
+	icon_opened = "hydrant_open"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+/obj/structure/closet/hydrant/New()
+	..()
+	sleep(2)
+	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)
+
+/*
+ * First Aid
+ */
+/obj/structure/closet/medical_wall //wall mounted medical closet
+	name = "first-aid closet"
+	desc = "It's wall-mounted storage unit for first aid supplies."
+	icon_state = "medical_wall"
+	icon_closed = "medical_wall"
+	icon_opened = "medical_wall_open"
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+/obj/structure/closet/medical_wall/update_icon()
+	if(!opened)
+		icon_state = icon_closed
+	else
+		icon_state = icon_opened

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

@@ -0,0 +1,383 @@
+/obj/structure/closet/wardrobe
+	name = "wardrobe"
+	desc = "It's a storage unit for standard-issue Nanotrasen attire."
+	icon_state = "blue"
+	icon_closed = "blue"
+
+/obj/structure/closet/wardrobe/red
+	name = "security wardrobe"
+	icon_state = "red"
+	icon_closed = "red"
+
+/obj/structure/closet/wardrobe/red/New()
+	..()
+	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/under/rank/security(src)
+	new /obj/item/clothing/under/rank/security2(src)
+	new /obj/item/clothing/under/rank/security2(src)
+	new /obj/item/clothing/under/rank/security2(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/head/soft/sec(src)
+	new /obj/item/clothing/head/soft/sec(src)
+	new /obj/item/clothing/head/soft/sec(src)
+	new /obj/item/clothing/head/beret/sec(src)
+	new /obj/item/clothing/head/beret/sec(src)
+	new /obj/item/clothing/head/beret/sec(src)
+	return
+
+
+/obj/structure/closet/wardrobe/pink
+	name = "pink wardrobe"
+	icon_state = "pink"
+	icon_closed = "pink"
+
+/obj/structure/closet/wardrobe/pink/New()
+	..()
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/clothing/shoes/brown(src)
+	return
+
+/obj/structure/closet/wardrobe/black
+	name = "black wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/black/New()
+	..()
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/under/color/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	new /obj/item/clothing/head/that(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chaplain_black
+	name = "chapel wardrobe"
+	desc = "It's a storage unit for Nanotrasen-approved religious attire."
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/chaplain_black/New()
+	..()
+	new /obj/item/clothing/under/rank/chaplain(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/suit/nun(src)
+	new /obj/item/clothing/head/nun_hood(src)
+	new /obj/item/clothing/suit/chaplain_hoodie(src)
+	new /obj/item/clothing/head/chaplain_hood(src)
+	new /obj/item/clothing/suit/holidaypriest(src)
+	new /obj/item/clothing/under/wedding/bride_white(src)
+	new /obj/item/weapon/storage/backpack/cultpack (src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	new /obj/item/weapon/storage/fancy/candle_box(src)
+	return
+
+
+/obj/structure/closet/wardrobe/green
+	name = "green wardrobe"
+	icon_state = "green"
+	icon_closed = "green"
+
+/obj/structure/closet/wardrobe/green/New()
+	..()
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	return
+
+/obj/structure/closet/wardrobe/xenos
+	name = "xenos wardrobe"
+	icon_state = "green"
+	icon_closed = "green"
+
+/obj/structure/closet/wardrobe/xenos/New()
+	..()
+	new /obj/item/clothing/suit/unathi/mantle(src)
+	new /obj/item/clothing/suit/unathi/robe(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	new /obj/item/clothing/shoes/sandal(src)
+	return
+
+
+/obj/structure/closet/wardrobe/orange
+	name = "prison wardrobe"
+	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
+	icon_state = "orange"
+	icon_closed = "orange"
+
+/obj/structure/closet/wardrobe/orange/New()
+	..()
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	return
+
+
+/obj/structure/closet/wardrobe/yellow
+	name = "yellow wardrobe"
+	icon_state = "wardrobe-y"
+	icon_closed = "wardrobe-y"
+
+/obj/structure/closet/wardrobe/yellow/New()
+	..()
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	return
+
+
+/obj/structure/closet/wardrobe/atmospherics_yellow
+	name = "atmospherics wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/New()
+	..()
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/under/rank/atmospheric_technician(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/head/hardhat/red(src)
+	new /obj/item/clothing/head/hardhat/red(src)
+	new /obj/item/clothing/head/hardhat/red(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	return
+
+
+
+/obj/structure/closet/wardrobe/engineering_yellow
+	name = "engineering wardrobe"
+	icon_state = "yellow"
+	icon_closed = "yellow"
+
+/obj/structure/closet/wardrobe/engineering_yellow/New()
+	..()
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/under/rank/engineer(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/head/hardhat(src)
+	new /obj/item/clothing/head/hardhat(src)
+	new /obj/item/clothing/head/hardhat(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	new /obj/item/clothing/head/beret/eng(src)
+	return
+
+
+/obj/structure/closet/wardrobe/white
+	name = "white wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/white/New()
+	..()
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	return
+
+
+/obj/structure/closet/wardrobe/pjs
+	name = "Pajama wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/pjs/New()
+	..()
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/red(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/under/pj/blue(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/slippers(src)
+	new /obj/item/clothing/shoes/slippers(src)
+	return
+
+
+/obj/structure/closet/wardrobe/toxins_white
+	name = "toxins wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/toxins_white/New()
+	..()
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/under/rank/scientist(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/slippers
+	new /obj/item/clothing/shoes/slippers
+	new /obj/item/clothing/shoes/slippers
+	return
+
+
+/obj/structure/closet/wardrobe/robotics_black
+	name = "robotics wardrobe"
+	icon_state = "black"
+	icon_closed = "black"
+
+/obj/structure/closet/wardrobe/robotics_black/New()
+	..()
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/under/rank/roboticist(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/gloves/black(src)
+	return
+
+
+/obj/structure/closet/wardrobe/chemistry_white
+	name = "chemistry wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/chemistry_white/New()
+	..()
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
+	new /obj/item/clothing/suit/storage/labcoat/chemist(src)
+	return
+
+
+/obj/structure/closet/wardrobe/genetics_white
+	name = "genetics wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/genetics_white/New()
+	..()
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/under/rank/geneticist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
+	new /obj/item/clothing/suit/storage/labcoat/genetics(src)
+	return
+
+
+/obj/structure/closet/wardrobe/virology_white
+	name = "virology wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/virology_white/New()
+	..()
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/under/rank/virologist(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
+	new /obj/item/clothing/suit/storage/labcoat/virologist(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
+/obj/structure/closet/wardrobe/medic_white
+	name = "medical wardrobe"
+	icon_state = "white"
+	icon_closed = "white"
+
+/obj/structure/closet/wardrobe/medic_white/New()
+	..()
+	new /obj/item/clothing/under/rank/medical(src)
+	new /obj/item/clothing/under/rank/medical(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/shoes/white(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/mask/surgical(src)
+	new /obj/item/clothing/mask/surgical(src)
+	return
+
+
+/obj/structure/closet/wardrobe/grey
+	name = "grey wardrobe"
+	icon_state = "grey"
+	icon_closed = "grey"
+
+/obj/structure/closet/wardrobe/grey/New()
+	..()
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/under/color/grey(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	new /obj/item/clothing/head/soft/grey(src)
+	return
+
+
+/obj/structure/closet/wardrobe/mixed
+	name = "mixed wardrobe"
+	icon_state = "mixed"
+	icon_closed = "mixed"
+
+/obj/structure/closet/wardrobe/mixed/New()
+	..()
+	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/dress/plaid_blue(src)
+	new /obj/item/clothing/under/dress/plaid_red(src)
+	new /obj/item/clothing/under/dress/plaid_purple(src)
+	new /obj/item/clothing/under/dress/plaid_green(src)
+	new /obj/item/clothing/shoes/blue(src)
+	new /obj/item/clothing/shoes/yellow(src)
+	new /obj/item/clothing/shoes/green(src)
+	new /obj/item/clothing/shoes/orange(src)
+	new /obj/item/clothing/shoes/purple(src)
+	new /obj/item/clothing/shoes/red(src)
+	new /obj/item/clothing/shoes/leather(src)
+	return

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

@@ -0,0 +1,451 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/obj/structure/closet/crate
+	name = "crate"
+	desc = "A rectangular steel crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+//	mouse_drag_pointer = MOUSE_ACTIVE_POINTER	//???
+	var/rigged = 0
+
+/obj/structure/closet/crate/can_open()
+	return 1
+
+/obj/structure/closet/crate/can_close()
+	return 1
+
+/obj/structure/closet/crate/open()
+	if(src.opened)
+		return 0
+	if(!src.can_open())
+		return 0
+
+	if(rigged && locate(/obj/item/device/radio/electropack) in src)
+		if(isliving(usr))
+			var/mob/living/L = usr
+			if(L.electrocute_act(17, src))
+				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+				s.set_up(5, 1, src)
+				s.start()
+				return 2
+
+	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	for(var/obj/O in src)
+		O.loc = get_turf(src)
+	icon_state = icon_opened
+	src.opened = 1
+	return 1
+
+/obj/structure/closet/crate/close()
+	if(!src.opened)
+		return 0
+	if(!src.can_close())
+		return 0
+
+	playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
+	var/itemcount = 0
+	for(var/obj/O in get_turf(src))
+		if(itemcount >= storage_capacity)
+			break
+		if(O.density || O.anchored || istype(O,/obj/structure/closet))
+			continue
+		if(istype(O, /obj/structure/stool/bed)) //This is only necessary because of rollerbeds and swivel chairs.
+			var/obj/structure/stool/bed/B = O
+			if(B.buckled_mob)
+				continue
+		O.loc = src
+		itemcount++
+
+	icon_state = icon_closed
+	src.opened = 0
+	return 1
+
+/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(opened)
+		if(isrobot(user))
+			return
+		user.drop_item()
+		if(W)
+			W.loc = src.loc
+	else if(istype(W, /obj/item/weapon/packageWrap))
+		return
+	else if(istype(W, /obj/item/weapon/cable_coil))
+		if(rigged)
+			user << "<span class='notice'>[src] is already rigged!</span>"
+			return
+		user  << "<span class='notice'>You rig [src].</span>"
+		user.drop_item()
+		del(W)
+		rigged = 1
+		return
+	else if(istype(W, /obj/item/device/radio/electropack))
+		if(rigged)
+			user  << "<span class='notice'>You attach [W] to [src].</span>"
+			user.drop_item()
+			W.loc = src
+			return
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		if(rigged)
+			user  << "<span class='notice'>You cut away the wiring.</span>"
+			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			rigged = 0
+			return
+	else return attack_hand(user)
+
+/obj/structure/closet/crate/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/obj/O in src.contents)
+				del(O)
+			del(src)
+			return
+		if(2.0)
+			for(var/obj/O in src.contents)
+				if(prob(50))
+					del(O)
+			del(src)
+			return
+		if(3.0)
+			if (prob(50))
+				del(src)
+			return
+		else
+	return
+
+/obj/structure/closet/crate/secure
+	desc = "A secure crate."
+	name = "Secure crate"
+	icon_state = "securecrate"
+	icon_opened = "securecrateopen"
+	icon_closed = "securecrate"
+	var/redlight = "securecrater"
+	var/greenlight = "securecrateg"
+	var/sparks = "securecratesparks"
+	var/emag = "securecrateemag"
+	var/broken = 0
+	var/locked = 1
+
+/obj/structure/closet/crate/secure/New()
+	..()
+	if(locked)
+		overlays.Cut()
+		overlays += redlight
+	else
+		overlays.Cut()
+		overlays += greenlight
+
+/obj/structure/closet/crate/secure/can_open()
+	return !locked
+
+/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob)
+	if(src.opened)
+		user << "<span class='notice'>Close the crate first.</span>"
+		return
+	if(src.broken)
+		user << "<span class='warning'>The crate appears to be broken.</span>"
+		return
+	if(src.allowed(user))
+		src.locked = !src.locked
+		for(var/mob/O in viewers(user, 3))
+			if((O.client && !( O.blinded )))
+				O << "<span class='notice'>The crate has been [locked ? null : "un"]locked by [user].</span>"
+		overlays.Cut()
+		overlays += locked ? redlight : greenlight
+	else
+		user << "<span class='notice'>Access Denied</span>"
+
+/obj/structure/closet/crate/secure/verb/verb_togglelock()
+	set src in oview(1) // One square distance
+	set category = "Object"
+	set name = "Toggle Lock"
+
+	if(!usr.canmove || usr.stat || usr.restrained()) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+		return
+
+	if(ishuman(usr))
+		src.add_fingerprint(usr)
+		src.togglelock(usr)
+	else
+		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+
+/obj/structure/closet/crate/secure/attack_hand(mob/user as mob)
+	src.add_fingerprint(user)
+	if(locked)
+		src.togglelock(user)
+	else
+		src.toggle(user)
+
+/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/weapon/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
+		return ..()
+	if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)))
+		overlays.Cut()
+		overlays += emag
+		overlays += sparks
+		spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
+		playsound(src.loc, "sparks", 60, 1)
+		src.locked = 0
+		src.broken = 1
+		user << "<span class='notice'>You unlock \the [src].</span>"
+		return
+	if(!opened)
+		src.togglelock(user)
+		return
+	return ..()
+
+/obj/structure/closet/crate/secure/emp_act(severity)
+	for(var/obj/O in src)
+		O.emp_act(severity)
+	if(!broken && !opened  && prob(50/severity))
+		if(!locked)
+			src.locked = 1
+			overlays.Cut()
+			overlays += redlight
+		else
+			overlays.Cut()
+			overlays += emag
+			overlays += sparks
+			spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
+			playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+			src.locked = 0
+	if(!opened && prob(20/severity))
+		if(!locked)
+			open()
+		else
+			src.req_access = list()
+			src.req_access += pick(get_all_accesses())
+	..()
+
+/obj/structure/closet/crate/plastic
+	name = "plastic crate"
+	desc = "A rectangular plastic crate."
+	icon_state = "plasticcrate"
+	icon_opened = "plasticcrateopen"
+	icon_closed = "plasticcrate"
+
+/obj/structure/closet/crate/internals
+	desc = "A internals crate."
+	name = "Internals crate"
+	icon_state = "o2crate"
+	icon_opened = "o2crateopen"
+	icon_closed = "o2crate"
+
+/obj/structure/closet/crate/trashcart
+	desc = "A heavy, metal trashcart with wheels."
+	name = "Trash Cart"
+	icon_state = "trashcart"
+	icon_opened = "trashcartopen"
+	icon_closed = "trashcart"
+
+/*these aren't needed anymore
+/obj/structure/closet/crate/hat
+	desc = "A crate filled with Valuable Collector's Hats!."
+	name = "Hat Crate"
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+
+/obj/structure/closet/crate/contraband
+	name = "Poster crate"
+	desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+*/
+
+/obj/structure/closet/crate/medical
+	desc = "A medical crate."
+	name = "Medical crate"
+	icon_state = "medicalcrate"
+	icon_opened = "medicalcrateopen"
+	icon_closed = "medicalcrate"
+
+/obj/structure/closet/crate/rcd
+	desc = "A crate for the storage of the RCD."
+	name = "RCD crate"
+	icon_state = "crate"
+	icon_opened = "crateopen"
+	icon_closed = "crate"
+
+/obj/structure/closet/crate/rcd/New()
+	..()
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd_ammo(src)
+	new /obj/item/weapon/rcd(src)
+
+/obj/structure/closet/crate/freezer
+	desc = "A freezer."
+	name = "Freezer"
+	icon_state = "freezer"
+	icon_opened = "freezeropen"
+	icon_closed = "freezer"
+	var/target_temp = T0C - 40
+	var/cooling_power = 40
+
+	return_air()
+		var/datum/gas_mixture/gas = (..())
+		if(!gas)	return null
+		var/datum/gas_mixture/newgas = new/datum/gas_mixture()
+		newgas.oxygen = gas.oxygen
+		newgas.carbon_dioxide = gas.carbon_dioxide
+		newgas.nitrogen = gas.nitrogen
+		newgas.toxins = gas.toxins
+		newgas.volume = gas.volume
+		newgas.temperature = gas.temperature
+		if(newgas.temperature <= target_temp)	return
+
+		if((newgas.temperature - cooling_power) > target_temp)
+			newgas.temperature -= cooling_power
+		else
+			newgas.temperature = target_temp
+		return newgas
+
+
+/obj/structure/closet/crate/bin
+	desc = "A large bin."
+	name = "Large bin"
+	icon_state = "largebin"
+	icon_opened = "largebinopen"
+	icon_closed = "largebin"
+
+/obj/structure/closet/crate/radiation
+	desc = "A crate with a radiation sign on it."
+	name = "Radioactive gear crate"
+	icon_state = "radiation"
+	icon_opened = "radiationopen"
+	icon_closed = "radiation"
+
+/obj/structure/closet/crate/radiation/New()
+	..()
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+	new /obj/item/clothing/suit/radiation(src)
+	new /obj/item/clothing/head/radiation(src)
+
+/obj/structure/closet/crate/secure/weapon
+	desc = "A secure weapons crate."
+	name = "Weapons crate"
+	icon_state = "weaponcrate"
+	icon_opened = "weaponcrateopen"
+	icon_closed = "weaponcrate"
+
+/obj/structure/closet/crate/secure/plasma
+	desc = "A secure plasma crate."
+	name = "Plasma crate"
+	icon_state = "plasmacrate"
+	icon_opened = "plasmacrateopen"
+	icon_closed = "plasmacrate"
+
+/obj/structure/closet/crate/secure/gear
+	desc = "A secure gear crate."
+	name = "Gear crate"
+	icon_state = "secgearcrate"
+	icon_opened = "secgearcrateopen"
+	icon_closed = "secgearcrate"
+
+/obj/structure/closet/crate/secure/hydrosec
+	desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
+	name = "secure hydroponics crate"
+	icon_state = "hydrosecurecrate"
+	icon_opened = "hydrosecurecrateopen"
+	icon_closed = "hydrosecurecrate"
+
+/obj/structure/closet/crate/secure/bin
+	desc = "A secure bin."
+	name = "Secure bin"
+	icon_state = "largebins"
+	icon_opened = "largebinsopen"
+	icon_closed = "largebins"
+	redlight = "largebinr"
+	greenlight = "largebing"
+	sparks = "largebinsparks"
+	emag = "largebinemag"
+
+/obj/structure/closet/crate/large
+	name = "large crate"
+	desc = "A hefty metal crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
+
+/obj/structure/closet/crate/large/close()
+	. = ..()
+	if (.)//we can hold up to one large item
+		var/found = 0
+		for(var/obj/structure/S in src.loc)
+			if(S == src)
+				continue
+			if(!S.anchored)
+				found = 1
+				S.loc = src
+				break
+		if(!found)
+			for(var/obj/machinery/M in src.loc)
+				if(!M.anchored)
+					M.loc = src
+					break
+	return
+
+/obj/structure/closet/crate/secure/large
+	name = "large crate"
+	desc = "A hefty metal crate with an electronic locking system."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
+	redlight = "largemetalr"
+	greenlight = "largemetalg"
+
+/obj/structure/closet/crate/secure/large/close()
+	. = ..()
+	if (.)//we can hold up to one large item
+		var/found = 0
+		for(var/obj/structure/S in src.loc)
+			if(S == src)
+				continue
+			if(!S.anchored)
+				found = 1
+				S.loc = src
+				break
+		if(!found)
+			for(var/obj/machinery/M in src.loc)
+				if(!M.anchored)
+					M.loc = src
+					break
+	return
+
+//fluff variant
+/obj/structure/closet/crate/secure/large/reinforced
+	desc = "A hefty, reinforced metal crate with an electronic locking system."
+	icon_state = "largermetal"
+	icon_opened = "largermetalopen"
+	icon_closed = "largermetal"
+
+/obj/structure/closet/crate/hydroponics
+	name = "Hydroponics crate"
+	desc = "All you need to destroy those pesky weeds and pests."
+	icon_state = "hydrocrate"
+	icon_opened = "hydrocrateopen"
+	icon_closed = "hydrocrate"
+
+/obj/structure/closet/crate/hydroponics/prespawned
+	//This exists so the prespawned hydro crates spawn with their contents.
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
+		new /obj/item/weapon/minihoe(src)
+//		new /obj/item/weapon/weedspray(src)
+//		new /obj/item/weapon/weedspray(src)
+//		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/pestspray(src)

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

@@ -0,0 +1,64 @@
+/obj/structure/largecrate
+	name = "large crate"
+	desc = "A hefty wooden crate."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "densecrate"
+	density = 1
+	flags = FPRINT
+
+/obj/structure/largecrate/attack_hand(mob/user as mob)
+	user << "<span class='notice'>You need a crowbar to pry this open!</span>"
+	return
+
+/obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /obj/item/stack/sheet/wood(src)
+		var/turf/T = get_turf(src)
+		for(var/obj/O in contents)
+			O.loc = T
+		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
+							 "<span class='notice'>You pry open \the [src].</span>", \
+							 "<span class='notice'>You hear splitting wood.</span>")
+		del(src)
+	else
+		return attack_hand(user)
+
+/obj/structure/largecrate/mule
+	icon_state = "mulecrate"
+
+/obj/structure/largecrate/lisa
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/lisa/attackby(obj/item/weapon/W as obj, mob/user as mob)	//ugly but oh well
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/corgi/Lisa(loc)
+	..()
+
+/obj/structure/largecrate/cow
+	name = "cow crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/cow/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/cow(loc)
+	..()
+
+/obj/structure/largecrate/goat
+	name = "goat crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/goat/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		new /mob/living/simple_animal/hostile/retaliate/goat(loc)
+	..()
+
+/obj/structure/largecrate/chick
+	name = "chicken crate"
+	icon_state = "lisacrate"
+
+/obj/structure/largecrate/chick/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/crowbar))
+		var/num = rand(4, 6)
+		for(var/i = 0, i < num, i++)
+			new /mob/living/simple_animal/chick(loc)
+	..()

code/game/objects/structures/displaycase.dm

@@ -0,0 +1,99 @@
+/obj/structure/displaycase
+	name = "display case"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "glassbox1"
+	desc = "A display case for prized possessions. It taunts you to kick it."
+	density = 1
+	anchored = 1
+	unacidable = 1//Dissolving the case would also delete the gun.
+	var/health = 30
+	var/occupied = 1
+	var/destroyed = 0
+
+/obj/structure/displaycase/ex_act(severity)
+	switch(severity)
+		if (1)
+			new /obj/item/weapon/shard( src.loc )
+			if (occupied)
+				new /obj/item/weapon/gun/energy/laser/captain( src.loc )
+				occupied = 0
+			del(src)
+		if (2)
+			if (prob(50))
+				src.health -= 15
+				src.healthcheck()
+		if (3)
+			if (prob(50))
+				src.health -= 5
+				src.healthcheck()
+
+
+/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	src.healthcheck()
+	return
+
+
+/obj/structure/displaycase/blob_act()
+	if (prob(75))
+		new /obj/item/weapon/shard( src.loc )
+		if (occupied)
+			new /obj/item/weapon/gun/energy/laser/captain( src.loc )
+			occupied = 0
+		del(src)
+
+
+/obj/structure/displaycase/meteorhit(obj/O as obj)
+		new /obj/item/weapon/shard( src.loc )
+		new /obj/item/weapon/gun/energy/laser/captain( src.loc )
+		del(src)
+
+
+/obj/structure/displaycase/proc/healthcheck()
+	if (src.health <= 0)
+		if (!( src.destroyed ))
+			src.density = 0
+			src.destroyed = 1
+			new /obj/item/weapon/shard( src.loc )
+			playsound(src, "shatter", 70, 1)
+			update_icon()
+	else
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
+	return
+
+/obj/structure/displaycase/update_icon()
+	if(src.destroyed)
+		src.icon_state = "glassboxb[src.occupied]"
+	else
+		src.icon_state = "glassbox[src.occupied]"
+	return
+
+
+/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	src.health -= W.force
+	src.healthcheck()
+	..()
+	return
+
+/obj/structure/displaycase/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/displaycase/attack_hand(mob/user as mob)
+	if (src.destroyed && src.occupied)
+		new /obj/item/weapon/gun/energy/laser/captain( src.loc )
+		user << "\b You deactivate the hover field built into the case."
+		src.occupied = 0
+		src.add_fingerprint(user)
+		update_icon()
+		return
+	else
+		usr << text("\blue You kick the display case.")
+		for(var/mob/O in oviewers())
+			if ((O.client && !( O.blinded )))
+				O << text("\red [] kicks the display case.", usr)
+		src.health -= 2
+		healthcheck()
+		return
+
+

code/game/objects/structures/door_assembly.dm

@@ -0,0 +1,302 @@
+obj/structure/door_assembly
+	icon = 'icons/obj/doors/door_assembly.dmi'
+
+	name = "airlock assembly"
+	icon_state = "door_as_0"
+	anchored = 0
+	density = 1
+	var/state = 0
+	var/base_icon_state = ""
+	var/base_name = "Airlock"
+	var/obj/item/weapon/airlock_electronics/electronics = null
+	var/airlock_type = "" //the type path of the airlock once completed
+	var/glass_type = "/glass"
+	var/glass = 0 // 0 = glass can be installed. -1 = glass can't be installed. 1 = glass is already installed. Text = mineral plating is installed instead.
+	var/created_name = null
+
+	New()
+		update_state()
+
+	door_assembly_com
+		base_icon_state = "com"
+		base_name = "Command Airlock"
+		glass_type = "/glass_command"
+		airlock_type = "/command"
+
+	door_assembly_sec
+		base_icon_state = "sec"
+		base_name = "Security Airlock"
+		glass_type = "/glass_security"
+		airlock_type = "/security"
+
+	door_assembly_eng
+		base_icon_state = "eng"
+		base_name = "Engineering Airlock"
+		glass_type = "/glass_engineering"
+		airlock_type = "/engineering"
+
+	door_assembly_min
+		base_icon_state = "min"
+		base_name = "Mining Airlock"
+		glass_type = "/glass_mining"
+		airlock_type = "/mining"
+
+	door_assembly_atmo
+		base_icon_state = "atmo"
+		base_name = "Atmospherics Airlock"
+		glass_type = "/glass_atmos"
+		airlock_type = "/atmos"
+
+	door_assembly_research
+		base_icon_state = "res"
+		base_name = "Research Airlock"
+		glass_type = "/glass_research"
+		airlock_type = "/research"
+
+	door_assembly_science
+		base_icon_state = "sci"
+		base_name = "Science Airlock"
+		glass_type = "/glass_science"
+		airlock_type = "/science"
+
+	door_assembly_med
+		base_icon_state = "med"
+		base_name = "Medical Airlock"
+		glass_type = "/glass_medical"
+		airlock_type = "/medical"
+
+	door_assembly_mai
+		base_icon_state = "mai"
+		base_name = "Maintenance Airlock"
+		airlock_type = "/maintenance"
+		glass = -1
+
+	door_assembly_ext
+		base_icon_state = "ext"
+		base_name = "External Airlock"
+		airlock_type = "/external"
+		glass = -1
+
+	door_assembly_fre
+		base_icon_state = "fre"
+		base_name = "Freezer Airlock"
+		airlock_type = "/freezer"
+		glass = -1
+
+	door_assembly_hatch
+		base_icon_state = "hatch"
+		base_name = "Airtight Hatch"
+		airlock_type = "/hatch"
+		glass = -1
+
+	door_assembly_mhatch
+		base_icon_state = "mhatch"
+		base_name = "Maintenance Hatch"
+		airlock_type = "/maintenance_hatch"
+		glass = -1
+
+	door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
+		base_icon_state = "highsec"
+		base_name = "High Security Airlock"
+		airlock_type = "/highsecurity"
+		glass = -1
+
+	multi_tile
+		icon = 'icons/obj/doors/door_assembly2x1.dmi'
+		dir = EAST
+		var/width = 1
+
+/*Temporary until we get sprites.
+		glass_type = "/multi_tile/glass"
+		airlock_type = "/multi_tile/maint"
+		glass = 1*/
+		base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
+		airlock_type = "/multi_tile/glass"
+		glass = -1 //To prevent bugs in deconstruction process.
+
+		New()
+			if(dir in list(EAST, WEST))
+				bound_width = width * world.icon_size
+				bound_height = world.icon_size
+			else
+				bound_width = world.icon_size
+				bound_height = width * world.icon_size
+			update_state()
+
+		Move()
+			. = ..()
+			if(dir in list(EAST, WEST))
+				bound_width = width * world.icon_size
+				bound_height = world.icon_size
+			else
+				bound_width = world.icon_size
+				bound_height = width * world.icon_size
+
+
+
+/obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/pen))
+		var/t = copytext(stripped_input(user, "Enter the name for the door.", src.name, src.created_name),1,MAX_NAME_LEN)
+		if(!t)	return
+		if(!in_range(src, usr) && src.loc != usr)	return
+		created_name = t
+		return
+
+	if(istype(W, /obj/item/weapon/weldingtool) && ( (istext(glass)) || (glass == 1) || (!anchored) ))
+		var/obj/item/weapon/weldingtool/WT = W
+		if (WT.remove_fuel(0, user))
+			playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+			if(istext(glass))
+				user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the [glass] plating off!"
+					var/M = text2path("/obj/item/stack/sheet/mineral/[glass]")
+					new M(src.loc, 2)
+					glass = 0
+			else if(glass == 1)
+				user.visible_message("[user] welds the glass panel out of the airlock assembly.", "You start to weld the glass panel out of the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You welded the glass panel out!"
+					new /obj/item/stack/sheet/rglass(src.loc)
+					glass = 0
+			else if(!anchored)
+				user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.")
+				if(do_after(user, 40))
+					if(!src || !WT.isOn()) return
+					user << "\blue You dissasembled the airlock assembly!"
+					new /obj/item/stack/sheet/metal(src.loc, 4)
+					del (src)
+		else
+			user << "\blue You need more welding fuel."
+			return
+
+	else if(istype(W, /obj/item/weapon/wrench) && state == 0)
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+		if(anchored)
+			user.visible_message("[user] unsecures the airlock assembly from the floor.", "You start to unsecure the airlock assembly from the floor.")
+		else
+			user.visible_message("[user] secures the airlock assembly to the floor.", "You start to secure the airlock assembly to the floor.")
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "\blue You [anchored? "un" : ""]secured the airlock assembly!"
+			anchored = !anchored
+
+	else if(istype(W, /obj/item/weapon/cable_coil) && state == 0 && anchored )
+		var/obj/item/weapon/cable_coil/coil = W
+		user.visible_message("[user] wires the airlock assembly.", "You start to wire the airlock assembly.")
+		if(do_after(user, 40))
+			if(!src) return
+			coil.use(1)
+			src.state = 1
+			user << "\blue You wire the Airlock!"
+
+	else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 )
+		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+		user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "\blue You cut the airlock wires.!"
+			new/obj/item/weapon/cable_coil(src.loc, 1)
+			src.state = 0
+
+	else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W:icon_state != "door_electronics_smoked")
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+		user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
+		user.drop_item()
+		W.loc = src
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "\blue You installed the airlock electronics!"
+			src.state = 2
+			src.name = "Near finished Airlock Assembly"
+			src.electronics = W
+		else
+			W.loc = src.loc
+
+	else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
+		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+		user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to install electronics into the airlock assembly.")
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "\blue You removed the airlock electronics!"
+			src.state = 1
+			src.name = "Wired Airlock Assembly"
+			var/obj/item/weapon/airlock_electronics/ae
+			if (!electronics)
+				ae = new/obj/item/weapon/airlock_electronics( src.loc )
+			else
+				ae = electronics
+				electronics = null
+				ae.loc = src.loc
+
+	else if(istype(W, /obj/item/stack/sheet) && !glass)
+		var/obj/item/stack/sheet/S = W
+		if (S)
+			if (S.amount>=1)
+				if(istype(S, /obj/item/stack/sheet/rglass))
+					playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
+					if(do_after(user, 40))
+						user << "\blue You installed reinforced glass windows into the airlock assembly!"
+						S.use(1)
+						glass = 1
+				else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype)
+					var/M = S.sheettype
+					if(S.amount>=2)
+						playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+						user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
+						if(do_after(user, 40))
+							user << "\blue You installed [M] plating into the airlock assembly!"
+							S.use(2)
+							glass = "[M]"
+
+	else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+		user << "\blue Now finishing the airlock."
+
+		if(do_after(user, 40))
+			if(!src) return
+			user << "\blue You finish the airlock!"
+			var/path
+			if(istext(glass))
+				path = text2path("/obj/machinery/door/airlock/[glass]")
+			else if (glass == 1)
+				path = text2path("/obj/machinery/door/airlock[glass_type]")
+			else
+				path = text2path("/obj/machinery/door/airlock[airlock_type]")
+			var/obj/machinery/door/airlock/door = new path(src.loc)
+			door.assembly_type = type
+			door.electronics = src.electronics
+			if(src.electronics.one_access)
+				door.req_access = null
+				door.req_one_access = src.electronics.conf_access
+			else
+				door.req_access = src.electronics.conf_access
+			if(created_name)
+				door.name = created_name
+			else
+				door.name = "[istext(glass) ? "[glass] airlock" : base_name]"
+			src.electronics.loc = door
+			del(src)
+	else
+		..()
+	update_state()
+
+/obj/structure/door_assembly/proc/update_state()
+	icon_state = "door_as_[glass == 1 ? "g" : ""][istext(glass) ? glass : base_icon_state][state]"
+	name = ""
+	switch (state)
+		if(0)
+			if (anchored)
+				name = "Secured "
+		if(1)
+			name = "Wired "
+		if(2)
+			name = "Near Finished "
+	name += "[glass == 1 ? "Window " : ""][istext(glass) ? "[glass] Airlock" : base_name] Assembly"

code/game/objects/structures/electricchair.dm

@@ -0,0 +1,77 @@
+/obj/structure/stool/bed/chair/e_chair
+	name = "electric chair"
+	desc = "Looks absolutely SHOCKING!"
+	icon_state = "echair0"
+	var/on = 0
+	var/obj/item/assembly/shock_kit/part = null
+	var/last_time = 1.0
+
+/obj/structure/stool/bed/chair/e_chair/New()
+	..()
+	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
+	return
+
+/obj/structure/stool/bed/chair/e_chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/wrench))
+		var/obj/structure/stool/bed/chair/C = new /obj/structure/stool/bed/chair(loc)
+		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+		C.dir = dir
+		part.loc = loc
+		part.master = null
+		part = null
+		del(src)
+		return
+	return
+
+/obj/structure/stool/bed/chair/e_chair/verb/toggle()
+	set name = "Toggle Electric Chair"
+	set category = "Object"
+	set src in oview(1)
+
+	if(on)
+		on = 0
+		icon_state = "echair0"
+	else
+		on = 1
+		icon_state = "echair1"
+	usr << "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>"
+	return
+
+/obj/structure/stool/bed/chair/e_chair/rotate()
+	..()
+	overlays.Cut()
+	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)	//there's probably a better way of handling this, but eh. -Pete
+	return
+
+/obj/structure/stool/bed/chair/e_chair/proc/shock()
+	if(!on)
+		return
+	if(last_time + 50 > world.time)
+		return
+	last_time = world.time
+
+	// special power handling
+	var/area/A = get_area(src)
+	if(!isarea(A))
+		return
+	if(!A.powered(EQUIP))
+		return
+	A.use_power(EQUIP, 5000)
+	var/light = A.power_light
+	A.updateicon()
+
+	flick("echair1", src)
+	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	s.set_up(12, 1, src)
+	s.start()
+	if(buckled_mob)
+		buckled_mob.burn_skin(85)
+		buckled_mob << "<span class='danger'>You feel a deep shock course through your body!</span>"
+		sleep(1)
+		buckled_mob.burn_skin(85)
+		buckled_mob.Stun(600)
+	visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
+
+	A.power_light = light
+	A.updateicon()
+	return

code/game/objects/structures/extinguisher.dm

@@ -0,0 +1,65 @@
+/obj/structure/extinguisher_cabinet
+	name = "extinguisher cabinet"
+	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
+	icon = 'icons/obj/closet.dmi'
+	icon_state = "extinguisher_closed"
+	anchored = 1
+	density = 0
+	var/obj/item/weapon/extinguisher/has_extinguisher = new/obj/item/weapon/extinguisher
+	var/opened = 0
+
+
+/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
+	if(isrobot(user) || isalien(user))
+		return
+	if(istype(O, /obj/item/weapon/extinguisher))
+		if(!has_extinguisher && opened)
+			user.drop_item(O)
+			contents += O
+			has_extinguisher = O
+			user << "<span class='notice'>You place [O] in [src].</span>"
+		else
+			opened = !opened
+	else
+		opened = !opened
+	update_icon()
+
+
+/obj/structure/extinguisher_cabinet/attack_hand(mob/user)
+	if(isrobot(user) || isalien(user))
+		return
+	if(has_extinguisher)
+		user.put_in_hands(has_extinguisher)
+		user << "<span class='notice'>You take [has_extinguisher] from [src].</span>"
+		has_extinguisher = null
+		opened = 1
+	else
+		opened = !opened
+	update_icon()
+
+/obj/structure/extinguisher_cabinet/attack_tk(mob/user)
+	if(has_extinguisher)
+		has_extinguisher.loc = loc
+		user << "<span class='notice'>You telekinetically remove [has_extinguisher] from [src].</span>"
+		has_extinguisher = null
+		opened = 1
+	else
+		opened = !opened
+	update_icon()
+
+/obj/structure/extinguisher_cabinet/attack_paw(mob/user)
+	attack_hand(user)
+	return
+
+
+/obj/structure/extinguisher_cabinet/update_icon()
+	if(!opened)
+		icon_state = "extinguisher_closed"
+		return
+	if(has_extinguisher)
+		if(istype(has_extinguisher, /obj/item/weapon/extinguisher/mini))
+			icon_state = "extinguisher_mini"
+		else
+			icon_state = "extinguisher_full"
+	else
+		icon_state = "extinguisher_empty"

code/game/objects/structures/false_walls.dm

@@ -0,0 +1,341 @@
+/*
+ * False Walls
+ */
+/obj/structure/falsewall
+	name = "wall"
+	desc = "A huge chunk of metal used to seperate rooms."
+	anchored = 1
+	icon = 'icons/turf/walls.dmi'
+	var/mineral = "metal"
+	var/opening = 0
+
+/obj/structure/falsewall/New()
+	relativewall_neighbours()
+	..()
+
+/obj/structure/falsewall/Del()
+
+	var/temploc = src.loc
+
+	spawn(10)
+		for(var/turf/simulated/wall/W in range(temploc,1))
+			W.relativewall()
+
+		for(var/obj/structure/falsewall/W in range(temploc,1))
+			W.relativewall()
+
+		for(var/obj/structure/falserwall/W in range(temploc,1))
+			W.relativewall()
+	..()
+
+
+/obj/structure/falsewall/relativewall()
+
+	if(!density)
+		icon_state = "[mineral]fwall_open"
+		return
+
+	var/junction = 0 //will be used to determine from which side the wall is connected to other walls
+
+	for(var/turf/simulated/wall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve
+				junction |= get_dir(src,W)
+	for(var/obj/structure/falsewall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)
+				junction |= get_dir(src,W)
+	for(var/obj/structure/falserwall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)
+				junction |= get_dir(src,W)
+	icon_state = "[mineral][junction]"
+	return
+
+/obj/structure/falsewall/attack_hand(mob/user as mob)
+	if(opening)
+		return
+
+	if(density)
+		opening = 1
+		icon_state = "[mineral]fwall_open"
+		flick("[mineral]fwall_opening", src)
+		sleep(15)
+		src.density = 0
+		SetOpacity(0)
+		opening = 0
+	else
+		opening = 1
+		flick("[mineral]fwall_closing", src)
+		icon_state = "[mineral]0"
+		density = 1
+		sleep(15)
+		SetOpacity(1)
+		src.relativewall()
+		opening = 0
+
+/obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
+	..()
+	if(density)
+		icon_state = "[mineral]0"
+		src.relativewall()
+	else
+		icon_state = "[mineral]fwall_open"
+
+/obj/structure/falsewall/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(opening)
+		user << "\red You must wait until the door has stopped moving."
+		return
+
+	if(density)
+		var/turf/T = get_turf(src)
+		if(T.density)
+			user << "\red The wall is blocked!"
+			return
+		if(istype(W, /obj/item/weapon/screwdriver))
+			user.visible_message("[user] tightens some bolts on the wall.", "You tighten the bolts on the wall.")
+			if(!mineral || mineral == "metal")
+				T.ChangeTurf(/turf/simulated/wall)
+			else
+				T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+			del(src)
+
+		if( istype(W, /obj/item/weapon/weldingtool) )
+			var/obj/item/weapon/weldingtool/WT = W
+			if( WT:welding )
+				if(!mineral)
+					T.ChangeTurf(/turf/simulated/wall)
+				else
+					T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+				if(mineral != "plasma")//Stupid shit keeps me from pushing the attackby() to plasma walls -Sieve
+					T = get_turf(src)
+					T.attackby(W,user)
+				del(src)
+	else
+		user << "\blue You can't reach, close it first!"
+
+	if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
+		var/turf/T = get_turf(src)
+		if(!mineral)
+			T.ChangeTurf(/turf/simulated/wall)
+		else
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+		if(mineral != "plasma")
+			T = get_turf(src)
+			T.attackby(W,user)
+		del(src)
+
+	//DRILLING
+	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+		var/turf/T = get_turf(src)
+		if(!mineral)
+			T.ChangeTurf(/turf/simulated/wall)
+		else
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+		T = get_turf(src)
+		T.attackby(W,user)
+		del(src)
+
+	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
+		var/turf/T = get_turf(src)
+		if(!mineral)
+			T.ChangeTurf(/turf/simulated/wall)
+		else
+			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
+		if(mineral != "plasma")
+			T = get_turf(src)
+			T.attackby(W,user)
+		del(src)
+
+/obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
+	..()
+	if(density)
+		icon_state = "[mineral]0"
+		src.relativewall()
+	else
+		icon_state = "[mineral]fwall_open"
+
+/*
+ * False R-Walls
+ */
+
+/obj/structure/falserwall
+	name = "reinforced wall"
+	desc = "A huge chunk of reinforced metal used to seperate rooms."
+	icon = 'icons/turf/walls.dmi'
+	icon_state = "r_wall"
+	density = 1
+	opacity = 1
+	anchored = 1
+	var/mineral = "metal"
+	var/opening = 0
+
+/obj/structure/falserwall/New()
+	relativewall_neighbours()
+	..()
+
+
+/obj/structure/falserwall/attack_hand(mob/user as mob)
+	if(opening)
+		return
+
+	if(density)
+		opening = 1
+		// Open wall
+		icon_state = "frwall_open"
+		flick("frwall_opening", src)
+		sleep(15)
+		density = 0
+		SetOpacity(0)
+		opening = 0
+	else
+		opening = 1
+		icon_state = "r_wall"
+		flick("frwall_closing", src)
+		density = 1
+		sleep(15)
+		SetOpacity(1)
+		relativewall()
+		opening = 0
+
+/obj/structure/falserwall/relativewall()
+
+	if(!density)
+		icon_state = "frwall_open"
+		return
+
+	var/junction = 0 //will be used to determine from which side the wall is connected to other walls
+
+	for(var/turf/simulated/wall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)//Only 'like' walls connect -Sieve
+				junction |= get_dir(src,W)
+	for(var/obj/structure/falsewall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)
+				junction |= get_dir(src,W)
+	for(var/obj/structure/falserwall/W in orange(src,1))
+		if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+			if(src.mineral == W.mineral)
+				junction |= get_dir(src,W)
+	icon_state = "rwall[junction]"
+	return
+
+
+
+/obj/structure/falserwall/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(opening)
+		user << "\red You must wait until the door has stopped moving."
+		return
+
+	if(istype(W, /obj/item/weapon/screwdriver))
+		var/turf/T = get_turf(src)
+		user.visible_message("[user] tightens some bolts on the r wall.", "You tighten the bolts on the wall.")
+		T.ChangeTurf(/turf/simulated/wall) //Intentionally makes a regular wall instead of an r-wall (no cheap r-walls for you).
+		del(src)
+
+	if( istype(W, /obj/item/weapon/weldingtool) )
+		var/obj/item/weapon/weldingtool/WT = W
+		if( WT.remove_fuel(0,user) )
+			var/turf/T = get_turf(src)
+			T.ChangeTurf(/turf/simulated/wall)
+			T = get_turf(src)
+			T.attackby(W,user)
+			del(src)
+
+	else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
+		var/turf/T = get_turf(src)
+		T.ChangeTurf(/turf/simulated/wall)
+		T = get_turf(src)
+		T.attackby(W,user)
+		del(src)
+
+	//DRILLING
+	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+		var/turf/T = get_turf(src)
+		T.ChangeTurf(/turf/simulated/wall)
+		T = get_turf(src)
+		T.attackby(W,user)
+		del(src)
+
+	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
+		var/turf/T = get_turf(src)
+		T.ChangeTurf(/turf/simulated/wall)
+		T = get_turf(src)
+		T.attackby(W,user)
+		del(src)
+
+
+/*
+ * Uranium Falsewalls
+ */
+
+/obj/structure/falsewall/uranium
+	name = "uranium wall"
+	desc = "A wall with uranium plating. This is probably a bad idea."
+	icon_state = ""
+	mineral = "uranium"
+	var/active = null
+	var/last_event = 0
+
+/obj/structure/falsewall/uranium/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	radiate()
+	..()
+
+/obj/structure/falsewall/uranium/attack_hand(mob/user as mob)
+	radiate()
+	..()
+
+/obj/structure/falsewall/uranium/proc/radiate()
+	if(!active)
+		if(world.time > last_event+15)
+			active = 1
+			for(var/mob/living/L in range(3,src))
+				L.apply_effect(12,IRRADIATE,0)
+			for(var/turf/simulated/wall/mineral/uranium/T in range(3,src))
+				T.radiate()
+			last_event = world.time
+			active = null
+			return
+	return
+/*
+ * Other misc falsewall types
+ */
+
+/obj/structure/falsewall/gold
+	name = "gold wall"
+	desc = "A wall with gold plating. Swag!"
+	icon_state = ""
+	mineral = "gold"
+
+/obj/structure/falsewall/silver
+	name = "silver wall"
+	desc = "A wall with silver plating. Shiny."
+	icon_state = ""
+	mineral = "silver"
+
+/obj/structure/falsewall/diamond
+	name = "diamond wall"
+	desc = "A wall with diamond plating. You monster."
+	icon_state = ""
+	mineral = "diamond"
+
+/obj/structure/falsewall/plasma
+	name = "plasma wall"
+	desc = "A wall with plasma plating. This is definately a bad idea."
+	icon_state = ""
+	mineral = "plasma"
+
+//-----------wtf?-----------start
+/obj/structure/falsewall/clown
+	name = "bananium wall"
+	desc = "A wall with bananium plating. Honk!"
+	icon_state = ""
+	mineral = "clown"
+
+/obj/structure/falsewall/sandstone
+	name = "sandstone wall"
+	desc = "A wall with sandstone plating."
+	icon_state = ""
+	mineral = "sandstone"
+//------------wtf?------------end

code/game/objects/structures/flora.dm

@@ -0,0 +1,196 @@
+//trees
+/obj/structure/flora/tree
+	name = "tree"
+	anchored = 1
+	density = 1
+	pixel_x = -16
+	layer = 9
+
+/obj/structure/flora/tree/pine
+	name = "pine tree"
+	icon = 'icons/obj/flora/pinetrees.dmi'
+	icon_state = "pine_1"
+
+/obj/structure/flora/tree/pine/New()
+	..()
+	icon_state = "pine_[rand(1, 3)]"
+
+/obj/structure/flora/tree/pine/xmas
+	name = "xmas tree"
+	icon = 'icons/obj/flora/pinetrees.dmi'
+	icon_state = "pine_c"
+
+/obj/structure/flora/tree/pine/xmas/New()
+	..()
+	icon_state = "pine_c"
+
+/obj/structure/flora/tree/dead
+	icon = 'icons/obj/flora/deadtrees.dmi'
+	icon_state = "tree_1"
+
+/obj/structure/flora/tree/dead/New()
+	..()
+	icon_state = "tree_[rand(1, 6)]"
+
+
+//grass
+/obj/structure/flora/grass
+	name = "grass"
+	icon = 'icons/obj/flora/snowflora.dmi'
+	anchored = 1
+
+/obj/structure/flora/grass/brown
+	icon_state = "snowgrass1bb"
+
+/obj/structure/flora/grass/brown/New()
+	..()
+	icon_state = "snowgrass[rand(1, 3)]bb"
+
+
+/obj/structure/flora/grass/green
+	icon_state = "snowgrass1gb"
+
+/obj/structure/flora/grass/green/New()
+	..()
+	icon_state = "snowgrass[rand(1, 3)]gb"
+
+/obj/structure/flora/grass/both
+	icon_state = "snowgrassall1"
+
+/obj/structure/flora/grass/both/New()
+	..()
+	icon_state = "snowgrassall[rand(1, 3)]"
+
+
+//bushes
+/obj/structure/flora/bush
+	name = "bush"
+	icon = 'icons/obj/flora/snowflora.dmi'
+	icon_state = "snowbush1"
+	anchored = 1
+
+/obj/structure/flora/bush/New()
+	..()
+	icon_state = "snowbush[rand(1, 6)]"
+
+/obj/structure/flora/pottedplant
+	name = "potted plant"
+	icon = 'icons/obj/plants.dmi'
+	icon_state = "plant-26"
+
+//newbushes
+
+/obj/structure/flora/ausbushes
+	name = "bush"
+	icon = 'icons/obj/flora/ausflora.dmi'
+	icon_state = "firstbush_1"
+	anchored = 1
+
+/obj/structure/flora/ausbushes/New()
+	..()
+	icon_state = "firstbush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/reedbush
+	icon_state = "reedbush_1"
+
+/obj/structure/flora/ausbushes/reedbush/New()
+	..()
+	icon_state = "reedbush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/leafybush
+	icon_state = "leafybush_1"
+
+/obj/structure/flora/ausbushes/leafybush/New()
+	..()
+	icon_state = "leafybush_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/palebush
+	icon_state = "palebush_1"
+
+/obj/structure/flora/ausbushes/palebush/New()
+	..()
+	icon_state = "palebush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/stalkybush
+	icon_state = "stalkybush_1"
+
+/obj/structure/flora/ausbushes/stalkybush/New()
+	..()
+	icon_state = "stalkybush_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/grassybush
+	icon_state = "grassybush_1"
+
+/obj/structure/flora/ausbushes/grassybush/New()
+	..()
+	icon_state = "grassybush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/fernybush
+	icon_state = "fernybush_1"
+
+/obj/structure/flora/ausbushes/fernybush/New()
+	..()
+	icon_state = "fernybush_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/sunnybush
+	icon_state = "sunnybush_1"
+
+/obj/structure/flora/ausbushes/sunnybush/New()
+	..()
+	icon_state = "sunnybush_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/genericbush
+	icon_state = "genericbush_1"
+
+/obj/structure/flora/ausbushes/genericbush/New()
+	..()
+	icon_state = "genericbush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/pointybush
+	icon_state = "pointybush_1"
+
+/obj/structure/flora/ausbushes/pointybush/New()
+	..()
+	icon_state = "pointybush_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/lavendergrass
+	icon_state = "lavendergrass_1"
+
+/obj/structure/flora/ausbushes/lavendergrass/New()
+	..()
+	icon_state = "lavendergrass_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/ywflowers
+	icon_state = "ywflowers_1"
+
+/obj/structure/flora/ausbushes/ywflowers/New()
+	..()
+	icon_state = "ywflowers_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/brflowers
+	icon_state = "brflowers_1"
+
+/obj/structure/flora/ausbushes/brflowers/New()
+	..()
+	icon_state = "brflowers_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/ppflowers
+	icon_state = "ppflowers_1"
+
+/obj/structure/flora/ausbushes/ppflowers/New()
+	..()
+	icon_state = "ppflowers_[rand(1, 4)]"
+
+/obj/structure/flora/ausbushes/sparsegrass
+	icon_state = "sparsegrass_1"
+
+/obj/structure/flora/ausbushes/sparsegrass/New()
+	..()
+	icon_state = "sparsegrass_[rand(1, 3)]"
+
+/obj/structure/flora/ausbushes/fullgrass
+	icon_state = "fullgrass_1"
+
+/obj/structure/flora/ausbushes/fullgrass/New()
+	..()
+	icon_state = "fullgrass_[rand(1, 3)]"

code/game/objects/structures/girders.dm

@@ -0,0 +1,263 @@
+/obj/structure/girder
+	icon_state = "girder"
+	anchored = 1
+	density = 1
+	layer = 2
+	var/state = 0
+	var/health = 200
+
+
+	bullet_act(var/obj/item/projectile/Proj)
+		if(istype(Proj, /obj/item/projectile/beam))
+			health -= Proj.damage
+			..()
+			if(health <= 0)
+				new /obj/item/stack/sheet/metal(get_turf(src))
+				del(src)
+
+			return
+
+	attackby(obj/item/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/wrench) && state == 0)
+			if(anchored && !istype(src,/obj/structure/girder/displaced))
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+				user << "\blue Now disassembling the girder"
+				if(do_after(user,40))
+					if(!src) return
+					user << "\blue You dissasembled the girder!"
+					new /obj/item/stack/sheet/metal(get_turf(src))
+					del(src)
+			else if(!anchored)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+				user << "\blue Now securing the girder"
+				if(get_turf(user, 40))
+					user << "\blue You secured the girder!"
+					new/obj/structure/girder( src.loc )
+					del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
+			user << "\blue Now slicing apart the girder"
+			if(do_after(user,30))
+				if(!src) return
+				user << "\blue You slice apart the girder!"
+				new /obj/item/stack/sheet/metal(get_turf(src))
+				del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+			user << "\blue You drill through the girder!"
+			new /obj/item/stack/sheet/metal(get_turf(src))
+			del(src)
+
+		else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			user << "\blue Now unsecuring support struts"
+			if(do_after(user,40))
+				if(!src) return
+				user << "\blue You unsecured the support struts!"
+				state = 1
+
+		else if(istype(W, /obj/item/weapon/wirecutters) && istype(src,/obj/structure/girder/reinforced) && state == 1)
+			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			user << "\blue Now removing support struts"
+			if(do_after(user,40))
+				if(!src) return
+				user << "\blue You removed the support struts!"
+				new/obj/structure/girder( src.loc )
+				del(src)
+
+		else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored )
+			playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+			user << "\blue Now dislodging the girder"
+			if(do_after(user, 40))
+				if(!src) return
+				user << "\blue You dislodged the girder!"
+				new/obj/structure/girder/displaced( src.loc )
+				del(src)
+
+		else if(istype(W, /obj/item/stack/sheet))
+
+			var/obj/item/stack/sheet/S = W
+			switch(S.type)
+
+				if(/obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal/cyborg)
+					if(!anchored)
+						if(S.amount < 2) return
+						S.use(2)
+						user << "\blue You create a false wall! Push on it to open or close the passage."
+						new /obj/structure/falsewall (src.loc)
+						del(src)
+					else
+						if(S.amount < 2) return ..()
+						user << "\blue Now adding plating..."
+						if (do_after(user,40))
+							if(!src || !S || S.amount < 2) return
+							S.use(2)
+							user << "\blue You added the plating!"
+							var/turf/Tsrc = get_turf(src)
+							Tsrc.ChangeTurf(/turf/simulated/wall)
+							for(var/turf/simulated/wall/X in Tsrc.loc)
+								if(X)	X.add_hiddenprint(usr)
+							del(src)
+						return
+
+				if(/obj/item/stack/sheet/plasteel)
+					if(!anchored)
+						if(S.amount < 2) return
+						S.use(2)
+						user << "\blue You create a false wall! Push on it to open or close the passage."
+						new /obj/structure/falserwall (src.loc)
+						del(src)
+					else
+						if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
+							if(S.amount < 1) return ..()
+							user << "\blue Now finalising reinforced wall."
+							if(do_after(user, 50))
+								if(!src || !S || S.amount < 1) return
+								S.use(1)
+								user << "\blue Wall fully reinforced!"
+								var/turf/Tsrc = get_turf(src)
+								Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
+								for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
+									if(X)	X.add_hiddenprint(usr)
+								del(src)
+							return
+						else
+							if(S.amount < 1) return ..()
+							user << "\blue Now reinforcing girders"
+							if (do_after(user,60))
+								if(!src || !S || S.amount < 1) return
+								S.use(1)
+								user << "\blue Girders reinforced!"
+								new/obj/structure/girder/reinforced( src.loc )
+								del(src)
+							return
+
+			if(S.sheettype)
+				var/M = S.sheettype
+				if(!anchored)
+					if(S.amount < 2) return
+					S.use(2)
+					user << "\blue You create a false wall! Push on it to open or close the passage."
+					var/F = text2path("/obj/structure/falsewall/[M]")
+					new F (src.loc)
+					del(src)
+				else
+					if(S.amount < 2) return ..()
+					user << "\blue Now adding plating..."
+					if (do_after(user,40))
+						if(!src || !S || S.amount < 2) return
+						S.use(2)
+						user << "\blue You added the plating!"
+						var/turf/Tsrc = get_turf(src)
+						Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
+						for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
+							if(X)	X.add_hiddenprint(usr)
+						del(src)
+					return
+
+			add_hiddenprint(usr)
+
+		else if(istype(W, /obj/item/pipe))
+			var/obj/item/pipe/P = W
+			if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
+				user.drop_item()
+				P.loc = src.loc
+				user << "\blue You fit the pipe into the [src]!"
+		else
+			..()
+
+
+	blob_act()
+		if(prob(40))
+			del(src)
+
+
+	ex_act(severity)
+		switch(severity)
+			if(1.0)
+				del(src)
+				return
+			if(2.0)
+				if (prob(30))
+					var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
+					new remains(loc)
+					del(src)
+				return
+			if(3.0)
+				if (prob(5))
+					var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
+					new remains(loc)
+					del(src)
+				return
+			else
+		return
+
+/obj/structure/girder/displaced
+	icon_state = "displaced"
+	anchored = 0
+	health = 50
+
+/obj/structure/girder/reinforced
+	icon_state = "reinforced"
+	state = 2
+	health = 500
+
+/obj/structure/cultgirder
+	icon= 'icons/obj/cult.dmi'
+	icon_state= "cultgirder"
+	anchored = 1
+	density = 1
+	layer = 2
+	var/health = 250
+
+	attackby(obj/item/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/wrench))
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+			user << "\blue Now disassembling the girder"
+			if(do_after(user,40))
+				user << "\blue You dissasembled the girder!"
+				new /obj/effect/decal/remains/human(get_turf(src))
+				del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
+			user << "\blue Now slicing apart the girder"
+			if(do_after(user,30))
+				user << "\blue You slice apart the girder!"
+			new /obj/effect/decal/remains/human(get_turf(src))
+			del(src)
+
+		else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+			user << "\blue You drill through the girder!"
+			new /obj/effect/decal/remains/human(get_turf(src))
+			del(src)
+
+	blob_act()
+		if(prob(40))
+			del(src)
+
+	bullet_act(var/obj/item/projectile/Proj) //No beam check- How else will you destroy the cult girder with silver bullets?????
+		health -= Proj.damage
+		..()
+		if(health <= 0)
+			new /obj/item/stack/sheet/metal(get_turf(src))
+			del(src)
+
+		return
+
+	ex_act(severity)
+		switch(severity)
+			if(1.0)
+				del(src)
+				return
+			if(2.0)
+				if (prob(30))
+					new /obj/effect/decal/remains/human(loc)
+					del(src)
+				return
+			if(3.0)
+				if (prob(5))
+					new /obj/effect/decal/remains/human(loc)
+					del(src)
+				return
+			else
+		return

code/game/objects/structures/grille.dm

@@ -0,0 +1,218 @@
+/obj/structure/grille
+	desc = "A flimsy lattice of metal rods, with screws to secure it to the floor."
+	name = "grille"
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "grille"
+	density = 1
+	anchored = 1
+	flags = FPRINT | CONDUCT
+	pressure_resistance = 5*ONE_ATMOSPHERE
+	layer = 2.9
+	explosion_resistance = 5
+	var/health = 10
+	var/destroyed = 0
+
+
+/obj/structure/grille/ex_act(severity)
+	del(src)
+
+/obj/structure/grille/blob_act()
+	del(src)
+
+/obj/structure/grille/meteorhit(var/obj/M)
+	del(src)
+
+
+/obj/structure/grille/Bumped(atom/user)
+	if(ismob(user)) shock(user, 70)
+
+
+/obj/structure/grille/attack_paw(mob/user as mob)
+	attack_hand(user)
+
+/obj/structure/grille/attack_hand(mob/user as mob)
+	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+	user.visible_message("<span class='warning'>[user] kicks [src].</span>", \
+						 "<span class='warning'>You kick [src].</span>", \
+						 "You hear twisting metal.")
+
+	if(shock(user, 70))
+		return
+	if(HULK in user.mutations)
+		health -= 5
+	else
+		health -= 3
+	healthcheck()
+
+/obj/structure/grille/attack_alien(mob/user as mob)
+	if(istype(user, /mob/living/carbon/alien/larva))	return
+
+	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+	user.visible_message("<span class='warning'>[user] mangles [src].</span>", \
+						 "<span class='warning'>You mangle [src].</span>", \
+						 "You hear twisting metal.")
+
+	if(!shock(user, 70))
+		health -= 5
+		healthcheck()
+		return
+
+/obj/structure/grille/attack_slime(mob/user as mob)
+	if(!istype(user, /mob/living/carbon/slime/adult))	return
+
+	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+	user.visible_message("<span class='warning'>[user] smashes against [src].</span>", \
+						 "<span class='warning'>You smash against [src].</span>", \
+						 "You hear twisting metal.")
+
+	health -= rand(2,3)
+	healthcheck()
+	return
+
+/obj/structure/grille/attack_animal(var/mob/living/simple_animal/M as mob)
+	if(M.melee_damage_upper == 0)	return
+
+	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+	M.visible_message("<span class='warning'>[M] smashes against [src].</span>", \
+					  "<span class='warning'>You smash against [src].</span>", \
+					  "You hear twisting metal.")
+
+	health -= M.melee_damage_upper
+	healthcheck()
+	return
+
+
+/obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0)) return 1
+	if(istype(mover) && mover.checkpass(PASSGRILLE))
+		return 1
+	else
+		if(istype(mover, /obj/item/projectile))
+			return prob(30)
+		else
+			return !density
+
+/obj/structure/grille/bullet_act(var/obj/item/projectile/Proj)
+	if(!Proj)	return
+	src.health -= Proj.damage*0.2
+	healthcheck()
+	return 0
+
+/obj/structure/grille/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(iswirecutter(W))
+		if(!shock(user, 100))
+			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			new /obj/item/stack/rods(loc, 2)
+			del(src)
+	else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
+		if(!shock(user, 90))
+			playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
+			anchored = !anchored
+			user.visible_message("<span class='notice'>[user] [anchored ? "fastens" : "unfastens"] the grille.</span>", \
+								 "<span class='notice'>You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.</span>")
+			return
+
+//window placing begin
+	else if( istype(W,/obj/item/stack/sheet/rglass) || istype(W,/obj/item/stack/sheet/glass) )
+		var/dir_to_set = 1
+		if(loc == user.loc)
+			dir_to_set = user.dir
+		else
+			if( ( x == user.x ) || (y == user.y) ) //Only supposed to work for cardinal directions.
+				if( x == user.x )
+					if( y > user.y )
+						dir_to_set = 2
+					else
+						dir_to_set = 1
+				else if( y == user.y )
+					if( x > user.x )
+						dir_to_set = 8
+					else
+						dir_to_set = 4
+			else
+				user << "<span class='notice'>You can't reach.</span>"
+				return //Only works for cardinal direcitons, diagonals aren't supposed to work like this.
+		for(var/obj/structure/window/WINDOW in loc)
+			if(WINDOW.dir == dir_to_set)
+				user << "<span class='notice'>There is already a window facing this way there.</span>"
+				return
+		user << "<span class='notice'>You start placing the window.</span>"
+		if(do_after(user,20))
+			if(!src) return //Grille destroyed while waiting
+			for(var/obj/structure/window/WINDOW in loc)
+				if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting.
+					user << "<span class='notice'>There is already a window facing this way there.</span>"
+					return
+			var/obj/structure/window/WD
+			if(istype(W,/obj/item/stack/sheet/rglass))
+				WD = new/obj/structure/window/reinforced(loc) //reinforced window
+			else
+				WD = new/obj/structure/window/basic(loc) //normal window
+			WD.dir = dir_to_set
+			WD.ini_dir = dir_to_set
+			WD.anchored = 0
+			WD.state = 0
+			var/obj/item/stack/ST = W
+			ST.use(1)
+			user << "<span class='notice'>You place the [WD] on [src].</span>"
+			WD.update_icon()
+		return
+//window placing end
+
+	else if(istype(W, /obj/item/weapon/shard))
+		health -= W.force * 0.1
+	else if(!shock(user, 70))
+		playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
+		switch(W.damtype)
+			if("fire")
+				health -= W.force
+			if("brute")
+				health -= W.force * 0.1
+	healthcheck()
+	..()
+	return
+
+
+/obj/structure/grille/proc/healthcheck()
+	if(health <= 0)
+		if(!destroyed)
+			icon_state = "brokengrille"
+			density = 0
+			destroyed = 1
+			new /obj/item/stack/rods(loc)
+
+		else
+			if(health <= -6)
+				new /obj/item/stack/rods(loc)
+				del(src)
+				return
+	return
+
+// shock user with probability prb (if all connections & power are working)
+// returns 1 if shocked, 0 otherwise
+
+/obj/structure/grille/proc/shock(mob/user as mob, prb)
+	if(!anchored || destroyed)		// anchored/destroyed grilles are never connected
+		return 0
+	if(!prob(prb))
+		return 0
+	if(!in_range(src, user))//To prevent TK and mech users from getting shocked
+		return 0
+	var/turf/T = get_turf(src)
+	var/obj/structure/cable/C = T.get_cable_node()
+	if(C)
+		if(electrocute_mob(user, C, src))
+			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+			s.set_up(3, 1, src)
+			s.start()
+			return 1
+		else
+			return 0
+	return 0
+
+/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(!destroyed)
+		if(exposed_temperature > T0C + 1500)
+			health -= 1
+			healthcheck()
+	..()

code/game/objects/structures/janicart.dm

@@ -0,0 +1,298 @@
+/obj/structure/janitorialcart
+	name = "janitorial cart"
+	desc = "The ultimate in janitorial carts! Has space for water, mops, signs, trash bags, and more!"
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "cart"
+	anchored = 0
+	density = 1
+	flags = OPENCONTAINER
+	//copypaste sorry
+	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+	var/obj/item/weapon/storage/bag/trash/mybag	= null
+	var/obj/item/weapon/mop/mymop = null
+	var/obj/item/weapon/reagent_containers/spray/myspray = null
+	var/obj/item/device/lightreplacer/myreplacer = null
+	var/signs = 0	//maximum capacity hardcoded below
+
+
+/obj/structure/janitorialcart/New()
+	create_reagents(100)
+
+
+/obj/structure/janitorialcart/examine()
+	set src in usr
+	usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of liquid!"
+	..()
+	//everything else is visible, so doesn't need to be mentioned
+
+
+/obj/structure/janitorialcart/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/storage/bag/trash) && !mybag)
+		user.drop_item()
+		mybag = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/mop))
+		if(I.reagents.total_volume < I.reagents.maximum_volume)	//if it's not completely soaked we assume they want to wet it, otherwise store it
+			if(reagents.total_volume < 1)
+				user << "[src] is out of water!</span>"
+			else
+				reagents.trans_to(I, 5)	//
+				user << "<span class='notice'>You wet [I] in [src].</span>"
+				playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+				return
+		if(!mymop)
+			user.drop_item()
+			mymop = I
+			I.loc = src
+			update_icon()
+			updateUsrDialog()
+			user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/reagent_containers/spray) && !myspray)
+		user.drop_item()
+		myspray = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/device/lightreplacer) && !myreplacer)
+		user.drop_item()
+		myreplacer = I
+		I.loc = src
+		update_icon()
+		updateUsrDialog()
+		user << "<span class='notice'>You put [I] into [src].</span>"
+
+	else if(istype(I, /obj/item/weapon/caution))
+		if(signs < 4)
+			user.drop_item()
+			I.loc = src
+			signs++
+			update_icon()
+			updateUsrDialog()
+			user << "<span class='notice'>You put [I] into [src].</span>"
+		else
+			user << "<span class='notice'>[src] can't hold any more signs.</span>"
+
+	else if(mybag)
+		mybag.attackby(I, user)
+
+
+/obj/structure/janitorialcart/attack_hand(mob/user)
+	user.set_machine(src)
+	var/dat
+	if(mybag)
+		dat += "<a href='?src=\ref[src];garbage=1'>[mybag.name]</a><br>"
+	if(mymop)
+		dat += "<a href='?src=\ref[src];mop=1'>[mymop.name]</a><br>"
+	if(myspray)
+		dat += "<a href='?src=\ref[src];spray=1'>[myspray.name]</a><br>"
+	if(myreplacer)
+		dat += "<a href='?src=\ref[src];replacer=1'>[myreplacer.name]</a><br>"
+	if(signs)
+		dat += "<a href='?src=\ref[src];sign=1'>[signs] sign\s</a><br>"
+	var/datum/browser/popup = new(user, "janicart", name, 240, 160)
+	popup.set_content(dat)
+	popup.open()
+
+
+/obj/structure/janitorialcart/Topic(href, href_list)
+	if(!in_range(src, usr))
+		return
+	if(!isliving(usr))
+		return
+	var/mob/living/user = usr
+	if(href_list["garbage"])
+		if(mybag)
+			user.put_in_hands(mybag)
+			user << "<span class='notice'>You take [mybag] from [src].</span>"
+			mybag = null
+	if(href_list["mop"])
+		if(mymop)
+			user.put_in_hands(mymop)
+			user << "<span class='notice'>You take [mymop] from [src].</span>"
+			mymop = null
+	if(href_list["spray"])
+		if(myspray)
+			user.put_in_hands(myspray)
+			user << "<span class='notice'>You take [myspray] from [src].</span>"
+			myspray = null
+	if(href_list["replacer"])
+		if(myreplacer)
+			user.put_in_hands(myreplacer)
+			user << "<span class='notice'>You take [myreplacer] from [src].</span>"
+			myreplacer = null
+	if(href_list["sign"])
+		if(signs)
+			var/obj/item/weapon/caution/Sign = locate() in src
+			if(Sign)
+				user.put_in_hands(Sign)
+				user << "<span class='notice'>You take \a [Sign] from [src].</span>"
+				signs--
+			else
+				warning("[src] signs ([signs]) didn't match contents")
+				signs = 0
+
+	update_icon()
+	updateUsrDialog()
+
+
+/obj/structure/janitorialcart/update_icon()
+	overlays = null
+	if(mybag)
+		overlays += "cart_garbage"
+	if(mymop)
+		overlays += "cart_mop"
+	if(myspray)
+		overlays += "cart_spray"
+	if(myreplacer)
+		overlays += "cart_replacer"
+	if(signs)
+		overlays += "cart_sign[signs]"
+
+
+//old style retardo-cart
+/obj/structure/stool/bed/chair/janicart
+	name = "janicart"
+	icon = 'icons/obj/vehicles.dmi'
+	icon_state = "pussywagon"
+	anchored = 1
+	density = 1
+	flags = OPENCONTAINER
+	//copypaste sorry
+	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+	var/obj/item/weapon/storage/bag/trash/mybag	= null
+	var/callme = "pimpin' ride"	//how do people refer to it?
+
+
+/obj/structure/stool/bed/chair/janicart/New()
+	handle_rotation()
+	create_reagents(100)
+
+
+/obj/structure/stool/bed/chair/janicart/examine()
+	set src in usr
+	usr << "\icon[src] This [callme] contains [reagents.total_volume] unit\s of water!"
+	if(mybag)
+		usr << "\A [mybag] is hanging on the [callme]."
+
+
+/obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/mop))
+		if(reagents.total_volume > 1)
+			reagents.trans_to(I, 2)
+			user << "<span class='notice'>You wet [I] in the [callme].</span>"
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+		else
+			user << "<span class='notice'>This [callme] is out of water!</span>"
+	else if(istype(I, /obj/item/key))
+		user << "Hold [I] in one of your hands while you drive this [callme]."
+	else if(istype(I, /obj/item/weapon/storage/bag/trash))
+		user << "<span class='notice'>You hook the trashbag onto the [callme].</span>"
+		user.drop_item()
+		I.loc = src
+		mybag = I
+
+
+/obj/structure/stool/bed/chair/janicart/attack_hand(mob/user)
+	if(mybag)
+		mybag.loc = get_turf(user)
+		user.put_in_hands(mybag)
+		mybag = null
+	else
+		..()
+
+
+/obj/structure/stool/bed/chair/janicart/relaymove(mob/user, direction)
+	if(user.stat || user.stunned || user.weakened || user.paralysis)
+		unbuckle()
+	if(istype(user.l_hand, /obj/item/key) || istype(user.r_hand, /obj/item/key))
+		step(src, direction)
+		update_mob()
+		handle_rotation()
+	else
+		user << "<span class='notice'>You'll need the keys in one of your hands to drive this [callme].</span>"
+
+
+/obj/structure/stool/bed/chair/janicart/Move()
+	..()
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)
+			buckled_mob.loc = loc
+
+
+/obj/structure/stool/bed/chair/janicart/buckle_mob(mob/M, mob/user)
+	if(M != user || !ismob(M) || get_dist(src, user) > 1 || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon))
+		return
+
+	unbuckle()
+
+	M.visible_message(\
+		"<span class='notice'>[M] climbs onto the [callme]!</span>",\
+		"<span class='notice'>You climb onto the [callme]!</span>")
+	M.buckled = src
+	M.loc = loc
+	M.dir = dir
+	M.update_canmove()
+	buckled_mob = M
+	update_mob()
+	add_fingerprint(user)
+
+
+/obj/structure/stool/bed/chair/janicart/unbuckle()
+	if(buckled_mob)
+		buckled_mob.pixel_x = 0
+		buckled_mob.pixel_y = 0
+	..()
+
+
+/obj/structure/stool/bed/chair/janicart/handle_rotation()
+	if(dir == SOUTH)
+		layer = FLY_LAYER
+	else
+		layer = OBJ_LAYER
+
+	if(buckled_mob)
+		if(buckled_mob.loc != loc)
+			buckled_mob.buckled = null //Temporary, so Move() succeeds.
+			buckled_mob.buckled = src //Restoring
+
+	update_mob()
+
+
+/obj/structure/stool/bed/chair/janicart/proc/update_mob()
+	if(buckled_mob)
+		buckled_mob.dir = dir
+		switch(dir)
+			if(SOUTH)
+				buckled_mob.pixel_x = 0
+				buckled_mob.pixel_y = 7
+			if(WEST)
+				buckled_mob.pixel_x = 13
+				buckled_mob.pixel_y = 7
+			if(NORTH)
+				buckled_mob.pixel_x = 0
+				buckled_mob.pixel_y = 4
+			if(EAST)
+				buckled_mob.pixel_x = -13
+				buckled_mob.pixel_y = 7
+
+
+/obj/structure/stool/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
+	if(buckled_mob)
+		if(prob(85))
+			return buckled_mob.bullet_act(Proj)
+	visible_message("<span class='warning'>[Proj] ricochets off the [callme]!</span>")
+
+
+/obj/item/key
+	name = "key"
+	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
+	icon = 'icons/obj/vehicles.dmi'
+	icon_state = "keys"
+	w_class = 1

code/game/objects/structures/kitchen_spike.dm

@@ -0,0 +1,80 @@
+//////Kitchen Spike
+
+/obj/structure/kitchenspike
+	name = "a meat spike"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "spike"
+	desc = "A spike for collecting meat from animals"
+	density = 1
+	anchored = 1
+	var/meat = 0
+	var/occupied = 0
+	var/meattype = 0 // 0 - Nothing, 1 - Monkey, 2 - Xeno
+
+/obj/structure/kitchenspike
+	attack_paw(mob/user as mob)
+		return src.attack_hand(usr)
+
+	attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
+		if(!istype(G, /obj/item/weapon/grab))
+			return
+		if(istype(G.affecting, /mob/living/carbon/monkey))
+			if(src.occupied == 0)
+				src.icon_state = "spikebloody"
+				src.occupied = 1
+				src.meat = 5
+				src.meattype = 1
+				for(var/mob/O in viewers(src, null))
+					O.show_message(text("\red [user] has forced [G.affecting] onto the spike, killing them instantly!"))
+				del(G.affecting)
+				del(G)
+
+			else
+				user << "\red The spike already has something on it, finish collecting its meat first!"
+		else if(istype(G.affecting, /mob/living/carbon/alien))
+			if(src.occupied == 0)
+				src.icon_state = "spikebloodygreen"
+				src.occupied = 1
+				src.meat = 5
+				src.meattype = 2
+				for(var/mob/O in viewers(src, null))
+					O.show_message(text("\red [user] has forced [G.affecting] onto the spike, killing them instantly!"))
+				del(G.affecting)
+				del(G)
+			else
+				user << "\red The spike already has something on it, finish collecting its meat first!"
+		else
+			user << "\red They are too big for the spike, try something smaller!"
+			return
+
+//	MouseDrop_T(var/atom/movable/C, mob/user)
+//		if(istype(C, /obj/mob/carbon/monkey)
+//		else if(istype(C, /obj/mob/carbon/alien) && !istype(C, /mob/living/carbon/alien/larva/slime))
+//		else if(istype(C, /obj/livestock/spesscarp
+
+	attack_hand(mob/user as mob)
+		if(..())
+			return
+		if(src.occupied)
+			if(src.meattype == 1)
+				if(src.meat > 1)
+					src.meat--
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey( src.loc )
+					usr << "You remove some meat from the monkey."
+				else if(src.meat == 1)
+					src.meat--
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src.loc)
+					usr << "You remove the last piece of meat from the monkey!"
+					src.icon_state = "spike"
+					src.occupied = 0
+			else if(src.meattype == 2)
+				if(src.meat > 1)
+					src.meat--
+					new /obj/item/weapon/reagent_containers/food/snacks/xenomeat( src.loc )
+					usr << "You remove some meat from the alien."
+				else if(src.meat == 1)
+					src.meat--
+					new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc)
+					usr << "You remove the last piece of meat from the alien!"
+					src.icon_state = "spike"
+					src.occupied = 0

code/game/objects/structures/ladders.dm

@@ -0,0 +1,73 @@
+/obj/structure/ladder
+	name = "ladder"
+	desc = "A sturdy metal ladder."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "ladder11"
+	var/id = null
+	var/height = 0							//the 'height' of the ladder. higher numbers are considered physically higher
+	var/obj/structure/ladder/down = null	//the ladder below this one
+	var/obj/structure/ladder/up = null		//the ladder above this one
+
+/obj/structure/ladder/New()
+	spawn(8)
+		for(var/obj/structure/ladder/L in world)
+			if(L.id == id)
+				if(L.height == (height - 1))
+					down = L
+					continue
+				if(L.height == (height + 1))
+					up = L
+					continue
+
+			if(up && down)	//if both our connections are filled
+				break
+		update_icon()
+
+/obj/structure/ladder/update_icon()
+	if(up && down)
+		icon_state = "ladder11"
+
+	else if(up)
+		icon_state = "ladder10"
+
+	else if(down)
+		icon_state = "ladder01"
+
+	else	//wtf make your ladders properly assholes
+		icon_state = "ladder00"
+
+/obj/structure/ladder/attack_hand(mob/user as mob)
+	if(up && down)
+		switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
+			if("Up")
+				user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
+									 "<span class='notice'>You climb up \the [src]!</span>")
+				user.loc = get_turf(up)
+				up.add_fingerprint(user)
+			if("Down")
+				user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
+									 "<span class='notice'>You climb down \the [src]!</span>")
+				user.loc = get_turf(down)
+				down.add_fingerprint(user)
+			if("Cancel")
+				return
+
+	else if(up)
+		user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
+							 "<span class='notice'>You climb up \the [src]!</span>")
+		user.loc = get_turf(up)
+		up.add_fingerprint(user)
+
+	else if(down)
+		user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
+							 "<span class='notice'>You climb down \the [src]!</span>")
+		user.loc = get_turf(down)
+		down.add_fingerprint(user)
+
+	add_fingerprint(user)
+
+/obj/structure/ladder/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
+/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob)
+	return attack_hand(user)

code/game/objects/structures/lamarr_cage.dm

@@ -0,0 +1,104 @@
+/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/shard( src.loc )
+			Break()
+			del(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/shard( src.loc )
+		Break()
+		del(src)
+
+
+/obj/structure/lamarr/meteorhit(obj/O as obj)
+		new /obj/item/weapon/shard( src.loc )
+		Break()
+		del(src)
+
+
+/obj/structure/lamarr/proc/healthcheck()
+	if (src.health <= 0)
+		if (!( src.destroyed ))
+			src.density = 0
+			src.destroyed = 1
+			new /obj/item/weapon/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_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/lamarr/attack_hand(mob/user as mob)
+	if (src.destroyed)
+		return
+	else
+		usr << text("\blue You kick the lab cage.")
+		for(var/mob/O in oviewers())
+			if ((O.client && !( O.blinded )))
+				O << text("\red [] kicks the lab cage.", usr)
+		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

@@ -0,0 +1,83 @@
+/obj/structure/lattice
+	desc = "A lightweight support lattice."
+	name = "lattice"
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "latticefull"
+	density = 0
+	anchored = 1.0
+	layer = 2.3 //under pipes
+	//	flags = CONDUCT
+
+/obj/structure/lattice/New()
+	..()
+	if(!(istype(src.loc, /turf/space)))
+		del(src)
+	for(var/obj/structure/lattice/LAT in src.loc)
+		if(LAT != src)
+			del(LAT)
+	icon = 'icons/obj/smoothlattice.dmi'
+	icon_state = "latticeblank"
+	updateOverlays()
+	for (var/dir in cardinal)
+		var/obj/structure/lattice/L
+		if(locate(/obj/structure/lattice, get_step(src, dir)))
+			L = locate(/obj/structure/lattice, get_step(src, dir))
+			L.updateOverlays()
+
+/obj/structure/lattice/Del()
+	for (var/dir in cardinal)
+		var/obj/structure/lattice/L
+		if(locate(/obj/structure/lattice, get_step(src, dir)))
+			L = locate(/obj/structure/lattice, get_step(src, dir))
+			L.updateOverlays(src.loc)
+	..()
+
+/obj/structure/lattice/blob_act()
+	del(src)
+	return
+
+/obj/structure/lattice/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			return
+		else
+	return
+
+/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
+
+	if (istype(C, /obj/item/stack/tile/plasteel))
+		var/turf/T = get_turf(src)
+		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
+		return
+	if (istype(C, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = C
+		if(WT.remove_fuel(0, user))
+			user << "\blue Slicing lattice joints ..."
+		new /obj/item/stack/rods(src.loc)
+		del(src)
+
+	return
+
+/obj/structure/lattice/proc/updateOverlays()
+	//if(!(istype(src.loc, /turf/space)))
+	//	del(src)
+	spawn(1)
+		overlays = list()
+
+		var/dir_sum = 0
+
+		for (var/direction in cardinal)
+			if(locate(/obj/structure/lattice, get_step(src, direction)))
+				dir_sum += direction
+			else
+				if(!(istype(get_step(src, direction), /turf/space)))
+					dir_sum += direction
+
+		icon_state = "lattice[dir_sum]"
+		return

code/game/objects/structures/mineral_doors.dm

@@ -0,0 +1,298 @@
+//NOT using the existing /obj/machinery/door type, since that has some complications on its own, mainly based on its
+//machineryness
+
+/obj/structure/mineral_door
+	name = "mineral door"
+	density = 1
+	anchored = 1
+	opacity = 1
+
+	icon = 'icons/obj/doors/mineral_doors.dmi'
+	icon_state = "metal"
+
+	var/mineralType = "metal"
+	var/state = 0 //closed, 1 == open
+	var/isSwitchingStates = 0
+	var/hardness = 1
+	var/oreAmount = 7
+
+	New(location)
+		..()
+		icon_state = mineralType
+		name = "[mineralType] door"
+		update_nearby_tiles(need_rebuild=1)
+
+	Del()
+		update_nearby_tiles()
+		..()
+
+	Bumped(atom/user)
+		..()
+		if(!state)
+			return TryToSwitchState(user)
+		return
+
+	attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral
+		if(isAI(user)) //so the AI can't open it
+			return
+		else if(isrobot(user)) //but cyborgs can
+			if(get_dist(user,src) <= 1) //not remotely though
+				return TryToSwitchState(user)
+
+	attack_paw(mob/user as mob)
+		return TryToSwitchState(user)
+
+	attack_hand(mob/user as mob)
+		return TryToSwitchState(user)
+
+	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+		if(air_group) return 0
+		if(istype(mover, /obj/effect/beam))
+			return !opacity
+		return !density
+
+	proc/TryToSwitchState(atom/user)
+		if(isSwitchingStates) return
+		if(ismob(user))
+			var/mob/M = user
+			if(world.time - user.last_bumped <= 60) return //NOTE do we really need that?
+			if(M.client)
+				if(iscarbon(M))
+					var/mob/living/carbon/C = M
+					if(!C.handcuffed)
+						SwitchState()
+				else
+					SwitchState()
+		else if(istype(user, /obj/mecha))
+			SwitchState()
+
+	proc/SwitchState()
+		if(state)
+			Close()
+		else
+			Open()
+
+	proc/Open()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1)
+		flick("[mineralType]opening",src)
+		sleep(10)
+		density = 0
+		opacity = 0
+		state = 1
+		update_icon()
+		isSwitchingStates = 0
+
+	proc/Close()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1)
+		flick("[mineralType]closing",src)
+		sleep(10)
+		density = 1
+		opacity = 1
+		state = 0
+		update_icon()
+		isSwitchingStates = 0
+
+	update_icon()
+		if(state)
+			icon_state = "[mineralType]open"
+		else
+			icon_state = mineralType
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W,/obj/item/weapon/pickaxe))
+			var/obj/item/weapon/pickaxe/digTool = W
+			user << "You start digging the [name]."
+			if(do_after(user,digTool.digspeed*hardness) && src)
+				user << "You finished digging."
+				Dismantle()
+		else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc?
+			hardness -= W.force/100
+			user << "You hit the [name] with your [W.name]!"
+			CheckHardness()
+		else
+			attack_hand(user)
+		return
+
+	proc/CheckHardness()
+		if(hardness <= 0)
+			Dismantle(1)
+
+	proc/Dismantle(devastated = 0)
+		if(!devastated)
+			if (mineralType == "metal")
+				var/ore = /obj/item/stack/sheet/metal
+				for(var/i = 1, i <= oreAmount, i++)
+					new ore(get_turf(src))
+			else
+				var/ore = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+				for(var/i = 1, i <= oreAmount, i++)
+					new ore(get_turf(src))
+		else
+			if (mineralType == "metal")
+				var/ore = /obj/item/stack/sheet/metal
+				for(var/i = 3, i <= oreAmount, i++)
+					new ore(get_turf(src))
+			else
+				var/ore = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
+				for(var/i = 3, i <= oreAmount, i++)
+					new ore(get_turf(src))
+		del(src)
+
+	ex_act(severity = 1)
+		switch(severity)
+			if(1)
+				Dismantle(1)
+			if(2)
+				if(prob(20))
+					Dismantle(1)
+				else
+					hardness--
+					CheckHardness()
+			if(3)
+				hardness -= 0.1
+				CheckHardness()
+		return
+
+	proc/update_nearby_tiles(need_rebuild) //Copypasta from airlock code
+		if(!air_master)
+			return 0
+		air_master.AddTurfToUpdate(get_turf(src))
+		return 1
+
+/obj/structure/mineral_door/iron
+	mineralType = "metal"
+	hardness = 3
+
+/obj/structure/mineral_door/silver
+	mineralType = "silver"
+	hardness = 3
+
+/obj/structure/mineral_door/gold
+	mineralType = "gold"
+
+/obj/structure/mineral_door/uranium
+	mineralType = "uranium"
+	hardness = 3
+	luminosity = 2
+
+/obj/structure/mineral_door/sandstone
+	mineralType = "sandstone"
+	hardness = 0.5
+
+/obj/structure/mineral_door/transparent
+	opacity = 0
+
+	Close()
+		..()
+		opacity = 0
+
+/obj/structure/mineral_door/transparent/plasma
+	mineralType = "plasma"
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W,/obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = W
+			if(WT.remove_fuel(0, user))
+				TemperatureAct(100)
+		..()
+
+	temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+		if(exposed_temperature > 300)
+			TemperatureAct(exposed_temperature)
+
+	proc/TemperatureAct(temperature)
+		for(var/turf/simulated/floor/target_tile in range(2,loc))
+
+			var/datum/gas_mixture/napalm = new
+
+			var/toxinsToDeduce = temperature/10
+
+			napalm.toxins = toxinsToDeduce
+			napalm.temperature = 200+T0C
+
+			target_tile.assume_air(napalm)
+			spawn (0) target_tile.hotspot_expose(temperature, 400)
+
+			hardness -= toxinsToDeduce/100
+			CheckHardness()
+
+/obj/structure/mineral_door/transparent/diamond
+	mineralType = "diamond"
+	hardness = 10
+
+/obj/structure/mineral_door/wood
+	mineralType = "wood"
+	hardness = 1
+
+	Open()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/doorcreaky.ogg', 100, 1)
+		flick("[mineralType]opening",src)
+		sleep(10)
+		density = 0
+		opacity = 0
+		state = 1
+		update_icon()
+		isSwitchingStates = 0
+
+	Close()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/doorcreaky.ogg', 100, 1)
+		flick("[mineralType]closing",src)
+		sleep(10)
+		density = 1
+		opacity = 1
+		state = 0
+		update_icon()
+		isSwitchingStates = 0
+
+	Dismantle(devastated = 0)
+		if(!devastated)
+			for(var/i = 1, i <= oreAmount, i++)
+				new/obj/item/stack/sheet/wood(get_turf(src))
+		del(src)
+
+/obj/structure/mineral_door/resin
+	mineralType = "resin"
+	hardness = 1.5
+	var/close_delay = 100
+
+	TryToSwitchState(atom/user)
+		if(isalien(user))
+			return ..()
+
+	Open()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+		flick("[mineralType]opening",src)
+		sleep(10)
+		density = 0
+		opacity = 0
+		state = 1
+		update_icon()
+		isSwitchingStates = 0
+
+		spawn(close_delay)
+			if(!isSwitchingStates && state == 1)
+				Close()
+
+	Close()
+		isSwitchingStates = 1
+		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+		flick("[mineralType]closing",src)
+		sleep(10)
+		density = 1
+		opacity = 1
+		state = 0
+		update_icon()
+		isSwitchingStates = 0
+
+	Dismantle(devastated = 0)
+		del(src)
+
+	CheckHardness()
+		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+		..()
+

code/game/objects/structures/mirror.dm

@@ -0,0 +1,113 @@
+//wip wip wup
+/obj/structure/mirror
+	name = "mirror"
+	desc = "Mirror mirror on the wall, who's the most robust of them all?"
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "mirror"
+	density = 0
+	anchored = 1
+	var/shattered = 0
+
+
+/obj/structure/mirror/attack_hand(mob/user as mob)
+	if(shattered)	return
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+
+		var/userloc = H.loc
+
+		//see code/modules/mob/new_player/preferences.dm at approx line 545 for comments!
+		//this is largely copypasted from there.
+
+		//handle facial hair (if necessary)
+		if(H.gender == MALE)
+			var/list/species_facial_hair = list()
+			if(H.species)
+				for(var/i in facial_hair_styles_list)
+					var/datum/sprite_accessory/facial_hair/tmp_facial = facial_hair_styles_list[i]
+					if(H.species.name in tmp_facial.species_allowed)
+						species_facial_hair += i
+			else
+				species_facial_hair = facial_hair_styles_list
+
+			var/new_style = input(user, "Select a facial hair style", "Grooming")  as null|anything in species_facial_hair
+			if(userloc != H.loc) return	//no tele-grooming
+			if(new_style)
+				H.f_style = new_style
+
+		//handle normal hair
+		var/list/species_hair = list()
+		if(H.species)
+			for(var/i in hair_styles_list)
+				var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
+				if(H.species.name in tmp_hair.species_allowed)
+					species_hair += i
+		else
+			species_hair = hair_styles_list
+
+		var/new_style = input(user, "Select a hair style", "Grooming")  as null|anything in species_hair
+		if(userloc != H.loc) return	//no tele-grooming
+		if(new_style)
+			H.h_style = new_style
+
+		H.update_hair()
+
+
+/obj/structure/mirror/proc/shatter()
+	if(shattered)	return
+	shattered = 1
+	icon_state = "mirror_broke"
+	playsound(src, "shatter", 70, 1)
+	desc = "Oh no, seven years of bad luck!"
+
+
+/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
+	if(prob(Proj.damage * 2))
+		if(!shattered)
+			shatter()
+		else
+			playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+	..()
+
+
+/obj/structure/mirror/attackby(obj/item/I as obj, mob/user as mob)
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+
+	if(prob(I.force * 2))
+		visible_message("<span class='warning'>[user] smashes [src] with [I]!</span>")
+		shatter()
+	else
+		visible_message("<span class='warning'>[user] hits [src] with [I]!</span>")
+		playsound(src.loc, 'sound/effects/Glasshit.ogg', 70, 1)
+
+
+/obj/structure/mirror/attack_alien(mob/user as mob)
+	if(islarva(user)) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()
+
+
+/obj/structure/mirror/attack_animal(mob/user as mob)
+	if(!isanimal(user)) return
+	var/mob/living/simple_animal/M = user
+	if(M.melee_damage_upper <= 0) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()
+
+
+/obj/structure/mirror/attack_slime(mob/user as mob)
+	if(!isslimeadult(user)) return
+	if(shattered)
+		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+		return
+	user.visible_message("<span class='danger'>[user] smashes [src]!</span>")
+	shatter()

code/game/objects/structures/mop_bucket.dm

@@ -0,0 +1,28 @@
+/obj/structure/mopbucket
+	name = "mop bucket"
+	desc = "Fill it with water, but don't forget a mop!"
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "mopbucket"
+	density = 1
+	pressure_resistance = 5
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	var/amount_per_transfer_from_this = 5	//shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
+
+
+/obj/structure/mopbucket/New()
+	create_reagents(100)
+
+
+/obj/structure/mopbucket/examine()
+	set src in usr
+	usr << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
+	..()
+
+/obj/structure/mopbucket/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/mop))
+		if(reagents.total_volume < 1)
+			user << "[src] is out of water!</span>"
+		else
+			reagents.trans_to(I, 5)
+			user << "<span class='notice'>You wet [I] in [src].</span>"
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)

code/game/objects/structures/morgue.dm

@@ -0,0 +1,397 @@
+/* Morgue stuff
+ * Contains:
+ *		Morgue
+ *		Morgue trays
+ *		Creamatorium
+ *		Creamatorium trays
+ */
+
+/*
+ * Morgue
+ */
+
+/obj/structure/morgue
+	name = "morgue"
+	desc = "Used to keep bodies in untill someone fetches them."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "morgue1"
+	dir = EAST
+	density = 1
+	var/obj/structure/m_tray/connected = null
+	anchored = 1.0
+
+/obj/structure/morgue/proc/update()
+	if (src.connected)
+		src.icon_state = "morgue0"
+	else
+		if (src.contents.len)
+			src.icon_state = "morgue2"
+		else
+			src.icon_state = "morgue1"
+	return
+
+/obj/structure/morgue/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/atom/movable/A as mob|obj in src)
+				A.loc = src.loc
+				ex_act(severity)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					ex_act(severity)
+				del(src)
+				return
+		if(3.0)
+			if (prob(5))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					ex_act(severity)
+				del(src)
+				return
+	return
+
+/obj/structure/morgue/alter_health()
+	return src.loc
+
+/obj/structure/morgue/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/morgue/attack_hand(mob/user as mob)
+	if (src.connected)
+		for(var/atom/movable/A as mob|obj in src.connected.loc)
+			if (!( A.anchored ))
+				A.loc = src
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		//src.connected = null
+		del(src.connected)
+	else
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		src.connected = new /obj/structure/m_tray( src.loc )
+		step(src.connected, src.dir)
+		src.connected.layer = OBJ_LAYER
+		var/turf/T = get_step(src, src.dir)
+		if (T.contents.Find(src.connected))
+			src.connected.connected = src
+			src.icon_state = "morgue0"
+			for(var/atom/movable/A as mob|obj in src)
+				A.loc = src.connected.loc
+			src.connected.icon_state = "morguet"
+			src.connected.dir = src.dir
+		else
+			//src.connected = null
+			del(src.connected)
+	src.add_fingerprint(user)
+	update()
+	return
+
+/obj/structure/morgue/attackby(P as obj, mob/user as mob)
+	if (istype(P, /obj/item/weapon/pen))
+		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
+		if (user.get_active_hand() != P)
+			return
+		if ((!in_range(src, usr) && src.loc != user))
+			return
+		t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+		if (t)
+			src.name = text("Morgue- '[]'", t)
+		else
+			src.name = "Morgue"
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/morgue/relaymove(mob/user as mob)
+	if (user.stat)
+		return
+	src.connected = new /obj/structure/m_tray( src.loc )
+	step(src.connected, EAST)
+	src.connected.layer = OBJ_LAYER
+	var/turf/T = get_step(src, EAST)
+	if (T.contents.Find(src.connected))
+		src.connected.connected = src
+		src.icon_state = "morgue0"
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.connected.loc
+			//Foreach goto(106)
+		src.connected.icon_state = "morguet"
+	else
+		//src.connected = null
+		del(src.connected)
+	return
+
+
+/*
+ * Morgue tray
+ */
+/obj/structure/m_tray
+	name = "morgue tray"
+	desc = "Apply corpse before closing."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "morguet"
+	density = 1
+	layer = 2.0
+	var/obj/structure/morgue/connected = null
+	anchored = 1
+	throwpass = 1
+
+/obj/structure/m_tray/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/m_tray/attack_hand(mob/user as mob)
+	if (src.connected)
+		for(var/atom/movable/A as mob|obj in src.loc)
+			if (!( A.anchored ))
+				A.loc = src.connected
+			//Foreach goto(26)
+		src.connected.connected = null
+		src.connected.update()
+		add_fingerprint(user)
+		//SN src = null
+		del(src)
+		return
+	return
+
+/obj/structure/m_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
+		return
+	if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
+		return
+	if (!ismob(user) || user.stat || user.lying || user.stunned)
+		return
+	O.loc = src.loc
+	if (user != O)
+		for(var/mob/B in viewers(user, 3))
+			if ((B.client && !( B.blinded )))
+				B << text("\red [] stuffs [] into []!", user, O, src)
+	return
+
+
+/*
+ * Crematorium
+ */
+
+/obj/structure/crematorium
+	name = "crematorium"
+	desc = "A human incinerator. Works well on barbeque nights."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "crema1"
+	density = 1
+	var/obj/structure/c_tray/connected = null
+	anchored = 1.0
+	var/cremating = 0
+	var/id = 1
+	var/locked = 0
+
+/obj/structure/crematorium/proc/update()
+	if (src.connected)
+		src.icon_state = "crema0"
+	else
+		if (src.contents.len)
+			src.icon_state = "crema2"
+		else
+			src.icon_state = "crema1"
+	return
+
+/obj/structure/crematorium/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/atom/movable/A as mob|obj in src)
+				A.loc = src.loc
+				ex_act(severity)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					ex_act(severity)
+				del(src)
+				return
+		if(3.0)
+			if (prob(5))
+				for(var/atom/movable/A as mob|obj in src)
+					A.loc = src.loc
+					ex_act(severity)
+				del(src)
+				return
+	return
+
+/obj/structure/crematorium/alter_health()
+	return src.loc
+
+/obj/structure/crematorium/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/crematorium/attack_hand(mob/user as mob)
+//	if (cremating) AWW MAN! THIS WOULD BE SO MUCH MORE FUN ... TO WATCH
+//		user.show_message("\red Uh-oh, that was a bad idea.", 1)
+//		//usr << "Uh-oh, that was a bad idea."
+//		src:loc:poison += 20000000
+//		src:loc:firelevel = src:loc:poison
+//		return
+	if (cremating)
+		usr << "\red It's locked."
+		return
+	if ((src.connected) && (src.locked == 0))
+		for(var/atom/movable/A as mob|obj in src.connected.loc)
+			if (!( A.anchored ))
+				A.loc = src
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		//src.connected = null
+		del(src.connected)
+	else if (src.locked == 0)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		src.connected = new /obj/structure/c_tray( src.loc )
+		step(src.connected, SOUTH)
+		src.connected.layer = OBJ_LAYER
+		var/turf/T = get_step(src, SOUTH)
+		if (T.contents.Find(src.connected))
+			src.connected.connected = src
+			src.icon_state = "crema0"
+			for(var/atom/movable/A as mob|obj in src)
+				A.loc = src.connected.loc
+			src.connected.icon_state = "cremat"
+		else
+			//src.connected = null
+			del(src.connected)
+	src.add_fingerprint(user)
+	update()
+
+/obj/structure/crematorium/attackby(P as obj, mob/user as mob)
+	if (istype(P, /obj/item/weapon/pen))
+		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
+		if (user.get_active_hand() != P)
+			return
+		if ((!in_range(src, usr) > 1 && src.loc != user))
+			return
+		t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+		if (t)
+			src.name = text("Crematorium- '[]'", t)
+		else
+			src.name = "Crematorium"
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/crematorium/relaymove(mob/user as mob)
+	if (user.stat || locked)
+		return
+	src.connected = new /obj/structure/c_tray( src.loc )
+	step(src.connected, SOUTH)
+	src.connected.layer = OBJ_LAYER
+	var/turf/T = get_step(src, SOUTH)
+	if (T.contents.Find(src.connected))
+		src.connected.connected = src
+		src.icon_state = "crema0"
+		for(var/atom/movable/A as mob|obj in src)
+			A.loc = src.connected.loc
+			//Foreach goto(106)
+		src.connected.icon_state = "cremat"
+	else
+		//src.connected = null
+		del(src.connected)
+	return
+
+/obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob)
+//	for(var/obj/machinery/crema_switch/O in src) //trying to figure a way to call the switch, too drunk to sort it out atm
+//		if(var/on == 1)
+//		return
+	if(cremating)
+		return //don't let you cremate something twice or w/e
+
+	if(contents.len <= 0)
+		for (var/mob/M in viewers(src))
+			M.show_message("\red You hear a hollow crackle.", 1)
+			return
+
+	else
+		if(!isemptylist(src.search_contents_for(/obj/item/weapon/disk/nuclear)))
+			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
+			return
+
+		for (var/mob/M in viewers(src))
+			M.show_message("\red You hear a roar as the crematorium activates.", 1)
+
+		cremating = 1
+		locked = 1
+
+		for(var/mob/living/M in contents)
+			if (M.stat!=2)
+				M.emote("scream")
+			//Logging for this causes runtimes resulting in the cremator locking up. Commenting it out until that's figured out.
+			//M.attack_log += "\[[time_stamp()]\] Has been cremated by <b>[user]/[user.ckey]</b>" //No point in this when the mob's about to be deleted
+			//user.attack_log +="\[[time_stamp()]\] Cremated <b>[M]/[M.ckey]</b>"
+			//log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> cremated <b>[M]/[M.ckey]</b>")
+			M.death(1)
+			M.ghostize()
+			del(M)
+
+		for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up
+			del(O)
+
+		new /obj/effect/decal/cleanable/ash(src)
+		sleep(30)
+		cremating = 0
+		locked = 0
+		playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
+	return
+
+
+/*
+ * Crematorium tray
+ */
+/obj/structure/c_tray
+	name = "crematorium tray"
+	desc = "Apply body before burning."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "cremat"
+	density = 1
+	layer = 2.0
+	var/obj/structure/crematorium/connected = null
+	anchored = 1
+	throwpass = 1
+
+/obj/structure/c_tray/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/c_tray/attack_hand(mob/user as mob)
+	if (src.connected)
+		for(var/atom/movable/A as mob|obj in src.loc)
+			if (!( A.anchored ))
+				A.loc = src.connected
+			//Foreach goto(26)
+		src.connected.connected = null
+		src.connected.update()
+		add_fingerprint(user)
+		//SN src = null
+		del(src)
+		return
+	return
+
+/obj/structure/c_tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+	if ((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
+		return
+	if (!ismob(O) && !istype(O, /obj/structure/closet/body_bag))
+		return
+	if (!ismob(user) || user.stat || user.lying || user.stunned)
+		return
+	O.loc = src.loc
+	if (user != O)
+		for(var/mob/B in viewers(user, 3))
+			if ((B.client && !( B.blinded )))
+				B << text("\red [] stuffs [] into []!", user, O, src)
+			//Foreach goto(99)
+	return
+
+/obj/machinery/crema_switch/attack_hand(mob/user as mob)
+	if(src.allowed(usr))
+		for (var/obj/structure/crematorium/C in world)
+			if (C.id == id)
+				if (!C.cremating)
+					C.cremate(user)
+	else
+		usr << "\red Access denied."
+	return
+

code/game/objects/structures/musician.dm

@@ -0,0 +1,431 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/datum/song
+	var/name = "Untitled"
+	var/list/lines = new()
+	var/tempo = 5
+
+/obj/structure/device/piano
+	name = "space minimoog"
+	icon = 'icons/obj/musician.dmi'
+	icon_state = "minimoog"
+	anchored = 1
+	density = 1
+	var/datum/song/song
+	var/playing = 0
+	var/help = 0
+	var/edit = 1
+	var/repeat = 0
+
+/obj/structure/device/piano/New()
+	if(prob(50))
+		name = "space minimoog"
+		desc = "This is a minimoog, like a space piano, but more spacey!"
+		icon_state = "minimoog"
+	else
+		name = "space piano"
+		desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
+		icon_state = "piano"
+
+/obj/structure/device/piano/proc/playnote(var/note as text)
+	//world << "Note: [note]"
+	var/soundfile
+	/*BYOND loads resource files at compile time if they are ''. This means you can't really manipulate them dynamically.
+	Tried doing it dynamically at first but its more trouble than its worth. Would have saved many lines tho.*/
+	switch(note)
+		if("Cn1")	soundfile = 'sound/piano/Cn1.ogg'
+		if("C#1")	soundfile = 'sound/piano/C#1.ogg'
+		if("Db1")	soundfile = 'sound/piano/Db1.ogg'
+		if("Dn1")	soundfile = 'sound/piano/Dn1.ogg'
+		if("D#1")	soundfile = 'sound/piano/D#1.ogg'
+		if("Eb1")	soundfile = 'sound/piano/Eb1.ogg'
+		if("En1")	soundfile = 'sound/piano/En1.ogg'
+		if("E#1")	soundfile = 'sound/piano/E#1.ogg'
+		if("Fb1")	soundfile = 'sound/piano/Fb1.ogg'
+		if("Fn1")	soundfile = 'sound/piano/Fn1.ogg'
+		if("F#1")	soundfile = 'sound/piano/F#1.ogg'
+		if("Gb1")	soundfile = 'sound/piano/Gb1.ogg'
+		if("Gn1")	soundfile = 'sound/piano/Gn1.ogg'
+		if("G#1")	soundfile = 'sound/piano/G#1.ogg'
+		if("Ab1")	soundfile = 'sound/piano/Ab1.ogg'
+		if("An1")	soundfile = 'sound/piano/An1.ogg'
+		if("A#1")	soundfile = 'sound/piano/A#1.ogg'
+		if("Bb1")	soundfile = 'sound/piano/Bb1.ogg'
+		if("Bn1")	soundfile = 'sound/piano/Bn1.ogg'
+		if("B#1")	soundfile = 'sound/piano/B#1.ogg'
+		if("Cb2")	soundfile = 'sound/piano/Cb2.ogg'
+		if("Cn2")	soundfile = 'sound/piano/Cn2.ogg'
+		if("C#2")	soundfile = 'sound/piano/C#2.ogg'
+		if("Db2")	soundfile = 'sound/piano/Db2.ogg'
+		if("Dn2")	soundfile = 'sound/piano/Dn2.ogg'
+		if("D#2")	soundfile = 'sound/piano/D#2.ogg'
+		if("Eb2")	soundfile = 'sound/piano/Eb2.ogg'
+		if("En2")	soundfile = 'sound/piano/En2.ogg'
+		if("E#2")	soundfile = 'sound/piano/E#2.ogg'
+		if("Fb2")	soundfile = 'sound/piano/Fb2.ogg'
+		if("Fn2")	soundfile = 'sound/piano/Fn2.ogg'
+		if("F#2")	soundfile = 'sound/piano/F#2.ogg'
+		if("Gb2")	soundfile = 'sound/piano/Gb2.ogg'
+		if("Gn2")	soundfile = 'sound/piano/Gn2.ogg'
+		if("G#2")	soundfile = 'sound/piano/G#2.ogg'
+		if("Ab2")	soundfile = 'sound/piano/Ab2.ogg'
+		if("An2")	soundfile = 'sound/piano/An2.ogg'
+		if("A#2")	soundfile = 'sound/piano/A#2.ogg'
+		if("Bb2")	soundfile = 'sound/piano/Bb2.ogg'
+		if("Bn2")	soundfile = 'sound/piano/Bn2.ogg'
+		if("B#2")	soundfile = 'sound/piano/B#2.ogg'
+		if("Cb3")	soundfile = 'sound/piano/Cb3.ogg'
+		if("Cn3")	soundfile = 'sound/piano/Cn3.ogg'
+		if("C#3")	soundfile = 'sound/piano/C#3.ogg'
+		if("Db3")	soundfile = 'sound/piano/Db3.ogg'
+		if("Dn3")	soundfile = 'sound/piano/Dn3.ogg'
+		if("D#3")	soundfile = 'sound/piano/D#3.ogg'
+		if("Eb3")	soundfile = 'sound/piano/Eb3.ogg'
+		if("En3")	soundfile = 'sound/piano/En3.ogg'
+		if("E#3")	soundfile = 'sound/piano/E#3.ogg'
+		if("Fb3")	soundfile = 'sound/piano/Fb3.ogg'
+		if("Fn3")	soundfile = 'sound/piano/Fn3.ogg'
+		if("F#3")	soundfile = 'sound/piano/F#3.ogg'
+		if("Gb3")	soundfile = 'sound/piano/Gb3.ogg'
+		if("Gn3")	soundfile = 'sound/piano/Gn3.ogg'
+		if("G#3")	soundfile = 'sound/piano/G#3.ogg'
+		if("Ab3")	soundfile = 'sound/piano/Ab3.ogg'
+		if("An3")	soundfile = 'sound/piano/An3.ogg'
+		if("A#3")	soundfile = 'sound/piano/A#3.ogg'
+		if("Bb3")	soundfile = 'sound/piano/Bb3.ogg'
+		if("Bn3")	soundfile = 'sound/piano/Bn3.ogg'
+		if("B#3")	soundfile = 'sound/piano/B#3.ogg'
+		if("Cb4")	soundfile = 'sound/piano/Cb4.ogg'
+		if("Cn4")	soundfile = 'sound/piano/Cn4.ogg'
+		if("C#4")	soundfile = 'sound/piano/C#4.ogg'
+		if("Db4")	soundfile = 'sound/piano/Db4.ogg'
+		if("Dn4")	soundfile = 'sound/piano/Dn4.ogg'
+		if("D#4")	soundfile = 'sound/piano/D#4.ogg'
+		if("Eb4")	soundfile = 'sound/piano/Eb4.ogg'
+		if("En4")	soundfile = 'sound/piano/En4.ogg'
+		if("E#4")	soundfile = 'sound/piano/E#4.ogg'
+		if("Fb4")	soundfile = 'sound/piano/Fb4.ogg'
+		if("Fn4")	soundfile = 'sound/piano/Fn4.ogg'
+		if("F#4")	soundfile = 'sound/piano/F#4.ogg'
+		if("Gb4")	soundfile = 'sound/piano/Gb4.ogg'
+		if("Gn4")	soundfile = 'sound/piano/Gn4.ogg'
+		if("G#4")	soundfile = 'sound/piano/G#4.ogg'
+		if("Ab4")	soundfile = 'sound/piano/Ab4.ogg'
+		if("An4")	soundfile = 'sound/piano/An4.ogg'
+		if("A#4")	soundfile = 'sound/piano/A#4.ogg'
+		if("Bb4")	soundfile = 'sound/piano/Bb4.ogg'
+		if("Bn4")	soundfile = 'sound/piano/Bn4.ogg'
+		if("B#4")	soundfile = 'sound/piano/B#4.ogg'
+		if("Cb5")	soundfile = 'sound/piano/Cb5.ogg'
+		if("Cn5")	soundfile = 'sound/piano/Cn5.ogg'
+		if("C#5")	soundfile = 'sound/piano/C#5.ogg'
+		if("Db5")	soundfile = 'sound/piano/Db5.ogg'
+		if("Dn5")	soundfile = 'sound/piano/Dn5.ogg'
+		if("D#5")	soundfile = 'sound/piano/D#5.ogg'
+		if("Eb5")	soundfile = 'sound/piano/Eb5.ogg'
+		if("En5")	soundfile = 'sound/piano/En5.ogg'
+		if("E#5")	soundfile = 'sound/piano/E#5.ogg'
+		if("Fb5")	soundfile = 'sound/piano/Fb5.ogg'
+		if("Fn5")	soundfile = 'sound/piano/Fn5.ogg'
+		if("F#5")	soundfile = 'sound/piano/F#5.ogg'
+		if("Gb5")	soundfile = 'sound/piano/Gb5.ogg'
+		if("Gn5")	soundfile = 'sound/piano/Gn5.ogg'
+		if("G#5")	soundfile = 'sound/piano/G#5.ogg'
+		if("Ab5")	soundfile = 'sound/piano/Ab5.ogg'
+		if("An5")	soundfile = 'sound/piano/An5.ogg'
+		if("A#5")	soundfile = 'sound/piano/A#5.ogg'
+		if("Bb5")	soundfile = 'sound/piano/Bb5.ogg'
+		if("Bn5")	soundfile = 'sound/piano/Bn5.ogg'
+		if("B#5")	soundfile = 'sound/piano/B#5.ogg'
+		if("Cb6")	soundfile = 'sound/piano/Cb6.ogg'
+		if("Cn6")	soundfile = 'sound/piano/Cn6.ogg'
+		if("C#6")	soundfile = 'sound/piano/C#6.ogg'
+		if("Db6")	soundfile = 'sound/piano/Db6.ogg'
+		if("Dn6")	soundfile = 'sound/piano/Dn6.ogg'
+		if("D#6")	soundfile = 'sound/piano/D#6.ogg'
+		if("Eb6")	soundfile = 'sound/piano/Eb6.ogg'
+		if("En6")	soundfile = 'sound/piano/En6.ogg'
+		if("E#6")	soundfile = 'sound/piano/E#6.ogg'
+		if("Fb6")	soundfile = 'sound/piano/Fb6.ogg'
+		if("Fn6")	soundfile = 'sound/piano/Fn6.ogg'
+		if("F#6")	soundfile = 'sound/piano/F#6.ogg'
+		if("Gb6")	soundfile = 'sound/piano/Gb6.ogg'
+		if("Gn6")	soundfile = 'sound/piano/Gn6.ogg'
+		if("G#6")	soundfile = 'sound/piano/G#6.ogg'
+		if("Ab6")	soundfile = 'sound/piano/Ab6.ogg'
+		if("An6")	soundfile = 'sound/piano/An6.ogg'
+		if("A#6")	soundfile = 'sound/piano/A#6.ogg'
+		if("Bb6")	soundfile = 'sound/piano/Bb6.ogg'
+		if("Bn6")	soundfile = 'sound/piano/Bn6.ogg'
+		if("B#6")	soundfile = 'sound/piano/B#6.ogg'
+		if("Cb7")	soundfile = 'sound/piano/Cb7.ogg'
+		if("Cn7")	soundfile = 'sound/piano/Cn7.ogg'
+		if("C#7")	soundfile = 'sound/piano/C#7.ogg'
+		if("Db7")	soundfile = 'sound/piano/Db7.ogg'
+		if("Dn7")	soundfile = 'sound/piano/Dn7.ogg'
+		if("D#7")	soundfile = 'sound/piano/D#7.ogg'
+		if("Eb7")	soundfile = 'sound/piano/Eb7.ogg'
+		if("En7")	soundfile = 'sound/piano/En7.ogg'
+		if("E#7")	soundfile = 'sound/piano/E#7.ogg'
+		if("Fb7")	soundfile = 'sound/piano/Fb7.ogg'
+		if("Fn7")	soundfile = 'sound/piano/Fn7.ogg'
+		if("F#7")	soundfile = 'sound/piano/F#7.ogg'
+		if("Gb7")	soundfile = 'sound/piano/Gb7.ogg'
+		if("Gn7")	soundfile = 'sound/piano/Gn7.ogg'
+		if("G#7")	soundfile = 'sound/piano/G#7.ogg'
+		if("Ab7")	soundfile = 'sound/piano/Ab7.ogg'
+		if("An7")	soundfile = 'sound/piano/An7.ogg'
+		if("A#7")	soundfile = 'sound/piano/A#7.ogg'
+		if("Bb7")	soundfile = 'sound/piano/Bb7.ogg'
+		if("Bn7")	soundfile = 'sound/piano/Bn7.ogg'
+		if("B#7")	soundfile = 'sound/piano/B#7.ogg'
+		if("Cb8")	soundfile = 'sound/piano/Cb8.ogg'
+		if("Cn8")	soundfile = 'sound/piano/Cn8.ogg'
+		if("C#8")	soundfile = 'sound/piano/C#8.ogg'
+		if("Db8")	soundfile = 'sound/piano/Db8.ogg'
+		if("Dn8")	soundfile = 'sound/piano/Dn8.ogg'
+		if("D#8")	soundfile = 'sound/piano/D#8.ogg'
+		if("Eb8")	soundfile = 'sound/piano/Eb8.ogg'
+		if("En8")	soundfile = 'sound/piano/En8.ogg'
+		if("E#8")	soundfile = 'sound/piano/E#8.ogg'
+		if("Fb8")	soundfile = 'sound/piano/Fb8.ogg'
+		if("Fn8")	soundfile = 'sound/piano/Fn8.ogg'
+		if("F#8")	soundfile = 'sound/piano/F#8.ogg'
+		if("Gb8")	soundfile = 'sound/piano/Gb8.ogg'
+		if("Gn8")	soundfile = 'sound/piano/Gn8.ogg'
+		if("G#8")	soundfile = 'sound/piano/G#8.ogg'
+		if("Ab8")	soundfile = 'sound/piano/Ab8.ogg'
+		if("An8")	soundfile = 'sound/piano/An8.ogg'
+		if("A#8")	soundfile = 'sound/piano/A#8.ogg'
+		if("Bb8")	soundfile = 'sound/piano/Bb8.ogg'
+		if("Bn8")	soundfile = 'sound/piano/Bn8.ogg'
+		if("B#8")	soundfile = 'sound/piano/B#8.ogg'
+		if("Cb9")	soundfile = 'sound/piano/Cb9.ogg'
+		if("Cn9")	soundfile = 'sound/piano/Cn9.ogg'
+		else		return
+
+	hearers(15, src) << sound(soundfile)
+
+/obj/structure/device/piano/proc/playsong()
+	do
+		var/cur_oct[7]
+		var/cur_acc[7]
+		for(var/i = 1 to 7)
+			cur_oct[i] = "3"
+			cur_acc[i] = "n"
+
+		for(var/line in song.lines)
+			//world << line
+			for(var/beat in text2list(lowertext(line), ","))
+				//world << "beat: [beat]"
+				var/list/notes = text2list(beat, "/")
+				for(var/note in text2list(notes[1], "-"))
+					//world << "note: [note]"
+					if(!playing || !anchored)//If the piano is playing, or is loose
+						playing = 0
+						return
+					if(lentext(note) == 0)
+						continue
+					//world << "Parse: [copytext(note,1,2)]"
+					var/cur_note = text2ascii(note) - 96
+					if(cur_note < 1 || cur_note > 7)
+						continue
+					for(var/i=2 to lentext(note))
+						var/ni = copytext(note,i,i+1)
+						if(!text2num(ni))
+							if(ni == "#" || ni == "b" || ni == "n")
+								cur_acc[cur_note] = ni
+							else if(ni == "s")
+								cur_acc[cur_note] = "#" // so shift is never required
+						else
+							cur_oct[cur_note] = ni
+					playnote(uppertext(copytext(note,1,2)) + cur_acc[cur_note] + cur_oct[cur_note])
+				if(notes.len >= 2 && text2num(notes[2]))
+					sleep(song.tempo / text2num(notes[2]))
+				else
+					sleep(song.tempo)
+		if(repeat > 0)
+			repeat-- //Infinite loops are baaaad.
+	while(repeat > 0)
+	playing = 0
+	updateUsrDialog()
+
+/obj/structure/device/piano/attack_hand(var/mob/user as mob)
+	if(!anchored)
+		return
+
+	usr.machine = src
+	var/dat = "<HEAD><TITLE>Piano</TITLE></HEAD><BODY>"
+
+	if(song)
+		if(song.lines.len > 0 && !(playing))
+			dat += "<A href='?src=\ref[src];play=1'>Play Song</A><BR><BR>"
+			dat += "<A href='?src=\ref[src];repeat=1'>Repeat Song: [repeat] times.</A><BR><BR>"
+		if(playing)
+			dat += "<A href='?src=\ref[src];stop=1'>Stop Playing</A><BR>"
+			dat += "Repeats left: [repeat].<BR><BR>"
+	if(!edit)
+		dat += "<A href='?src=\ref[src];edit=2'>Show Editor</A><BR><BR>"
+	else
+		dat += "<A href='?src=\ref[src];edit=1'>Hide Editor</A><BR>"
+		dat += "<A href='?src=\ref[src];newsong=1'>Start a New Song</A><BR>"
+		dat += "<A href='?src=\ref[src];import=1'>Import a Song</A><BR><BR>"
+		if(song)
+			var/calctempo = (10/song.tempo)*60
+			dat += "Tempo : <A href='?src=\ref[src];tempo=10'>-</A><A href='?src=\ref[src];tempo=1'>-</A> [calctempo] BPM <A href='?src=\ref[src];tempo=-1'>+</A><A href='?src=\ref[src];tempo=-10'>+</A><BR><BR>"
+			var/linecount = 0
+			for(var/line in song.lines)
+				linecount += 1
+				dat += "Line [linecount]: [line] <A href='?src=\ref[src];deleteline=[linecount]'>Delete Line</A> <A href='?src=\ref[src];modifyline=[linecount]'>Modify Line</A><BR>"
+			dat += "<A href='?src=\ref[src];newline=1'>Add Line</A><BR><BR>"
+		if(help)
+			dat += "<A href='?src=\ref[src];help=1'>Hide Help</A><BR>"
+			dat += {"
+					Lines are a series of chords, separated by commas (,), each with notes seperated by hyphens (-).<br>
+					Every note in a chord will play together, with chord timed by the tempo.<br>
+					<br>
+					Notes are played by the names of the note, and optionally, the accidental, and/or the octave number.<br>
+					By default, every note is natural and in octave 3. Defining otherwise is remembered for each note.<br>
+					Example: <i>C,D,E,F,G,A,B</i> will play a C major scale.<br>
+					After a note has an accidental placed, it will be remembered: <i>C,C4,C,C3</i> is C3,C4,C4,C3</i><br>
+					Chords can be played simply by seperating each note with a hyphon: <i>A-C#,Cn-E,E-G#,Gn-B</i><br>
+					A pause may be denoted by an empty chord: <i>C,E,,C,G</i><br>
+					To make a chord be a different time, end it with /x, where the chord length will be length<br>
+					defined by tempo / x: <i>C,G/2,E/4</i><br>
+					Combined, an example is: <i>E-E4/4,/2,G#/8,B/8,E3-E4/4</i>
+					<br>
+					Lines may be up to 50 characters.<br>
+					A song may only contain up to 50 lines.<br>
+					"}
+		else
+			dat += "<A href='?src=\ref[src];help=2'>Show Help</A><BR>"
+	dat += "</BODY></HTML>"
+	user << browse(dat, "window=piano;size=700x300")
+	onclose(user, "piano")
+
+/obj/structure/device/piano/Topic(href, href_list)
+
+	if(!in_range(src, usr) || issilicon(usr) || !anchored || !usr.canmove || usr.restrained())
+		usr << browse(null, "window=piano;size=700x300")
+		onclose(usr, "piano")
+		return
+
+	if(href_list["newsong"])
+		song = new()
+	else if(song)
+		if(href_list["repeat"]) //Changing this from a toggle to a number of repeats to avoid infinite loops.
+			if(playing) return //So that people cant keep adding to repeat. If the do it intentionally, it could result in the server crashing.
+			var/tempnum = input("How many times do you want to repeat this piece? (max:10)") as num|null
+			if(tempnum > 10)
+				tempnum = 10
+			if(tempnum < 0)
+				tempnum = 0
+			repeat = round(tempnum)
+
+		else if(href_list["tempo"])
+			song.tempo += round(text2num(href_list["tempo"]))
+			if(song.tempo < 1)
+				song.tempo = 1
+
+		else if(href_list["play"])
+			if(song)
+				playing = 1
+				spawn() playsong()
+
+		else if(href_list["newline"])
+			var/newline = html_encode(input("Enter your line: ", "Piano") as text|null)
+			if(!newline)
+				return
+			if(song.lines.len > 50)
+				return
+			if(lentext(newline) > 50)
+				newline = copytext(newline, 1, 50)
+			song.lines.Add(newline)
+
+		else if(href_list["deleteline"])
+			var/num = round(text2num(href_list["deleteline"]))
+			if(num > song.lines.len || num < 1)
+				return
+			song.lines.Cut(num, num+1)
+
+		else if(href_list["modifyline"])
+			var/num = round(text2num(href_list["modifyline"]),1)
+			var/content = html_encode(input("Enter your line: ", "Piano", song.lines[num]) as text|null)
+			if(!content)
+				return
+			if(lentext(content) > 50)
+				content = copytext(content, 1, 50)
+			if(num > song.lines.len || num < 1)
+				return
+			song.lines[num] = content
+
+		else if(href_list["stop"])
+			playing = 0
+
+		else if(href_list["help"])
+			help = text2num(href_list["help"]) - 1
+
+		else if(href_list["edit"])
+			edit = text2num(href_list["edit"]) - 1
+
+		else if(href_list["import"])
+			var/t = ""
+			do
+				t = html_encode(input(usr, "Please paste the entire song, formatted:", text("[]", src.name), t)  as message)
+				if (!in_range(src, usr))
+					return
+
+				if(lentext(t) >= 3072)
+					var/cont = input(usr, "Your message is too long! Would you like to continue editing it?", "", "yes") in list("yes", "no")
+					if(cont == "no")
+						break
+			while(lentext(t) > 3072)
+
+			//split into lines
+			spawn()
+				var/list/lines = text2list(t, "\n")
+				var/tempo = 5
+				if(copytext(lines[1],1,6) == "BPM: ")
+					tempo = 600 / text2num(copytext(lines[1],6))
+					lines.Cut(1,2)
+				if(lines.len > 50)
+					usr << "Too many lines!"
+					lines.Cut(51)
+				var/linenum = 1
+				for(var/l in lines)
+					if(lentext(l) > 50)
+						usr << "Line [linenum] too long!"
+						lines.Remove(l)
+					else
+						linenum++
+				song = new()
+				song.lines = lines
+				song.tempo = tempo
+				updateUsrDialog()
+
+	add_fingerprint(usr)
+	updateUsrDialog()
+	return
+
+/obj/structure/device/piano/attackby(obj/item/O as obj, mob/user as mob)
+	if (istype(O, /obj/item/weapon/wrench))
+		if (anchored)
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+			user << "\blue You begin to loosen \the [src]'s casters..."
+			if (do_after(user, 40))
+				user.visible_message( \
+					"[user] loosens \the [src]'s casters.", \
+					"\blue You have loosened \the [src]. Now it can be pulled somewhere else.", \
+					"You hear ratchet.")
+				src.anchored = 0
+		else
+			playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+			user << "\blue You begin to tighten \the [src] to the floor..."
+			if (do_after(user, 20))
+				user.visible_message( \
+					"[user] tightens \the [src]'s casters.", \
+					"\blue You have tightened \the [src]'s casters. Now it can be played again.", \
+					"You hear ratchet.")
+				src.anchored = 1
+	else
+		..()

code/game/objects/structures/noticeboard.dm

@@ -0,0 +1,80 @@
+/obj/structure/noticeboard
+	name = "notice board"
+	desc = "A board for pinning important notices upon."
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "nboard00"
+	flags = FPRINT
+	density = 0
+	anchored = 1
+	var/notices = 0
+
+/obj/structure/noticeboard/initialize()
+	for(var/obj/item/I in loc)
+		if(notices > 4) break
+		if(istype(I, /obj/item/weapon/paper))
+			I.loc = src
+			notices++
+	icon_state = "nboard0[notices]"
+
+//attaching papers!!
+/obj/structure/noticeboard/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/weapon/paper))
+		if(notices < 5)
+			O.add_fingerprint(user)
+			add_fingerprint(user)
+			user.drop_item()
+			O.loc = src
+			notices++
+			icon_state = "nboard0[notices]"	//update sprite
+			user << "<span class='notice'>You pin the paper to the noticeboard.</span>"
+		else
+			user << "<span class='notice'>You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.</span>"
+
+/obj/structure/noticeboard/attack_hand(user as mob)
+	var/dat = "<B>Noticeboard</B><BR>"
+	for(var/obj/item/weapon/paper/P in src)
+		dat += "<A href='?src=\ref[src];read=\ref[P]'>[P.name]</A> <A href='?src=\ref[src];write=\ref[P]'>Write</A> <A href='?src=\ref[src];remove=\ref[P]'>Remove</A><BR>"
+	user << browse("<HEAD><TITLE>Notices</TITLE></HEAD>[dat]","window=noticeboard")
+	onclose(user, "noticeboard")
+
+
+/obj/structure/noticeboard/Topic(href, href_list)
+	..()
+	usr.set_machine(src)
+	if(href_list["remove"])
+		if((usr.stat || usr.restrained()))	//For when a player is handcuffed while they have the notice window open
+			return
+		var/obj/item/P = locate(href_list["remove"])
+		if((P && P.loc == src))
+			P.loc = get_turf(src)	//dump paper on the floor because you're a clumsy fuck
+			P.add_fingerprint(usr)
+			add_fingerprint(usr)
+			notices--
+			icon_state = "nboard0[notices]"
+
+	if(href_list["write"])
+		if((usr.stat || usr.restrained())) //For when a player is handcuffed while they have the notice window open
+			return
+		var/obj/item/P = locate(href_list["write"])
+
+		if((P && P.loc == src)) //ifthe paper's on the board
+			if(istype(usr.r_hand, /obj/item/weapon/pen)) //and you're holding a pen
+				add_fingerprint(usr)
+				P.attackby(usr.r_hand, usr) //then do ittttt
+			else
+				if(istype(usr.l_hand, /obj/item/weapon/pen)) //check other hand for pen
+					add_fingerprint(usr)
+					P.attackby(usr.l_hand, usr)
+				else
+					usr << "<span class='notice'>You'll need something to write with!</span>"
+
+	if(href_list["read"])
+		var/obj/item/weapon/paper/P = locate(href_list["read"])
+		if((P && P.loc == src))
+			if(!( istype(usr, /mob/living/carbon/human) ))
+				usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[stars(P.info)]</TT></BODY></HTML>", "window=[P.name]")
+				onclose(usr, "[P.name]")
+			else
+				usr << browse("<HTML><HEAD><TITLE>[P.name]</TITLE></HEAD><BODY><TT>[P.info]</TT></BODY></HTML>", "window=[P.name]")
+				onclose(usr, "[P.name]")
+	return

code/game/objects/structures/safe.dm

@@ -0,0 +1,191 @@
+/*
+CONTAINS:
+SAFES
+FLOOR SAFES
+*/
+
+//SAFES
+/obj/structure/safe
+	name = "safe"
+	desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 2 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "safe"
+	anchored = 1
+	density = 1
+	var/open = 0		//is the safe open?
+	var/tumbler_1_pos	//the tumbler position- from 0 to 72
+	var/tumbler_1_open	//the tumbler position to open at- 0 to 72
+	var/tumbler_2_pos
+	var/tumbler_2_open
+	var/dial = 0		//where is the dial pointing?
+	var/space = 0		//the combined w_class of everything in the safe
+	var/maxspace = 24	//the maximum combined w_class of stuff in the safe
+
+
+/obj/structure/safe/New()
+	tumbler_1_pos = rand(0, 72)
+	tumbler_1_open = rand(0, 72)
+
+	tumbler_2_pos = rand(0, 72)
+	tumbler_2_open = rand(0, 72)
+
+
+/obj/structure/safe/initialize()
+	for(var/obj/item/I in loc)
+		if(space >= maxspace)
+			return
+		if(I.w_class + space <= maxspace)
+			space += I.w_class
+			I.loc = src
+
+
+/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
+	if(user && canhear)
+		if(tumbler_1_pos == tumbler_1_open)
+			user << "<span class='notice'>You hear a [pick("tonk", "krunk", "plunk")] from [src].</span>"
+		if(tumbler_2_pos == tumbler_2_open)
+			user << "<span class='notice'>You hear a [pick("tink", "krink", "plink")] from [src].</span>"
+	if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
+		if(user) visible_message("<b>[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!</b>")
+		return 1
+	return 0
+
+
+/obj/structure/safe/proc/decrement(num)
+	num -= 1
+	if(num < 0)
+		num = 71
+	return num
+
+
+/obj/structure/safe/proc/increment(num)
+	num += 1
+	if(num > 71)
+		num = 0
+	return num
+
+
+/obj/structure/safe/update_icon()
+	if(open)
+		icon_state = "[initial(icon_state)]-open"
+	else
+		icon_state = initial(icon_state)
+
+
+/obj/structure/safe/attack_hand(mob/user as mob)
+	user.set_machine(src)
+	var/dat = "<center>"
+	dat += "<a href='?src=\ref[src];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='?src=\ref[src];decrement=1'>-</a> [dial * 5] <a href='?src=\ref[src];increment=1'>+</a>"
+	if(open)
+		dat += "<table>"
+		for(var/i = contents.len, i>=1, i--)
+			var/obj/item/P = contents[i]
+			dat += "<tr><td><a href='?src=\ref[src];retrieve=\ref[P]'>[P.name]</a></td></tr>"
+		dat += "</table></center>"
+	user << browse("<html><head><title>[name]</title></head><body>[dat]</body></html>", "window=safe;size=350x300")
+
+
+/obj/structure/safe/Topic(href, href_list)
+	if(!ishuman(usr))	return
+	var/mob/living/carbon/human/user = usr
+
+	var/canhear = 0
+	if(istype(user.l_hand, /obj/item/clothing/tie/stethoscope) || istype(user.r_hand, /obj/item/clothing/tie/stethoscope))
+		canhear = 1
+
+	if(href_list["open"])
+		if(check_unlocked())
+			user << "<span class='notice'>You [open ? "close" : "open"] [src].</span>"
+			open = !open
+			update_icon()
+			updateUsrDialog()
+			return
+		else
+			user << "<span class='notice'>You can't [open ? "close" : "open"] [src], the lock is engaged!</span>"
+			return
+
+	if(href_list["decrement"])
+		dial = decrement(dial)
+		if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71)
+			tumbler_1_pos = decrement(tumbler_1_pos)
+			if(canhear)
+				user << "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from [src].</span>"
+			if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35)
+				tumbler_2_pos = decrement(tumbler_2_pos)
+				if(canhear)
+					user << "<span class='notice'>You hear a [pick("click", "chink", "clink")] from [src].</span>"
+			check_unlocked(user, canhear)
+		updateUsrDialog()
+		return
+
+	if(href_list["increment"])
+		dial = increment(dial)
+		if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71)
+			tumbler_1_pos = increment(tumbler_1_pos)
+			if(canhear)
+				user << "<span class='notice'>You hear a [pick("clack", "scrape", "clank")] from [src].</span>"
+			if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35)
+				tumbler_2_pos = increment(tumbler_2_pos)
+				if(canhear)
+					user << "<span class='notice'>You hear a [pick("click", "chink", "clink")] from [src].</span>"
+			check_unlocked(user, canhear)
+		updateUsrDialog()
+		return
+
+	if(href_list["retrieve"])
+		user << browse("", "window=safe") // Close the menu
+
+		var/obj/item/P = locate(href_list["retrieve"]) in src
+		if(open)
+			if(P && in_range(src, user))
+				user.put_in_hands(P)
+				updateUsrDialog()
+
+
+/obj/structure/safe/attackby(obj/item/I as obj, mob/user as mob)
+	if(open)
+		if(I.w_class + space <= maxspace)
+			space += I.w_class
+			user.drop_item()
+			I.loc = src
+			user << "<span class='notice'>You put [I] in [src].</span>"
+			updateUsrDialog()
+			return
+		else
+			user << "<span class='notice'>[I] won't fit in [src].</span>"
+			return
+	else
+		if(istype(I, /obj/item/clothing/tie/stethoscope))
+			user << "Hold [I] in one of your hands while you manipulate the dial."
+			return
+
+
+obj/structure/safe/blob_act()
+	return
+
+
+obj/structure/safe/ex_act(severity)
+	return
+
+
+obj/structure/safe/meteorhit(obj/O as obj)
+	return
+
+
+//FLOOR SAFES
+/obj/structure/safe/floor
+	name = "floor safe"
+	icon_state = "floorsafe"
+	density = 0
+	level = 1	//underfloor
+	layer = 2.5
+
+
+/obj/structure/safe/floor/initialize()
+	..()
+	var/turf/T = loc
+	hide(T.intact)
+
+
+/obj/structure/safe/floor/hide(var/intact)
+	invisibility = intact ? 101 : 0

code/game/objects/structures/signs.dm

@@ -0,0 +1,201 @@
+/obj/structure/sign
+	icon = 'icons/obj/decals.dmi'
+	anchored = 1
+	opacity = 0
+	density = 0
+	layer = 3.5
+
+/obj/structure/sign/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			del(src)
+			return
+		if(3.0)
+			del(src)
+			return
+		else
+	return
+
+/obj/structure/sign/blob_act()
+	del(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]."
+		var/obj/item/sign/S = new(src.loc)
+		S.name = name
+		S.desc = desc
+		S.icon_state = icon_state
+		//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
+		//S.icon = I.Scale(24, 24)
+		S.sign_state = icon_state
+		del(src)
+	else ..()
+
+/obj/item/sign
+	name = "sign"
+	desc = ""
+	icon = 'icons/obj/decals.dmi'
+	w_class = 3		//big
+	var/sign_state = ""
+
+/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob)	//construction
+	if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc))
+		var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
+		if(direction == "Cancel") return
+		var/obj/structure/sign/S = new(user.loc)
+		switch(direction)
+			if("North")
+				S.pixel_y = 32
+			if("East")
+				S.pixel_x = 32
+			if("South")
+				S.pixel_y = -32
+			if("West")
+				S.pixel_x = -32
+			else return
+		S.name = name
+		S.desc = desc
+		S.icon_state = sign_state
+		user << "You fasten \the [S] with your [tool]."
+		del(src)
+	else ..()
+
+/obj/structure/sign/double/map
+	name = "station map"
+	desc = "A framed picture of the station."
+
+/obj/structure/sign/double/map/left
+	icon_state = "map-left"
+
+/obj/structure/sign/double/map/right
+	icon_state = "map-right"
+
+/obj/structure/sign/securearea
+	name = "\improper SECURE AREA"
+	desc = "A warning sign which reads 'SECURE AREA'."
+	icon_state = "securearea"
+
+/obj/structure/sign/biohazard
+	name = "\improper BIOHAZARD"
+	desc = "A warning sign which reads 'BIOHAZARD'"
+	icon_state = "bio"
+
+/obj/structure/sign/electricshock
+	name = "\improper HIGH VOLTAGE"
+	desc = "A warning sign which reads 'HIGH VOLTAGE'"
+	icon_state = "shock"
+
+/obj/structure/sign/examroom
+	name = "\improper EXAM"
+	desc = "A guidance sign which reads 'EXAM ROOM'"
+	icon_state = "examroom"
+
+/obj/structure/sign/vacuum
+	name = "\improper HARD VACUUM AHEAD"
+	desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
+	icon_state = "space"
+
+/obj/structure/sign/deathsposal
+	name = "\improper DISPOSAL LEADS TO SPACE"
+	desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'"
+	icon_state = "deathsposal"
+
+/obj/structure/sign/pods
+	name = "\improper ESCAPE PODS"
+	desc = "A warning sign which reads 'ESCAPE PODS'"
+	icon_state = "pods"
+
+/obj/structure/sign/fire
+	name = "\improper DANGER: FIRE"
+	desc = "A warning sign which reads 'DANGER: FIRE'"
+	icon_state = "fire"
+
+/obj/structure/sign/nosmoking_1
+	name = "\improper NO SMOKING"
+	desc = "A warning sign which reads 'NO SMOKING'"
+	icon_state = "nosmoking"
+
+/obj/structure/sign/nosmoking_2
+	name = "\improper NO SMOKING"
+	desc = "A warning sign which reads 'NO SMOKING'"
+	icon_state = "nosmoking2"
+
+/obj/structure/sign/redcross
+	name = "medbay"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	icon_state = "redcross"
+
+/obj/structure/sign/greencross
+	name = "medbay"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	icon_state = "greencross"
+
+/obj/structure/sign/goldenplaque
+	name = "The Most Robust Men Award for Robustness"
+	desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."
+	icon_state = "goldenplaque"
+
+/obj/structure/sign/kiddieplaque
+	name = "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 retarded. Beneath the image, someone has scratched the word \"PACKETS\""
+	icon_state = "kiddieplaque"
+
+/obj/structure/sign/atmosplaque
+	name = "\improper FEA Atmospherics Division plaque"
+	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
+	icon_state = "atmosplaque"
+
+/obj/structure/sign/double/maltesefalcon	//The sign is 64x32, so it needs two tiles. ;3
+	name = "The Maltese Falcon"
+	desc = "The Maltese Falcon, Space Bar and Grill."
+
+/obj/structure/sign/double/maltesefalcon/left
+	icon_state = "maltesefalcon-left"
+
+/obj/structure/sign/double/maltesefalcon/right
+	icon_state = "maltesefalcon-right"
+
+/obj/structure/sign/science			//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
+	name = "\improper SCIENCE!"
+	desc = "A warning sign which reads 'SCIENCE!'"
+	icon_state = "science1"
+
+/obj/structure/sign/chemistry
+	name = "\improper CHEMISTRY"
+	desc = "A warning sign which reads 'CHEMISTRY'"
+	icon_state = "chemistry1"
+
+/obj/structure/sign/botany
+	name = "\improper HYDROPONICS"
+	desc = "A warning sign which reads 'HYDROPONICS'"
+	icon_state = "hydro1"
+
+/obj/structure/sign/directions/science
+	name = "\improper Science department"
+	desc = "A direction sign, pointing out which way Science department is."
+	icon_state = "direction_sci"
+
+/obj/structure/sign/directions/engineering
+	name = "\improper Engineering department"
+	desc = "A direction sign, pointing out which way Engineering department is."
+	icon_state = "direction_eng"
+
+/obj/structure/sign/directions/security
+	name = "\improper Security department"
+	desc = "A direction sign, pointing out which way Security department is."
+	icon_state = "direction_sec"
+
+/obj/structure/sign/directions/medical
+	name = "\improper Medical Bay"
+	desc = "A direction sign, pointing out which way Meducal Bay is."
+	icon_state = "direction_med"
+
+/obj/structure/sign/directions/evac
+	name = "\improper Escape Arm"
+	desc = "A direction sign, pointing out which way escape shuttle dock is."
+	icon_state = "direction_evac"

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

@@ -0,0 +1,71 @@
+//Alium nests. Essentially beds with an unbuckle delay that only aliums can buckle mobs to.
+
+/obj/structure/stool/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/stool/bed/nest/manual_unbuckle(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
+				unbuckle()
+			else
+				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(1200)
+					if(user && buckled_mob && user.buckled == src)
+						buckled_mob.pixel_y = 0
+						unbuckle()
+			src.add_fingerprint(user)
+	return
+
+/obj/structure/stool/bed/nest/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
+
+	if(istype(M,/mob/living/carbon/alien))
+		return
+	if(!istype(user,/mob/living/carbon/alien/humanoid))
+		return
+
+	unbuckle()
+
+	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.dir = src.dir
+	M.update_canmove()
+	M.pixel_y = 6
+	src.buckled_mob = M
+	src.add_fingerprint(user)
+	return
+
+/obj/structure/stool/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/stool/bed/nest/proc/healthcheck()
+	if(health <=0)
+		density = 0
+		del(src)
+	return

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

@@ -0,0 +1,162 @@
+/* Beds... get your mind out of the gutter, they're for sleeping!
+ * Contains:
+ * 		Beds
+ *		Roller beds
+ */
+
+/*
+ * Beds
+ */
+/obj/structure/stool/bed
+	name = "bed"
+	desc = "This is used to lie in, sleep in or strap on."
+	icon_state = "bed"
+	var/mob/living/buckled_mob
+
+/obj/structure/stool/bed/psych
+	name = "psych bed"
+	desc = "For prime comfort during psychiatric evaluations."
+	icon_state = "psychbed"
+
+/obj/structure/stool/bed/alien
+	name = "resting contraption"
+	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
+	icon_state = "abed"
+
+/obj/structure/stool/bed/Del()
+	unbuckle()
+	..()
+	return
+
+/obj/structure/stool/bed/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/structure/stool/bed/attack_hand(mob/user as mob)
+	manual_unbuckle(user)
+	return
+
+/obj/structure/stool/bed/MouseDrop(atom/over_object)
+	return
+
+/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
+	if(!istype(M)) return
+	buckle_mob(M, user)
+	return
+
+/obj/structure/stool/bed/proc/unbuckle()
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)	//this is probably unneccesary, but it doesn't hurt
+			buckled_mob.buckled = null
+			buckled_mob.anchored = initial(buckled_mob.anchored)
+			buckled_mob.update_canmove()
+			buckled_mob = null
+	return
+
+/obj/structure/stool/bed/proc/manual_unbuckle(mob/user as mob)
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)
+			if(buckled_mob != user)
+				buckled_mob.visible_message(\
+					"\blue [buckled_mob.name] was unbuckled by [user.name]!",\
+					"You were unbuckled from [src] by [user.name].",\
+					"You hear metal clanking")
+			else
+				buckled_mob.visible_message(\
+					"\blue [buckled_mob.name] unbuckled \himself!",\
+					"You unbuckle yourself from [src].",\
+					"You hear metal clanking")
+			unbuckle()
+			src.add_fingerprint(user)
+	return
+
+/obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob)
+	if (!ticker)
+		user << "You can't buckle anyone in before the game starts."
+	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
+		return
+
+	if (istype(M, /mob/living/carbon/slime))
+		user << "The [M] is too squishy to buckle in."
+		return
+
+	unbuckle()
+
+	if (M == usr)
+		M.visible_message(\
+			"\blue [M.name] buckles in!",\
+			"You buckle yourself to [src].",\
+			"You hear metal clanking")
+	else
+		M.visible_message(\
+			"\blue [M.name] is buckled in to [src] by [user.name]!",\
+			"You are buckled in to [src] by [user.name].",\
+			"You hear metal clanking")
+	M.buckled = src
+	M.loc = src.loc
+	M.dir = src.dir
+	M.update_canmove()
+	src.buckled_mob = M
+	src.add_fingerprint(user)
+	return
+
+/*
+ * Roller beds
+ */
+/obj/structure/stool/bed/roller
+	name = "roller bed"
+	icon = 'icons/obj/rollerbed.dmi'
+	icon_state = "down"
+	anchored = 0
+
+/obj/item/roller
+	name = "roller bed"
+	desc = "A collapsed roller bed that can be carried around."
+	icon = 'icons/obj/rollerbed.dmi'
+	icon_state = "folded"
+	w_class = 4.0 // Can't be put in backpacks. Oh well.
+
+	attack_self(mob/user)
+		var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
+		R.add_fingerprint(user)
+		del(src)
+
+/obj/structure/stool/bed/roller/Move()
+	..()
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)
+			buckled_mob.loc = src.loc
+		else
+			buckled_mob = null
+
+/obj/structure/stool/bed/roller/buckle_mob(mob/M as mob, mob/user as mob)
+	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.lying || user.stat || M.buckled || istype(usr, /mob/living/silicon/pai) )
+		return
+	M.pixel_y = 6
+	density = 1
+	icon_state = "up"
+	..()
+	return
+
+/obj/structure/stool/bed/roller/manual_unbuckle(mob/user as mob)
+	if(buckled_mob)
+		if(buckled_mob.buckled == src)	//this is probably unneccesary, but it doesn't hurt
+			buckled_mob.pixel_y = 0
+			buckled_mob.anchored = initial(buckled_mob.anchored)
+			buckled_mob.buckled = null
+			buckled_mob.update_canmove()
+			buckled_mob = null
+	density = 0
+	icon_state = "down"
+	..()
+	return
+
+/obj/structure/stool/bed/roller/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]")
+		new/obj/item/roller(get_turf(src))
+		spawn(0)
+			del(src)
+		return

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

@@ -0,0 +1,129 @@
+/obj/structure/stool/bed/chair	//YES, chairs are a type of bed, which are a type of stool. This works, believe me.	-Pete
+	name = "chair"
+	desc = "You sit in this. Either by will or force."
+	icon_state = "chair"
+
+/obj/structure/stool/MouseDrop(atom/over_object)
+	return
+
+/obj/structure/stool/bed/chair/New()
+	if(anchored)
+		src.verbs -= /atom/movable/verb/pull
+	..()
+	spawn(3)	//sorry. i don't think there's a better way to do this.
+		handle_rotation()
+	return
+
+/obj/structure/stool/bed/chair/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(istype(W, /obj/item/assembly/shock_kit))
+		var/obj/item/assembly/shock_kit/SK = W
+		if(!SK.status)
+			user << "<span class='notice'>[SK] is not ready to be attached!</span>"
+			return
+		user.drop_item()
+		var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc)
+		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+		E.dir = dir
+		E.part = SK
+		SK.loc = E
+		SK.master = E
+		del(src)
+
+/obj/structure/stool/bed/chair/attack_tk(mob/user as mob)
+	if(buckled_mob)
+		..()
+	else
+		rotate()
+	return
+
+/obj/structure/stool/bed/chair/proc/handle_rotation()	//making this into a seperate proc so office chairs can call it on Move()
+	if(src.dir == NORTH)
+		src.layer = FLY_LAYER
+	else
+		src.layer = OBJ_LAYER
+	if(buckled_mob)
+		buckled_mob.dir = dir
+
+/obj/structure/stool/bed/chair/verb/rotate()
+	set name = "Rotate Chair"
+	set category = "Object"
+	set src in oview(1)
+
+	if(config.ghost_interaction)
+		src.dir = turn(src.dir, 90)
+		handle_rotation()
+		return
+	else
+		if(istype(usr,/mob/living/simple_animal/mouse))
+			return
+		if(!usr || !isturf(usr.loc))
+			return
+		if(usr.stat || usr.restrained())
+			return
+
+		src.dir = turn(src.dir, 90)
+		handle_rotation()
+		return
+
+/obj/structure/stool/bed/chair/MouseDrop_T(mob/M as mob, mob/user as mob)
+	if(!istype(M)) return
+	buckle_mob(M, user)
+	return
+
+// Chair types
+/obj/structure/stool/bed/chair/wood/normal
+	icon_state = "wooden_chair"
+	name = "wooden chair"
+	desc = "Old is never too old to not be in fashion."
+
+/obj/structure/stool/bed/chair/wood/wings
+	icon_state = "wooden_chair_wings"
+	name = "wooden chair"
+	desc = "Old is never too old to not be in fashion."
+
+/obj/structure/stool/bed/chair/wood/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)
+		new /obj/item/stack/sheet/wood(src.loc)
+		del(src)
+	else
+		..()
+
+/obj/structure/stool/bed/chair/comfy
+	name = "comfy chair"
+	desc = "It looks comfy."
+
+/obj/structure/stool/bed/chair/comfy/brown
+	icon_state = "comfychair_brown"
+
+/obj/structure/stool/bed/chair/comfy/beige
+	icon_state = "comfychair_beige"
+
+/obj/structure/stool/bed/chair/comfy/teal
+	icon_state = "comfychair_teal"
+
+/obj/structure/stool/bed/chair/office
+	anchored = 0
+
+/obj/structure/stool/bed/chair/comfy/black
+	icon_state = "comfychair_black"
+
+/obj/structure/stool/bed/chair/comfy/lime
+	icon_state = "comfychair_lime"
+
+/obj/structure/stool/bed/chair/office/Move()
+	..()
+	if(buckled_mob)
+		buckled_mob.buckled = null //Temporary, so Move() succeeds.
+		var/moved = buckled_mob.Move(src.loc)
+		buckled_mob.buckled = src
+		if(!moved)
+			unbuckle()
+	handle_rotation()
+
+/obj/structure/stool/bed/chair/office/light
+	icon_state = "officechair_white"
+
+/obj/structure/stool/bed/chair/office/dark
+	icon_state = "officechair_dark"

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

@@ -0,0 +1,75 @@
+/obj/structure/stool
+	name = "stool"
+	desc = "Apply butt."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "stool"
+	anchored = 1.0
+	flags = FPRINT
+	pressure_resistance = 15
+
+/obj/structure/stool/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				del(src)
+				return
+		if(3.0)
+			if (prob(5))
+				del(src)
+				return
+	return
+
+/obj/structure/stool/blob_act()
+	if(prob(75))
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+
+/obj/structure/stool/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)
+		new /obj/item/stack/sheet/metal(src.loc)
+		del(src)
+	return
+
+/obj/structure/stool/MouseDrop(atom/over_object)
+	if (istype(over_object, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = over_object
+		if (H==usr && !H.restrained() && !H.stat && in_range(src, over_object))
+			var/obj/item/weapon/stool/S = new/obj/item/weapon/stool()
+			S.origin = src
+			src.loc = S
+			H.put_in_hands(S)
+			H.visible_message("\red [H] grabs [src] from the floor!", "\red You grab [src] from the floor!")
+
+/obj/item/weapon/stool
+	name = "stool"
+	desc = "Uh-hoh, bar is heating up."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "stool"
+	force = 10
+	throwforce = 10
+	w_class = 5.0
+	var/obj/structure/stool/origin = null
+
+/obj/item/weapon/stool/attack_self(mob/user as mob)
+	..()
+	origin.loc = get_turf(src)
+	user.u_equip(src)
+	user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
+	del src
+
+/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
+	if (prob(5) && istype(M,/mob/living))
+		user.visible_message("\red [user] breaks [src] over [M]'s back!.")
+		user.u_equip(src)
+		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
+		m.loc = get_turf(src)
+		del src
+		var/mob/living/T = M
+		T.Weaken(10)
+		T.apply_damage(20)
+		return
+	..()

code/game/objects/structures/tables_racks.dm

@@ -0,0 +1,660 @@
+/* Tables and Racks
+ * Contains:
+ *		Tables
+ *		Wooden tables
+ *		Reinforced tables
+ *		Racks
+ */
+
+
+/*
+ * Tables
+ */
+/obj/structure/table
+	name = "table"
+	desc = "A square piece of metal standing on four metal legs. It can not move."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "table"
+	density = 1
+	anchored = 1.0
+	layer = 2.8
+	throwpass = 1	//You can throw objects over this, despite it's density.")
+	var/parts = /obj/item/weapon/table_parts
+	var/flipped = 0
+	var/health = 100
+
+/obj/structure/table/proc/update_adjacent()
+	for(var/direction in list(1,2,4,8,5,6,9,10))
+		if(locate(/obj/structure/table,get_step(src,direction)))
+			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
+			T.update_icon()
+
+/obj/structure/table/New()
+	..()
+	for(var/obj/structure/table/T in src.loc)
+		if(T != src)
+			del(T)
+	update_icon()
+	update_adjacent()
+
+/obj/structure/table/Del()
+	update_adjacent()
+	..()
+
+/obj/structure/table/proc/destroy()
+	new parts(loc)
+	density = 0
+	del(src)
+
+/obj/structure/rack/proc/destroy()
+	new parts(loc)
+	density = 0
+	del(src)
+
+/obj/structure/table/update_icon()
+	spawn(2) //So it properly updates when deleting
+
+		if(flipped)
+			var/type = 0
+			var/tabledirs = 0
+			for(var/direction in list(turn(dir,90), turn(dir,-90)) )
+				var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
+				if (T && T.flipped && T.dir == src.dir)
+					type++
+					tabledirs |= direction
+			var/base = "table"
+			if (istype(src, /obj/structure/table/woodentable))
+				base = "wood"
+			if (istype(src, /obj/structure/table/reinforced))
+				base = "rtable"
+
+			icon_state = "[base]flip[type]"
+			if (type==1)
+				if (tabledirs & turn(dir,90))
+					icon_state = icon_state+"-"
+				if (tabledirs & turn(dir,-90))
+					icon_state = icon_state+"+"
+			return 1
+
+		var/dir_sum = 0
+		for(var/direction in list(1,2,4,8,5,6,9,10))
+			var/skip_sum = 0
+			for(var/obj/structure/window/W in src.loc)
+				if(W.dir == direction) //So smooth tables don't go smooth through windows
+					skip_sum = 1
+					continue
+			var/inv_direction //inverse direction
+			switch(direction)
+				if(1)
+					inv_direction = 2
+				if(2)
+					inv_direction = 1
+				if(4)
+					inv_direction = 8
+				if(8)
+					inv_direction = 4
+				if(5)
+					inv_direction = 10
+				if(6)
+					inv_direction = 9
+				if(9)
+					inv_direction = 6
+				if(10)
+					inv_direction = 5
+			for(var/obj/structure/window/W in get_step(src,direction))
+				if(W.dir == inv_direction) //So smooth tables don't go smooth through windows when the window is on the other table's tile
+					skip_sum = 1
+					continue
+			if(!skip_sum) //means there is a window between the two tiles in this direction
+				var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
+				if(T && !T.flipped)
+					if(direction <5)
+						dir_sum += direction
+					else
+						if(direction == 5)	//This permits the use of all table directions. (Set up so clockwise around the central table is a higher value, from north)
+							dir_sum += 16
+						if(direction == 6)
+							dir_sum += 32
+						if(direction == 8)	//Aherp and Aderp.  Jezes I am stupid.  -- SkyMarshal
+							dir_sum += 8
+						if(direction == 10)
+							dir_sum += 64
+						if(direction == 9)
+							dir_sum += 128
+
+		var/table_type = 0 //stand_alone table
+		if(dir_sum%16 in cardinal)
+			table_type = 1 //endtable
+			dir_sum %= 16
+		if(dir_sum%16 in list(3,12))
+			table_type = 2 //1 tile thick, streight table
+			if(dir_sum%16 == 3) //3 doesn't exist as a dir
+				dir_sum = 2
+			if(dir_sum%16 == 12) //12 doesn't exist as a dir.
+				dir_sum = 4
+		if(dir_sum%16 in list(5,6,9,10))
+			if(locate(/obj/structure/table,get_step(src.loc,dir_sum%16)))
+				table_type = 3 //full table (not the 1 tile thick one, but one of the 'tabledir' tables)
+			else
+				table_type = 2 //1 tile thick, corner table (treated the same as streight tables in code later on)
+			dir_sum %= 16
+		if(dir_sum%16 in list(13,14,7,11)) //Three-way intersection
+			table_type = 5 //full table as three-way intersections are not sprited, would require 64 sprites to handle all combinations.  TOO BAD -- SkyMarshal
+			switch(dir_sum%16)	//Begin computation of the special type tables.  --SkyMarshal
+				if(7)
+					if(dir_sum == 23)
+						table_type = 6
+						dir_sum = 8
+					else if(dir_sum == 39)
+						dir_sum = 4
+						table_type = 6
+					else if(dir_sum == 55 || dir_sum == 119 || dir_sum == 247 || dir_sum == 183)
+						dir_sum = 4
+						table_type = 3
+					else
+						dir_sum = 4
+				if(11)
+					if(dir_sum == 75)
+						dir_sum = 5
+						table_type = 6
+					else if(dir_sum == 139)
+						dir_sum = 9
+						table_type = 6
+					else if(dir_sum == 203 || dir_sum == 219 || dir_sum == 251 || dir_sum == 235)
+						dir_sum = 8
+						table_type = 3
+					else
+						dir_sum = 8
+				if(13)
+					if(dir_sum == 29)
+						dir_sum = 10
+						table_type = 6
+					else if(dir_sum == 141)
+						dir_sum = 6
+						table_type = 6
+					else if(dir_sum == 189 || dir_sum == 221 || dir_sum == 253 || dir_sum == 157)
+						dir_sum = 1
+						table_type = 3
+					else
+						dir_sum = 1
+				if(14)
+					if(dir_sum == 46)
+						dir_sum = 1
+						table_type = 6
+					else if(dir_sum == 78)
+						dir_sum = 2
+						table_type = 6
+					else if(dir_sum == 110 || dir_sum == 254 || dir_sum == 238 || dir_sum == 126)
+						dir_sum = 2
+						table_type = 3
+					else
+						dir_sum = 2 //These translate the dir_sum to the correct dirs from the 'tabledir' icon_state.
+		if(dir_sum%16 == 15)
+			table_type = 4 //4-way intersection, the 'middle' table sprites will be used.
+
+		if(istype(src,/obj/structure/table/reinforced))
+			switch(table_type)
+				if(0)
+					icon_state = "reinf_table"
+				if(1)
+					icon_state = "reinf_1tileendtable"
+				if(2)
+					icon_state = "reinf_1tilethick"
+				if(3)
+					icon_state = "reinf_tabledir"
+				if(4)
+					icon_state = "reinf_middle"
+				if(5)
+					icon_state = "reinf_tabledir2"
+				if(6)
+					icon_state = "reinf_tabledir3"
+		else if(istype(src,/obj/structure/table/woodentable))
+			switch(table_type)
+				if(0)
+					icon_state = "wood_table"
+				if(1)
+					icon_state = "wood_1tileendtable"
+				if(2)
+					icon_state = "wood_1tilethick"
+				if(3)
+					icon_state = "wood_tabledir"
+				if(4)
+					icon_state = "wood_middle"
+				if(5)
+					icon_state = "wood_tabledir2"
+				if(6)
+					icon_state = "wood_tabledir3"
+		else
+			switch(table_type)
+				if(0)
+					icon_state = "table"
+				if(1)
+					icon_state = "table_1tileendtable"
+				if(2)
+					icon_state = "table_1tilethick"
+				if(3)
+					icon_state = "tabledir"
+				if(4)
+					icon_state = "table_middle"
+				if(5)
+					icon_state = "tabledir2"
+				if(6)
+					icon_state = "tabledir3"
+		if (dir_sum in list(1,2,4,8,5,6,9,10))
+			dir = dir_sum
+		else
+			dir = 2
+
+/obj/structure/table/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			if (prob(50))
+				del(src)
+				return
+		if(3.0)
+			if (prob(25))
+				destroy()
+		else
+	return
+
+
+/obj/structure/table/blob_act()
+	if(prob(75))
+		destroy()
+
+/obj/structure/table/attack_paw(mob/user)
+	if(HULK in user.mutations)
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		visible_message("<span class='danger'>[user] smashes the [src] apart!</span>")
+		destroy()
+
+
+/obj/structure/table/attack_alien(mob/user)
+	visible_message("<span class='danger'>[user] slices [src] apart!</span>")
+
+/obj/structure/table/attack_animal(mob/living/simple_animal/user)
+	if(user.wall_smash)
+		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		destroy()
+
+
+
+/obj/structure/table/attack_hand(mob/user)
+	if(HULK in user.mutations)
+		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		destroy()
+
+/obj/structure/table/attack_tk() // no telehulk sorry
+	return
+
+/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0)) return 1
+	if(istype(mover,/obj/item/projectile))
+		return (check_cover(mover,target))
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	if (flipped)
+		if (get_dir(loc, target) == dir)
+			return !density
+		else
+			return 1
+	return 0
+
+//checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops.
+/obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from)
+	var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc))
+	if (get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close
+		return 1
+	if (get_turf(P.original) == cover)
+		var/chance = 20
+		if (ismob(P.original))
+			var/mob/M = P.original
+			if (M.lying)
+				chance += 20				//Lying down lets you catch less bullets
+		if(flipped)
+			if(get_dir(loc, from) == dir)	//Flipped tables catch mroe bullets
+				chance += 20
+			else
+				return 1					//But only from one side
+		if(prob(chance))
+			health -= P.damage/2
+			if (health > 0)
+				visible_message("<span class='warning'>[P] hits \the [src]!</span>")
+				return 0
+			else
+				visible_message("<span class='warning'>[src] breaks down!</span>")
+				destroy()
+				return 1
+	return 1
+
+/obj/structure/table/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSTABLE))
+		return 1
+	if (flipped)
+		if (get_dir(loc, target) == dir)
+			return !density
+		else
+			return 1
+	return 1
+
+/obj/structure/table/MouseDrop_T(obj/O as obj, mob/user as mob)
+	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+		return
+	if(isrobot(user))
+		return
+	user.drop_item()
+	if (O.loc != src.loc)
+		step(O, get_dir(O, src))
+	return
+
+
+/obj/structure/table/attackby(obj/item/W as obj, mob/user as mob)
+	if (!W) return
+	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))
+			var/mob/living/M = G.affecting
+			if (G.state < 2)
+				if(user.a_intent == "hurt")
+					if (prob(15))	M.Weaken(5)
+					M.apply_damage(8,def_zone = "head")
+					visible_message("\red [G.assailant] slams [G.affecting]'s face against \the [src]!")
+					playsound(src.loc, 'sound/weapons/tablehit1.ogg', 50, 1)
+				else
+					user << "\red You need a better grip to do that!"
+					return
+			else
+				G.affecting.loc = src.loc
+				G.affecting.Weaken(5)
+				visible_message("\red [G.assailant] puts [G.affecting] on \the [src].")
+			del(W)
+			return
+
+	if (istype(W, /obj/item/weapon/wrench))
+		user << "\blue Now disassembling table"
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		if(do_after(user,50))
+			destroy()
+		return
+
+	if(isrobot(user))
+		return
+
+	if(istype(W, /obj/item/weapon/melee/energy/blade))
+		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+		spark_system.set_up(5, 0, src.loc)
+		spark_system.start()
+		playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+		playsound(src.loc, "sparks", 50, 1)
+		for(var/mob/O in viewers(user, 4))
+			O.show_message("\blue The [src] was sliced apart by [user]!", 1, "\red You hear [src] coming apart.", 2)
+		destroy()
+
+	user.drop_item(src)
+	return
+
+/obj/structure/table/proc/straight_table_check(var/direction)
+	var/obj/structure/table/T
+	for(var/angle in list(-90,90))
+		T = locate() in get_step(src.loc,turn(direction,angle))
+		if(T && !T.flipped)
+			return 0
+	T = locate() in get_step(src.loc,direction)
+	if (!T || T.flipped)
+		return 1
+	if (istype(T,/obj/structure/table/reinforced/))
+		var/obj/structure/table/reinforced/R = T
+		if (R.status == 2)
+			return 0
+	return T.straight_table_check(direction)
+
+/obj/structure/table/verb/can_touch(var/mob/user)
+	if (!user)
+		return 0
+	if (user.stat)	//zombie goasts go away
+		return 0
+	if (issilicon(user))
+		user << "<span class='notice'>You need hands for this.</span>"
+		return 0
+	return 1
+
+/obj/structure/table/verb/do_flip()
+	set name = "Flip table"
+	set desc = "Flips a non-reinforced table"
+	set category = "Object"
+	set src in oview(1)
+	if(ismouse(usr))
+		return
+	if (!can_touch(usr))
+		return
+	if(!flip(get_cardinal_dir(usr,src)))
+		usr << "<span class='notice'>It won't budge.</span>"
+	else
+		usr.visible_message("<span class='warning'>[usr] flips \the [src]!</span>")
+		return
+
+/obj/structure/table/proc/unflipping_check(var/direction)
+	for(var/mob/M in oview(src,0))
+		return 0
+
+	var/list/L = list()
+	if(direction)
+		L.Add(direction)
+	else
+		L.Add(turn(src.dir,-90))
+		L.Add(turn(src.dir,90))
+	for(var/new_dir in L)
+		var/obj/structure/table/T = locate() in get_step(src.loc,new_dir)
+		if(T)
+			if(T.flipped && T.dir == src.dir && !T.unflipping_check(new_dir))
+				return 0
+	return 1
+
+/obj/structure/table/proc/do_put()
+	set name = "Put table back"
+	set desc = "Puts flipped table back"
+	set category = "Object"
+	set src in oview(1)
+
+	if (!can_touch(usr))
+		return
+
+	if (!unflipping_check())
+		usr << "<span class='notice'>It won't budge.</span>"
+		return
+	unflip()
+
+/obj/structure/table/proc/flip(var/direction)
+	if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
+		return 0
+
+	verbs -=/obj/structure/table/verb/do_flip
+	verbs +=/obj/structure/table/proc/do_put
+
+	var/list/targets = list(get_step(src,dir),get_step(src,turn(dir, 45)),get_step(src,turn(dir, -45)))
+	for (var/atom/movable/A in get_turf(src))
+		if (!A.anchored)
+			spawn(0)
+				A.throw_at(pick(targets),1,1)
+
+	dir = direction
+	if(dir != NORTH)
+		layer = 5
+	flipped = 1
+	flags |= ON_BORDER
+	for(var/D in list(turn(direction, 90), turn(direction, -90)))
+		var/obj/structure/table/T = locate() in get_step(src,D)
+		if(T && !T.flipped)
+			T.flip(direction)
+	update_icon()
+	update_adjacent()
+
+	return 1
+
+/obj/structure/table/proc/unflip()
+	verbs -=/obj/structure/table/proc/do_put
+	verbs +=/obj/structure/table/verb/do_flip
+
+	layer = initial(layer)
+	flipped = 0
+	flags &= ~ON_BORDER
+	for(var/D in list(turn(dir, 90), turn(dir, -90)))
+		var/obj/structure/table/T = locate() in get_step(src.loc,D)
+		if(T && T.flipped && T.dir == src.dir)
+			T.unflip()
+	update_icon()
+	update_adjacent()
+
+	return 1
+
+/*
+ * Wooden tables
+ */
+/obj/structure/table/woodentable
+	name = "wooden table"
+	desc = "Do not apply fire to this. Rumour says it burns easily."
+	icon_state = "wood_table"
+	parts = /obj/item/weapon/table_parts/wood
+	health = 50
+/*
+ * Reinforced tables
+ */
+/obj/structure/table/reinforced
+	name = "reinforced table"
+	desc = "A version of the four legged table. It is stronger."
+	icon_state = "reinf_table"
+	health = 200
+	var/status = 2
+	parts = /obj/item/weapon/table_parts/reinforced
+
+/obj/structure/table/reinforced/flip(var/direction)
+	if (status == 2)
+		return 0
+	else
+		return ..()
+
+/obj/structure/table/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.remove_fuel(0, user))
+			if(src.status == 2)
+				user << "\blue Now weakening the reinforced table"
+				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+				if (do_after(user, 50))
+					if(!src || !WT.isOn()) return
+					user << "\blue Table weakened"
+					src.status = 1
+			else
+				user << "\blue Now strengthening the reinforced table"
+				playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
+				if (do_after(user, 50))
+					if(!src || !WT.isOn()) return
+					user << "\blue Table strengthened"
+					src.status = 2
+			return
+		return
+
+	if (istype(W, /obj/item/weapon/wrench))
+		if(src.status == 2)
+			return
+
+	..()
+
+/*
+ * Racks
+ */
+/obj/structure/rack
+	name = "rack"
+	desc = "Different from the Middle Ages version."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "rack"
+	density = 1
+	flags = FPRINT
+	anchored = 1.0
+	throwpass = 1	//You can throw objects over this, despite it's density.
+	var/parts = /obj/item/weapon/rack_parts
+
+/obj/structure/rack/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+		if(2.0)
+			del(src)
+			if(prob(50))
+				new /obj/item/weapon/rack_parts(src.loc)
+		if(3.0)
+			if(prob(25))
+				del(src)
+				new /obj/item/weapon/rack_parts(src.loc)
+
+/obj/structure/rack/blob_act()
+	if(prob(75))
+		del(src)
+		return
+	else if(prob(50))
+		new /obj/item/weapon/rack_parts(src.loc)
+		del(src)
+		return
+
+/obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(air_group || (height==0)) return 1
+	if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
+		return 1
+	if(istype(mover) && mover.checkpass(PASSTABLE))
+		return 1
+	else
+		return 0
+
+/obj/structure/rack/MouseDrop_T(obj/O as obj, mob/user as mob)
+	if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
+		return
+	if(isrobot(user))
+		return
+	user.drop_item()
+	if (O.loc != src.loc)
+		step(O, get_dir(O, src))
+	return
+
+/obj/structure/rack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/wrench))
+		new /obj/item/weapon/rack_parts( src.loc )
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		del(src)
+		return
+	if(isrobot(user))
+		return
+	user.drop_item()
+	if(W && W.loc)	W.loc = src.loc
+	return
+
+/obj/structure/rack/meteorhit(obj/O as obj)
+	del(src)
+
+
+/obj/structure/table/attack_hand(mob/user)
+	if(HULK in user.mutations)
+		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		destroy()
+
+/obj/structure/rack/attack_paw(mob/user)
+	if(HULK in user.mutations)
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		destroy()
+
+/obj/structure/rack/attack_alien(mob/user)
+	visible_message("<span class='danger'>[user] slices [src] apart!</span>")
+	destroy()
+
+/obj/structure/rack/attack_animal(mob/living/simple_animal/user)
+	if(user.wall_smash)
+		visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
+		destroy()
+
+/obj/structure/rack/attack_tk() // no telehulk sorry
+	return

code/game/objects/structures/tank_dispenser.dm

@@ -0,0 +1,111 @@
+/obj/structure/dispenser
+	name = "tank storage unit"
+	desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten plasma tanks."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "dispenser"
+	density = 1
+	anchored = 1.0
+	var/oxygentanks = 10
+	var/plasmatanks = 10
+	var/list/oxytanks = list()	//sorry for the similar var names
+	var/list/platanks = list()
+
+
+/obj/structure/dispenser/oxygen
+	plasmatanks = 0
+
+/obj/structure/dispenser/plasma
+	oxygentanks = 0
+
+
+/obj/structure/dispenser/New()
+	update_icon()
+
+
+/obj/structure/dispenser/update_icon()
+	overlays.Cut()
+	switch(oxygentanks)
+		if(1 to 3)	overlays += "oxygen-[oxygentanks]"
+		if(4 to INFINITY) overlays += "oxygen-4"
+	switch(plasmatanks)
+		if(1 to 4)	overlays += "plasma-[plasmatanks]"
+		if(5 to INFINITY) overlays += "plasma-5"
+
+
+/obj/structure/dispenser/attack_hand(mob/user as mob)
+	user.set_machine(src)
+	var/dat = "[src]<br><br>"
+	dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"
+	dat += "Plasma tanks: [plasmatanks] - [plasmatanks ? "<A href='?src=\ref[src];plasma=1'>Dispense</A>" : "empty"]"
+	user << browse(dat, "window=dispenser")
+	onclose(user, "dispenser")
+	return
+
+
+/obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic))
+		if(oxygentanks < 10)
+			user.drop_item()
+			I.loc = src
+			oxytanks.Add(I)
+			oxygentanks++
+			user << "<span class='notice'>You put [I] in [src].</span>"
+		else
+			user << "<span class='notice'>[src] is full.</span>"
+		updateUsrDialog()
+		return
+	if(istype(I, /obj/item/weapon/tank/plasma))
+		if(plasmatanks < 10)
+			user.drop_item()
+			I.loc = src
+			platanks.Add(I)
+			plasmatanks++
+			user << "<span class='notice'>You put [I] in [src].</span>"
+		else
+			user << "<span class='notice'>[src] is full.</span>"
+		updateUsrDialog()
+		return
+	if(istype(I, /obj/item/weapon/wrench))
+		if(anchored)
+			user << "<span class='notice'>You lean down and unwrench [src].</span>"
+			anchored = 0
+		else
+			user << "<span class='notice'>You wrench [src] into place.</span>"
+			anchored = 1
+		return
+
+/obj/structure/dispenser/Topic(href, href_list)
+	if(usr.stat || usr.restrained())
+		return
+	if(Adjacent(usr))
+		usr.set_machine(src)
+		if(href_list["oxygen"])
+			if(oxygentanks > 0)
+				var/obj/item/weapon/tank/oxygen/O
+				if(oxytanks.len == oxygentanks)
+					O = oxytanks[1]
+					oxytanks.Remove(O)
+				else
+					O = new /obj/item/weapon/tank/oxygen(loc)
+				O.loc = loc
+				usr << "<span class='notice'>You take [O] out of [src].</span>"
+				oxygentanks--
+				update_icon()
+		if(href_list["plasma"])
+			if(plasmatanks > 0)
+				var/obj/item/weapon/tank/plasma/P
+				if(platanks.len == plasmatanks)
+					P = platanks[1]
+					platanks.Remove(P)
+				else
+					P = new /obj/item/weapon/tank/plasma(loc)
+				P.loc = loc
+				usr << "<span class='notice'>You take [P] out of [src].</span>"
+				plasmatanks--
+				update_icon()
+		add_fingerprint(usr)
+		updateUsrDialog()
+	else
+		usr << browse(null, "window=dispenser")
+		return
+	return

code/game/objects/structures/target_stake.dm

@@ -0,0 +1,52 @@
+// Basically they are for the firing range
+/obj/structure/target_stake
+	name = "target stake"
+	desc = "A thin platform with negatively-magnetized wheels."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "target_stake"
+	density = 1
+	flags = CONDUCT
+	var/obj/item/target/pinned_target // the current pinned target
+
+	Move()
+		..()
+		// Move the pinned target along with the stake
+		if(pinned_target in view(3, src))
+			pinned_target.loc = loc
+
+		else // Sanity check: if the pinned target can't be found in immediate view
+			pinned_target = null
+			density = 1
+
+	attackby(obj/item/W as obj, mob/user as mob)
+		// Putting objects on the stake. Most importantly, targets
+		if(pinned_target)
+			return // get rid of that pinned target first!
+
+		if(istype(W, /obj/item/target))
+			density = 0
+			W.density = 1
+			user.drop_item(src)
+			W.loc = loc
+			W.layer = 3.1
+			pinned_target = W
+			user << "You slide the target into the stake."
+		return
+
+	attack_hand(mob/user as mob)
+		// taking pinned targets off!
+		if(pinned_target)
+			density = 1
+			pinned_target.density = 0
+			pinned_target.layer = OBJ_LAYER
+
+			pinned_target.loc = user.loc
+			if(ishuman(user))
+				if(!user.get_active_hand())
+					user.put_in_hands(pinned_target)
+					user << "You take the target out of the stake."
+			else
+				pinned_target.loc = get_turf_loc(user)
+				user << "You take the target out of the stake."
+
+			pinned_target = null

code/game/objects/structures/transit_tubes.dm

@@ -0,0 +1,642 @@
+
+// Basic transit tubes. Straight pieces, curved sections,
+//  and basic splits/joins (no routing logic).
+// Mappers: you can use "Generate Instances from Icon-states"
+//  to get the different pieces.
+/obj/structure/transit_tube
+	icon = 'icons/obj/pipes/transit_tube.dmi'
+	icon_state = "E-W"
+	density = 1
+	layer = 3.1
+	anchored = 1.0
+	var/list/tube_dirs = null
+	var/exit_delay = 2
+	var/enter_delay = 1
+
+	// alldirs in global.dm is the same list of directions, but since
+	//  the specific order matters to get a usable icon_state, it is
+	//  copied here so that, in the unlikely case that alldirs is changed,
+	//  this continues to work.
+	var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
+
+
+// A place where tube pods stop, and people can get in or out.
+// Mappers: use "Generate Instances from Directions" for this
+//  one.
+/obj/structure/transit_tube/station
+	icon = 'icons/obj/pipes/transit_tube_station.dmi'
+	icon_state = "closed"
+	exit_delay = 2
+	enter_delay = 3
+	var/pod_moving = 0
+	var/automatic_launch_time = 100
+
+	var/const/OPEN_DURATION = 6
+	var/const/CLOSE_DURATION = 6
+
+
+
+/obj/structure/transit_tube_pod
+	icon = 'icons/obj/pipes/transit_tube_pod.dmi'
+	icon_state = "pod"
+	animate_movement = FORWARD_STEPS
+	anchored = 1.0
+	density = 1
+	var/moving = 0
+	var/datum/gas_mixture/air_contents = new()
+
+
+
+/obj/structure/transit_tube_pod/Del()
+	for(var/atom/movable/AM in contents)
+		AM.loc = loc
+
+	..()
+
+
+
+// When destroyed by explosions, properly handle contents.
+obj/structure/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/atom/movable/AM in contents)
+				AM.loc = loc
+				AM.ex_act(severity++)
+
+			del(src)
+			return
+		if(2.0)
+			if(prob(50))
+				for(var/atom/movable/AM in contents)
+					AM.loc = loc
+					AM.ex_act(severity++)
+
+				del(src)
+				return
+		if(3.0)
+			return
+
+
+
+/obj/structure/transit_tube_pod/New(loc)
+	..(loc)
+
+	air_contents.oxygen = MOLES_O2STANDARD * 2
+	air_contents.nitrogen = MOLES_N2STANDARD
+	air_contents.temperature = T20C
+
+	// Give auto tubes time to align before trying to start moving
+	spawn(5)
+		follow_tube()
+
+
+
+/obj/structure/transit_tube/New(loc)
+	..(loc)
+
+	if(tube_dirs == null)
+		init_dirs()
+
+
+
+/obj/structure/transit_tube/Bumped(mob/AM as mob|obj)
+	var/obj/structure/transit_tube/T = locate() in AM.loc
+	if(T)
+		AM << "<span class='warning'>The tube's support pylons block your way.</span>"
+		return ..()
+	else
+		AM.loc = src.loc
+		AM << "<span class='info'>You slip under the tube.</span>"
+
+
+/obj/structure/transit_tube/station/New(loc)
+	..(loc)
+
+
+
+/obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
+	if(!pod_moving && icon_state == "open" && istype(AM, /mob))
+		for(var/obj/structure/transit_tube_pod/pod in loc)
+			if(!pod.moving && pod.dir in directions())
+				AM.loc = pod
+				return
+
+
+
+/obj/structure/transit_tube/station/attack_hand(mob/user as mob)
+	if(!pod_moving)
+		for(var/obj/structure/transit_tube_pod/pod in loc)
+			if(!pod.moving && pod.dir in directions())
+				if(icon_state == "closed")
+					open_animation()
+
+				else if(icon_state == "open")
+					close_animation()
+
+
+
+/obj/structure/transit_tube/station/proc/open_animation()
+	if(icon_state == "closed")
+		icon_state = "opening"
+		spawn(OPEN_DURATION)
+			if(icon_state == "opening")
+				icon_state = "open"
+
+
+
+/obj/structure/transit_tube/station/proc/close_animation()
+	if(icon_state == "open")
+		icon_state = "closing"
+		spawn(CLOSE_DURATION)
+			if(icon_state == "closing")
+				icon_state = "closed"
+
+
+
+/obj/structure/transit_tube/station/proc/launch_pod()
+	for(var/obj/structure/transit_tube_pod/pod in loc)
+		if(!pod.moving && pod.dir in directions())
+			spawn(5)
+				pod_moving = 1
+				close_animation()
+				sleep(CLOSE_DURATION + 2)
+
+				//reverse directions for automated cycling
+				var/turf/next_loc = get_step(loc, pod.dir)
+				var/obj/structure/transit_tube/nexttube
+				for(var/obj/structure/transit_tube/tube in next_loc)
+					if(tube.has_entrance(pod.dir))
+						nexttube = tube
+						break
+				if(!nexttube)
+					pod.dir = turn(pod.dir, 180)
+
+				if(icon_state == "closed" && pod)
+					pod.follow_tube()
+
+				pod_moving = 0
+
+			return
+
+
+
+// Called to check if a pod should stop upon entering this tube.
+/obj/structure/transit_tube/proc/should_stop_pod(pod, from_dir)
+	return 0
+
+
+
+/obj/structure/transit_tube/station/should_stop_pod(pod, from_dir)
+	return 1
+
+
+
+// Called when a pod stops in this tube section.
+/obj/structure/transit_tube/proc/pod_stopped(pod, from_dir)
+	return
+
+
+
+/obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir)
+	pod_moving = 1
+	spawn(5)
+		open_animation()
+		sleep(OPEN_DURATION + 2)
+		pod_moving = 0
+		pod.mix_air()
+
+		if(automatic_launch_time)
+			var/const/wait_step = 5
+			var/i = 0
+			while(i < automatic_launch_time)
+				sleep(wait_step)
+				i += wait_step
+
+				if(pod_moving || icon_state != "open")
+					return
+
+			launch_pod()
+
+
+
+// Returns a /list of directions this tube section can connect to.
+//  Tubes that have some sort of logic or changing direction might
+//  override it with additional logic.
+/obj/structure/transit_tube/proc/directions()
+	return tube_dirs
+
+
+
+/obj/structure/transit_tube/proc/has_entrance(from_dir)
+	from_dir = turn(from_dir, 180)
+
+	for(var/direction in directions())
+		if(direction == from_dir)
+			return 1
+
+	return 0
+
+
+
+/obj/structure/transit_tube/proc/has_exit(in_dir)
+	for(var/direction in directions())
+		if(direction == in_dir)
+			return 1
+
+	return 0
+
+
+
+// Searches for an exit direction within 45 degrees of the
+//  specified dir. Returns that direction, or 0 if none match.
+/obj/structure/transit_tube/proc/get_exit(in_dir)
+	var/near_dir = 0
+	var/in_dir_cw = turn(in_dir, -45)
+	var/in_dir_ccw = turn(in_dir, 45)
+
+	for(var/direction in directions())
+		if(direction == in_dir)
+			return direction
+
+		else if(direction == in_dir_cw)
+			near_dir = direction
+
+		else if(direction == in_dir_ccw)
+			near_dir = direction
+
+	return near_dir
+
+
+
+// Return how many BYOND ticks to wait before entering/exiting
+//  the tube section. Default action is to return the value of
+//  a var, which wouldn't need a proc, but it makes it possible
+//  for later tube types to interact in more interesting ways
+//  such as being very fast in one direction, but slow in others
+/obj/structure/transit_tube/proc/exit_delay(pod, to_dir)
+	return exit_delay
+
+/obj/structure/transit_tube/proc/enter_delay(pod, to_dir)
+	return enter_delay
+
+
+
+/obj/structure/transit_tube_pod/proc/follow_tube()
+	if(moving)
+		return
+
+	moving = 1
+
+	spawn()
+		var/obj/structure/transit_tube/current_tube = null
+		var/next_dir
+		var/next_loc
+		var/last_delay = 0
+		var/exit_delay
+
+		for(var/obj/structure/transit_tube/tube in loc)
+			if(tube.has_exit(dir))
+				current_tube = tube
+				break
+
+		while(current_tube)
+			next_dir = current_tube.get_exit(dir)
+
+			if(!next_dir)
+				break
+
+			exit_delay = current_tube.exit_delay(src, dir)
+			last_delay += exit_delay
+
+			sleep(exit_delay)
+
+			next_loc = get_step(loc, next_dir)
+
+			current_tube = null
+			for(var/obj/structure/transit_tube/tube in next_loc)
+				if(tube.has_entrance(next_dir))
+					current_tube = tube
+					break
+
+			if(current_tube == null)
+				dir = next_dir
+				Move(get_step(loc, dir)) // Allow collisions when leaving the tubes.
+				break
+
+			last_delay = current_tube.enter_delay(src, next_dir)
+			sleep(last_delay)
+			dir = next_dir
+			loc = next_loc // When moving from one tube to another, skip collision and such.
+			density = current_tube.density
+
+			if(current_tube && current_tube.should_stop_pod(src, next_dir))
+				current_tube.pod_stopped(src, dir)
+				break
+
+		density = 1
+
+		// If the pod is no longer in a tube, move in a line until stopped or slowed to a halt.
+		//  /turf/inertial_drift appears to only work on mobs, and re-implementing some of the
+		//  logic allows a gradual slowdown and eventual stop when passing over non-space turfs.
+		if(!current_tube && last_delay <= 10)
+			do
+				sleep(last_delay)
+
+				if(!istype(loc, /turf/space))
+					last_delay++
+
+				if(last_delay > 10)
+					break
+
+			while(isturf(loc) && Move(get_step(loc, dir)))
+
+		moving = 0
+
+
+// Should I return a copy here? If the caller edits or del()s the returned
+//  datum, there might be problems if I don't...
+/obj/structure/transit_tube_pod/return_air()
+	var/datum/gas_mixture/GM = new()
+	GM.oxygen			= air_contents.oxygen
+	GM.carbon_dioxide	= air_contents.carbon_dioxide
+	GM.nitrogen			= air_contents.nitrogen
+	GM.toxins			= air_contents.toxins
+	GM.temperature		= air_contents.temperature
+	return GM
+
+// For now, copying what I found in an unused FEA file (and almost identical in a
+//  used ZAS file). Means that assume_air and remove_air don't actually alter the
+//  air contents.
+/obj/structure/transit_tube_pod/assume_air(datum/gas_mixture/giver)
+	return air_contents.merge(giver)
+
+/obj/structure/transit_tube_pod/remove_air(amount)
+	return air_contents.remove(amount)
+
+
+
+// Called when a pod arrives at, and before a pod departs from a station,
+//  giving it a chance to mix its internal air supply with the turf it is
+//  currently on.
+/obj/structure/transit_tube_pod/proc/mix_air()
+	var/datum/gas_mixture/environment = loc.return_air()
+	var/env_pressure = environment.return_pressure()
+	var/int_pressure = air_contents.return_pressure()
+	var/total_pressure = env_pressure + int_pressure
+
+	if(total_pressure == 0)
+		return
+
+	// Math here: Completely made up, not based on realistic equasions.
+	//  Goal is to balance towards equal pressure, but ensure some gas
+	//  transfer in both directions regardless.
+	// Feel free to rip this out and replace it with something better,
+	//  I don't really know muhch about how gas transfer rates work in
+	//  SS13.
+	var/transfer_in = max(0.1, 0.5 * (env_pressure - int_pressure) / total_pressure)
+	var/transfer_out = max(0.1, 0.3 * (int_pressure - env_pressure) / total_pressure)
+
+	var/datum/gas_mixture/from_env = loc.remove_air(environment.total_moles() * transfer_in)
+	var/datum/gas_mixture/from_int = air_contents.remove(air_contents.total_moles() * transfer_out)
+
+	loc.assume_air(from_int)
+	air_contents.merge(from_env)
+
+
+
+// When the player moves, check if the pos is currently stopped at a station.
+//  if it is, check the direction. If the direction matches the direction of
+//  the station, try to exit. If the direction matches one of the station's
+//  tube directions, launch the pod in that direction.
+/obj/structure/transit_tube_pod/relaymove(mob/mob, direction)
+	if(istype(mob, /mob) && mob.client)
+		// If the pod is not in a tube at all, you can get out at any time.
+		if(!(locate(/obj/structure/transit_tube) in loc))
+			mob.loc = loc
+			mob.client.Move(get_step(loc, direction), direction)
+
+			//if(moving && istype(loc, /turf/space))
+				// Todo: If you get out of a moving pod in space, you should move as well.
+				//  Same direction as pod? Direcion you moved? Halfway between?
+
+		if(!moving)
+			for(var/obj/structure/transit_tube/station/station in loc)
+				if(dir in station.directions())
+					if(!station.pod_moving)
+						if(direction == station.dir)
+							if(station.icon_state == "open")
+								mob.loc = loc
+								mob.client.Move(get_step(loc, direction), direction)
+
+							else
+								station.open_animation()
+
+						else if(direction in station.directions())
+							dir = direction
+							station.launch_pod()
+					return
+
+			for(var/obj/structure/transit_tube/tube in loc)
+				if(dir in tube.directions())
+					if(tube.has_exit(direction))
+						dir = direction
+						return
+
+
+
+// Parse the icon_state into a list of directions.
+// This means that mappers can use Dream Maker's built in
+//  "Generate Instances from Icon-states" option to get all
+//  variations. Additionally, as a separate proc, sub-types
+//  can handle it more intelligently.
+/obj/structure/transit_tube/proc/init_dirs()
+	if(icon_state == "auto")
+		// Additional delay, for map loading.
+		spawn(1)
+			init_dirs_automatic()
+
+	else
+		tube_dirs = parse_dirs(icon_state)
+
+		if(copytext(icon_state, 1, 3) == "D-" || findtextEx(icon_state, "Pass"))
+			density = 0
+
+
+
+// Tube station directions are simply 90 to either side of
+//  the exit.
+/obj/structure/transit_tube/station/init_dirs()
+	tube_dirs = list(turn(dir, 90), turn(dir, -90))
+
+
+
+// Initialize dirs by searching for tubes that do/might connect
+//  on nearby turfs. Create corner pieces if nessecary.
+// Pick two directions, preferring tubes that already connect
+//  to loc, or other auto tubes if there aren't enough connections.
+/obj/structure/transit_tube/proc/init_dirs_automatic()
+	var/list/connected = list()
+	var/list/connected_auto = list()
+
+	for(var/direction in tube_dir_list)
+		var/location = get_step(loc, direction)
+		for(var/obj/structure/transit_tube/tube in location)
+			if(tube.directions() == null && tube.icon_state == "auto")
+				connected_auto += direction
+				break
+
+			else if(turn(direction, 180) in tube.directions())
+				connected += direction
+				break
+
+	connected += connected_auto
+
+	tube_dirs = select_automatic_dirs(connected)
+
+	if(length(tube_dirs) == 2 && tube_dir_list.Find(tube_dirs[1]) > tube_dir_list.Find(tube_dirs[2]))
+		tube_dirs.Swap(1, 2)
+
+	generate_automatic_corners(tube_dirs)
+	select_automatic_icon_state(tube_dirs)
+
+
+
+// Given a list of directions, look a pair that forms a 180 or
+//  135 degree angle, and return a list containing the pair.
+//  If none exist, return list(connected[1], turn(connected[1], 180)
+/obj/structure/transit_tube/proc/select_automatic_dirs(connected)
+	if(length(connected) < 1)
+		return list()
+
+	for(var/i = 1, i <= length(connected), i++)
+		for(var/j = i + 1, j <= length(connected), j++)
+			var/d1 = connected[i]
+			var/d2 = connected[j]
+
+			if(d1 == turn(d2, 135) || d1 == turn(d2, 180) || d1 == turn(d2, 225))
+				return list(d1, d2)
+
+	return list(connected[1], turn(connected[1], 180))
+
+
+
+/obj/structure/transit_tube/proc/select_automatic_icon_state(directions)
+	if(length(directions) == 2)
+		icon_state = "[dir2text_short(directions[1])]-[dir2text_short(directions[2])]"
+
+
+
+// Look for diagonal directions, generate the decorative corners in each.
+/obj/structure/transit_tube/proc/generate_automatic_corners(directions)
+	for(var/direction in directions)
+		if(direction == 5 || direction == 6 || direction == 9 || direction == 10)
+			if(direction & NORTH)
+				create_automatic_decorative_corner(get_step(loc, NORTH), direction ^ 3)
+
+			else
+				create_automatic_decorative_corner(get_step(loc, SOUTH), direction ^ 3)
+
+			if(direction & EAST)
+				create_automatic_decorative_corner(get_step(loc, EAST), direction ^ 12)
+
+			else
+				create_automatic_decorative_corner(get_step(loc, WEST), direction ^ 12)
+
+
+
+// Generate a corner, if one doesn't exist for the direction on the turf.
+/obj/structure/transit_tube/proc/create_automatic_decorative_corner(location, direction)
+	var/state = "D-[dir2text_short(direction)]"
+
+	for(var/obj/structure/transit_tube/tube in location)
+		if(tube.icon_state == state)
+			return
+
+	var/obj/structure/transit_tube/tube = new(location)
+	tube.icon_state = state
+	tube.init_dirs()
+
+
+
+// Uses a list() to cache return values. Since they should
+//  never be edited directly, all tubes with a certain
+//  icon_state can just reference the same list. In theory,
+//  reduces memory usage, and improves CPU cache usage.
+//  In reality, I don't know if that is quite how BYOND works,
+//  but it is probably safer to assume the existence of, and
+//  rely on, a sufficiently smart compiler/optimizer.
+/obj/structure/transit_tube/proc/parse_dirs(text)
+	var/global/list/direction_table = list()
+
+	if(text in direction_table)
+		return direction_table[text]
+
+	var/list/split_text = text2list(text, "-")
+
+	// If the first token is D, the icon_state represents
+	//  a purely decorative tube, and doesn't actually
+	//  connect to anything.
+	if(split_text[1] == "D")
+		direction_table[text] = list()
+		return null
+
+	var/list/directions = list()
+
+	for(var/text_part in split_text)
+		var/direction = text2dir_extended(text_part)
+
+		if(direction > 0)
+			directions += direction
+
+	direction_table[text] = directions
+	return directions
+
+
+
+// A copy of text2dir, extended to accept one and two letter
+//  directions, and to clearly return 0 otherwise.
+/obj/structure/transit_tube/proc/text2dir_extended(direction)
+	switch(uppertext(direction))
+		if("NORTH", "N")
+			return 1
+		if("SOUTH", "S")
+			return 2
+		if("EAST", "E")
+			return 4
+		if("WEST", "W")
+			return 8
+		if("NORTHEAST", "NE")
+			return 5
+		if("NORTHWEST", "NW")
+			return 9
+		if("SOUTHEAST", "SE")
+			return 6
+		if("SOUTHWEST", "SW")
+			return 10
+		else
+	return 0
+
+
+
+// A copy of dir2text, which returns the short one or two letter
+//  directions used in tube icon states.
+/obj/structure/transit_tube/proc/dir2text_short(direction)
+	switch(direction)
+		if(1)
+			return "N"
+		if(2)
+			return "S"
+		if(4)
+			return "E"
+		if(8)
+			return "W"
+		if(5)
+			return "NE"
+		if(6)
+			return "SE"
+		if(9)
+			return "NW"
+		if(10)
+			return "SW"
+		else
+	return

code/game/objects/structures/watercloset.dm

@@ -0,0 +1,416 @@
+//todo: toothbrushes, and some sort of "toilet-filthinator" for the hos
+
+/obj/structure/toilet
+	name = "toilet"
+	desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean."
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "toilet00"
+	density = 0
+	anchored = 1
+	var/open = 0			//if the lid is up
+	var/cistern = 0			//if the cistern bit is open
+	var/w_items = 0			//the combined w_class of all the items in the cistern
+	var/mob/living/swirlie = null	//the mob being given a swirlie
+
+/obj/structure/toilet/New()
+	open = round(rand(0, 1))
+	update_icon()
+
+/obj/structure/toilet/attack_hand(mob/living/user as mob)
+	if(swirlie)
+		usr.visible_message("<span class='danger'>[user] slams the toilet seat onto [swirlie.name]'s head!</span>", "<span class='notice'>You slam the toilet seat onto [swirlie.name]'s head!</span>", "You hear reverberating porcelain.")
+		swirlie.adjustBruteLoss(8)
+		return
+
+	if(cistern && !open)
+		if(!contents.len)
+			user << "<span class='notice'>The cistern is empty.</span>"
+			return
+		else
+			var/obj/item/I = pick(contents)
+			if(ishuman(user))
+				user.put_in_hands(I)
+			else
+				I.loc = get_turf(src)
+			user << "<span class='notice'>You find \an [I] in the cistern.</span>"
+			w_items -= I.w_class
+			return
+
+	open = !open
+	update_icon()
+
+/obj/structure/toilet/update_icon()
+	icon_state = "toilet[open][cistern]"
+
+/obj/structure/toilet/attackby(obj/item/I as obj, mob/living/user as mob)
+	if(istype(I, /obj/item/weapon/crowbar))
+		user << "<span class='notice'>You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].</span>"
+		playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
+		if(do_after(user, 30))
+			user.visible_message("<span class='notice'>[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!</span>", "<span class='notice'>You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!</span>", "You hear grinding porcelain.")
+			cistern = !cistern
+			update_icon()
+			return
+
+	if(istype(I, /obj/item/weapon/grab))
+		var/obj/item/weapon/grab/G = I
+
+		if(isliving(G.affecting))
+			var/mob/living/GM = G.affecting
+
+			if(G.state>1)
+				if(!GM.loc == get_turf(src))
+					user << "<span class='notice'>[GM.name] needs to be on the toilet.</span>"
+					return
+				if(open && !swirlie)
+					user.visible_message("<span class='danger'>[user] starts to give [GM.name] a swirlie!</span>", "<span class='notice'>You start to give [GM.name] a swirlie!</span>")
+					swirlie = GM
+					if(do_after(user, 30, 5, 0))
+						user.visible_message("<span class='danger'>[user] gives [GM.name] a swirlie!</span>", "<span class='notice'>You give [GM.name] a swirlie!</span>", "You hear a toilet flushing.")
+						if(!GM.internal)
+							GM.adjustOxyLoss(5)
+					swirlie = null
+				else
+					user.visible_message("<span class='danger'>[user] slams [GM.name] into the [src]!</span>", "<span class='notice'>You slam [GM.name] into the [src]!</span>")
+					GM.adjustBruteLoss(8)
+			else
+				user << "<span class='notice'>You need a tighter grip.</span>"
+
+	if(cistern)
+		if(I.w_class > 3)
+			user << "<span class='notice'>\The [I] does not fit.</span>"
+			return
+		if(w_items + I.w_class > 5)
+			user << "<span class='notice'>The cistern is full.</span>"
+			return
+		user.drop_item()
+		I.loc = src
+		w_items += I.w_class
+		user << "You carefully place \the [I] into the cistern."
+		return
+
+
+
+/obj/structure/urinal
+	name = "urinal"
+	desc = "The HU-452, an experimental urinal."
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "urinal"
+	density = 0
+	anchored = 1
+
+/obj/structure/urinal/attackby(obj/item/I as obj, mob/user as mob)
+	if(istype(I, /obj/item/weapon/grab))
+		var/obj/item/weapon/grab/G = I
+		if(isliving(G.affecting))
+			var/mob/living/GM = G.affecting
+			if(G.state>1)
+				if(!GM.loc == get_turf(src))
+					user << "<span class='notice'>[GM.name] needs to be on the urinal.</span>"
+					return
+				user.visible_message("<span class='danger'>[user] slams [GM.name] into the [src]!</span>", "<span class='notice'>You slam [GM.name] into the [src]!</span>")
+				GM.adjustBruteLoss(8)
+			else
+				user << "<span class='notice'>You need a tighter grip.</span>"
+
+
+
+/obj/machinery/shower
+	name = "shower"
+	desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "shower"
+	density = 0
+	anchored = 1
+	use_power = 0
+	var/on = 0
+	var/obj/effect/mist/mymist = null
+	var/ismist = 0				//needs a var so we can make it linger~
+	var/watertemp = "normal"	//freezing, normal, or boiling
+	var/mobpresent = 0		//true if there is a mob on the shower's loc, this is to ease process()
+
+//add heat controls? when emagged, you can freeze to death in it?
+
+/obj/effect/mist
+	name = "mist"
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "mist"
+	layer = MOB_LAYER + 1
+	anchored = 1
+	mouse_opacity = 0
+
+/obj/machinery/shower/attack_hand(mob/M as mob)
+	on = !on
+	update_icon()
+	if(on)
+		if (M.loc == loc)
+			wash(M)
+			check_heat(M)
+		for (var/atom/movable/G in src.loc)
+			G.clean_blood()
+
+/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob)
+	if(I.type == /obj/item/device/analyzer)
+		user << "<span class='notice'>The water temperature seems to be [watertemp].</span>"
+	if(istype(I, /obj/item/weapon/wrench))
+		user << "<span class='notice'>You begin to adjust the temperature valve with \the [I].</span>"
+		if(do_after(user, 50))
+			switch(watertemp)
+				if("normal")
+					watertemp = "freezing"
+				if("freezing")
+					watertemp = "boiling"
+				if("boiling")
+					watertemp = "normal"
+			user.visible_message("<span class='notice'>[user] adjusts the shower with \the [I].</span>", "<span class='notice'>You adjust the shower with \the [I].</span>")
+			add_fingerprint(user)
+
+/obj/machinery/shower/update_icon()	//this is terribly unreadable, but basically it makes the shower mist up
+	overlays.Cut()					//once it's been on for a while, in addition to handling the water overlay.
+	if(mymist)
+		del(mymist)
+
+	if(on)
+		overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
+		if(watertemp == "freezing")
+			return
+		if(!ismist)
+			spawn(50)
+				if(src && on)
+					ismist = 1
+					mymist = new /obj/effect/mist(loc)
+		else
+			ismist = 1
+			mymist = new /obj/effect/mist(loc)
+	else if(ismist)
+		ismist = 1
+		mymist = new /obj/effect/mist(loc)
+		spawn(250)
+			if(src && !on)
+				del(mymist)
+				ismist = 0
+
+/obj/machinery/shower/HasEntered(atom/movable/O)
+	..()
+	wash(O)
+	if(ismob(O))
+		mobpresent += 1
+		check_heat(O)
+
+/obj/machinery/shower/Uncrossed(atom/movable/O)
+	if(ismob(O))
+		mobpresent -= 1
+	..()
+
+//Yes, showers are super powerful as far as washing goes.
+/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
+	if(!on) return
+
+	if(iscarbon(O))
+		var/mob/living/carbon/M = O
+		if(M.r_hand)
+			M.r_hand.clean_blood()
+		if(M.l_hand)
+			M.l_hand.clean_blood()
+		if(M.back)
+			if(M.back.clean_blood())
+				M.update_inv_back(0)
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			var/washgloves = 1
+			var/washshoes = 1
+			var/washmask = 1
+			var/washears = 1
+			var/washglasses = 1
+
+			if(H.wear_suit)
+				washgloves = !(H.wear_suit.flags_inv & HIDEGLOVES)
+				washshoes = !(H.wear_suit.flags_inv & HIDESHOES)
+
+			if(H.head)
+				washmask = !(H.head.flags_inv & HIDEMASK)
+				washglasses = !(H.head.flags_inv & HIDEEYES)
+				washears = !(H.head.flags_inv & HIDEEARS)
+
+			if(H.wear_mask)
+				if (washears)
+					washears = !(H.wear_mask.flags_inv & HIDEEARS)
+				if (washglasses)
+					washglasses = !(H.wear_mask.flags_inv & HIDEEYES)
+
+			if(H.head)
+				if(H.head.clean_blood())
+					H.update_inv_head(0)
+			if(H.wear_suit)
+				if(H.wear_suit.clean_blood())
+					H.update_inv_wear_suit(0)
+			else if(H.w_uniform)
+				if(H.w_uniform.clean_blood())
+					H.update_inv_w_uniform(0)
+			if(H.gloves && washgloves)
+				if(H.gloves.clean_blood())
+					H.update_inv_gloves(0)
+			if(H.shoes && washshoes)
+				if(H.shoes.clean_blood())
+					H.update_inv_shoes(0)
+			if(H.wear_mask && washmask)
+				if(H.wear_mask.clean_blood())
+					H.update_inv_wear_mask(0)
+			if(H.glasses && washglasses)
+				if(H.glasses.clean_blood())
+					H.update_inv_glasses(0)
+			if(H.l_ear && washears)
+				if(H.l_ear.clean_blood())
+					H.update_inv_ears(0)
+			if(H.r_ear && washears)
+				if(H.r_ear.clean_blood())
+					H.update_inv_ears(0)
+			if(H.belt)
+				if(H.belt.clean_blood())
+					H.update_inv_belt(0)
+		else
+			if(M.wear_mask)						//if the mob is not human, it cleans the mask without asking for bitflags
+				if(M.wear_mask.clean_blood())
+					M.update_inv_wear_mask(0)
+	else
+		O.clean_blood()
+
+	if(isturf(loc))
+		var/turf/tile = loc
+		loc.clean_blood()
+		for(var/obj/effect/E in tile)
+			if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
+				del(E)
+
+/obj/machinery/shower/process()
+	if(!on || !mobpresent) return
+	for(var/mob/living/carbon/C in loc)
+		check_heat(C)
+
+/obj/machinery/shower/proc/check_heat(mob/M as mob)
+	if(!on || watertemp == "normal") return
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
+
+		if(watertemp == "freezing")
+			C.bodytemperature = max(80, C.bodytemperature - 80)
+			C << "<span class='warning'>The water is freezing!</span>"
+			return
+		if(watertemp == "boiling")
+			C.bodytemperature = min(500, C.bodytemperature + 35)
+			C.adjustFireLoss(5)
+			C << "<span class='danger'>The water is searing!</span>"
+			return
+
+
+
+/obj/item/weapon/bikehorn/rubberducky
+	name = "rubber ducky"
+	desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~"	//thanks doohl
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "rubberducky"
+	item_state = "rubberducky"
+
+
+
+/obj/structure/sink
+	name = "sink"
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "sink"
+	desc = "A sink used for washing one's hands and face."
+	anchored = 1
+	var/busy = 0 	//Something's being washed at the moment
+
+/obj/structure/sink/attack_hand(mob/M as mob)
+	if(isrobot(M) || isAI(M))
+		return
+
+	if(!Adjacent(M))
+		return
+
+	if(busy)
+		M << "\red Someone's already washing here."
+		return
+
+	usr << "\blue You start washing your hands."
+
+	busy = 1
+	sleep(40)
+	busy = 0
+
+	if(!Adjacent(M)) return		//Person has moved away from the sink
+
+	M.clean_blood()
+	if(ishuman(M))
+		M:update_inv_gloves()
+	for(var/mob/V in viewers(src, null))
+		V.show_message("\blue [M] washes their hands using \the [src].")
+
+/obj/structure/sink/attackby(obj/item/O as obj, mob/user as mob)
+	if(busy)
+		user << "\red Someone's already washing here."
+		return
+
+	if (istype(O, /obj/item/weapon/reagent_containers))
+		var/obj/item/weapon/reagent_containers/RG = O
+		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		user.visible_message("\blue [user] fills \the [RG] using \the [src].","\blue You fill \the [RG] using \the [src].")
+		return
+
+	else if (istype(O, /obj/item/weapon/melee/baton))
+		var/obj/item/weapon/melee/baton/B = O
+		if (B.charges > 0 && B.status == 1)
+			flick("baton_active", src)
+			user.Stun(10)
+			user.stuttering = 10
+			user.Weaken(10)
+			if(isrobot(user))
+				var/mob/living/silicon/robot/R = user
+				R.cell.charge -= 20
+			else
+				B.charges--
+			user.visible_message( \
+				"[user] was stunned by his wet [O].", \
+				"\red You have wet \the [O], it shocks you!")
+			return
+
+	var/turf/location = user.loc
+	if(!isturf(location)) return
+
+	var/obj/item/I = O
+	if(!I || !istype(I,/obj/item)) return
+
+	usr << "\blue You start washing \the [I]."
+
+	busy = 1
+	sleep(40)
+	busy = 0
+
+	if(user.loc != location) return				//User has moved
+	if(!I) return 								//Item's been destroyed while washing
+	if(user.get_active_hand() != I) return		//Person has switched hands or the item in their hands
+
+	O.clean_blood()
+	user.visible_message( \
+		"\blue [user] washes \a [I] using \the [src].", \
+		"\blue You wash \a [I] using \the [src].")
+
+
+/obj/structure/sink/kitchen
+	name = "kitchen sink"
+	icon_state = "sink_alt"
+
+
+/obj/structure/sink/puddle	//splishy splashy ^_^
+	name = "puddle"
+	icon_state = "puddle"
+
+/obj/structure/sink/puddle/attack_hand(mob/M as mob)
+	icon_state = "puddle-splash"
+	..()
+	icon_state = "puddle"
+
+/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
+	icon_state = "puddle-splash"
+	..()
+	icon_state = "puddle"

code/game/objects/structures/windoor_assembly.dm

@@ -0,0 +1,302 @@
+/* Windoor (window door) assembly -Nodrak
+ * Step 1: Create a windoor out of rglass
+ * Step 2: Add r-glass to the assembly to make a secure windoor (Optional)
+ * Step 3: Rotate or Flip the assembly to face and open the way you want
+ * Step 4: Wrench the assembly in place
+ * Step 5: Add cables to the assembly
+ * Step 6: Set access for the door.
+ * Step 7: Screwdriver the door to complete
+ */
+
+
+obj/structure/windoor_assembly
+	icon = 'icons/obj/doors/windoor.dmi'
+
+	name = "Windoor Assembly"
+	icon_state = "l_windoor_assembly01"
+	anchored = 0
+	density = 0
+	dir = NORTH
+
+	var/ini_dir
+	var/obj/item/weapon/airlock_electronics/electronics = null
+
+	//Vars to help with the icon's name
+	var/facing = "l"	//Does the windoor open to the left or right?
+	var/secure = ""		//Whether or not this creates a secure windoor
+	var/state = "01"	//How far the door assembly has progressed in terms of sprites
+
+obj/structure/windoor_assembly/New(dir=NORTH)
+	..()
+	src.ini_dir = src.dir
+	update_nearby_tiles(need_rebuild=1)
+
+obj/structure/windoor_assembly/Del()
+	density = 0
+	update_nearby_tiles()
+	..()
+
+/obj/structure/windoor_assembly/update_icon()
+	icon_state = "[facing]_[secure]windoor_assembly[state]"
+
+/obj/structure/windoor_assembly/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	if(get_dir(loc, target) == dir) //Make sure looking at appropriate border
+		if(air_group) return 0
+		return !density
+	else
+		return 1
+
+/obj/structure/windoor_assembly/CheckExit(atom/movable/mover as mob|obj, turf/target as turf)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	if(get_dir(loc, target) == dir)
+		return !density
+	else
+		return 1
+
+
+/obj/structure/windoor_assembly/attackby(obj/item/W as obj, mob/user as mob)
+	//I really should have spread this out across more states but thin little windoors are hard to sprite.
+	switch(state)
+		if("01")
+			if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
+				var/obj/item/weapon/weldingtool/WT = W
+				if (WT.remove_fuel(0,user))
+					user.visible_message("[user] dissassembles the windoor assembly.", "You start to dissassemble the windoor assembly.")
+					playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+
+					if(do_after(user, 40))
+						if(!src || !WT.isOn()) return
+						user << "\blue You dissasembled the windoor assembly!"
+						new /obj/item/stack/sheet/rglass(get_turf(src), 5)
+						if(secure)
+							new /obj/item/stack/rods(get_turf(src), 4)
+						del(src)
+				else
+					user << "\blue You need more welding fuel to dissassemble the windoor assembly."
+					return
+
+			//Wrenching an unsecure assembly anchors it in place. Step 4 complete
+			if(istype(W, /obj/item/weapon/wrench) && !anchored)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+				user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.")
+
+				if(do_after(user, 40))
+					if(!src) return
+					user << "\blue You've secured the windoor assembly!"
+					src.anchored = 1
+					if(src.secure)
+						src.name = "Secure Anchored Windoor Assembly"
+					else
+						src.name = "Anchored Windoor Assembly"
+
+			//Unwrenching an unsecure assembly un-anchors it. Step 4 undone
+			else if(istype(W, /obj/item/weapon/wrench) && anchored)
+				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+				user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor.")
+
+				if(do_after(user, 40))
+					if(!src) return
+					user << "\blue You've unsecured the windoor assembly!"
+					src.anchored = 0
+					if(src.secure)
+						src.name = "Secure Windoor Assembly"
+					else
+						src.name = "Windoor Assembly"
+
+			//Adding plasteel makes the assembly a secure windoor assembly. Step 2 (optional) complete.
+			else if(istype(W, /obj/item/stack/rods) && !secure)
+				var/obj/item/stack/rods/R = W
+				if(R.amount < 4)
+					user << "\red You need more rods to do this."
+					return
+				user << "\blue You start to reinforce the windoor with rods."
+
+				if(do_after(user,40))
+					if(!src) return
+
+					R.use(4)
+					user << "\blue You reinforce the windoor."
+					src.secure = "secure_"
+					if(src.anchored)
+						src.name = "Secure Anchored Windoor Assembly"
+					else
+						src.name = "Secure Windoor Assembly"
+
+			//Adding cable to the assembly. Step 5 complete.
+			else if(istype(W, /obj/item/weapon/cable_coil) && anchored)
+				user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly.")
+
+				if(do_after(user, 40))
+					if(!src) return
+					var/obj/item/weapon/cable_coil/CC = W
+					CC.use(1)
+					user << "\blue You wire the windoor!"
+					src.state = "02"
+					if(src.secure)
+						src.name = "Secure Wired Windoor Assembly"
+					else
+						src.name = "Wired Windoor Assembly"
+			else
+				..()
+
+		if("02")
+
+			//Removing wire from the assembly. Step 5 undone.
+			if(istype(W, /obj/item/weapon/wirecutters) && !src.electronics)
+				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+				user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
+
+				if(do_after(user, 40))
+					if(!src) return
+
+					user << "\blue You cut the windoor wires.!"
+					new/obj/item/weapon/cable_coil(get_turf(user), 1)
+					src.state = "01"
+					if(src.secure)
+						src.name = "Secure Anchored Windoor Assembly"
+					else
+						src.name = "Anchored Windoor Assembly"
+
+			//Adding airlock electronics for access. Step 6 complete.
+			else if(istype(W, /obj/item/weapon/airlock_electronics) && W:icon_state != "door_electronics_smoked")
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+				user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
+
+				if(do_after(user, 40))
+					if(!src) return
+
+					user.drop_item()
+					W.loc = src
+					user << "\blue You've installed the airlock electronics!"
+					src.name = "Near finished Windoor Assembly"
+					src.electronics = W
+				else
+					W.loc = src.loc
+
+			//Screwdriver to remove airlock electronics. Step 6 undone.
+			else if(istype(W, /obj/item/weapon/screwdriver) && src.electronics)
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+				user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly.")
+
+				if(do_after(user, 40))
+					if(!src || !src.electronics) return
+					user << "\blue You've removed the airlock electronics!"
+					if(src.secure)
+						src.name = "Secure Wired Windoor Assembly"
+					else
+						src.name = "Wired Windoor Assembly"
+					var/obj/item/weapon/airlock_electronics/ae = electronics
+					electronics = null
+					ae.loc = src.loc
+
+			//Crowbar to complete the assembly, Step 7 complete.
+			else if(istype(W, /obj/item/weapon/crowbar))
+				if(!src.electronics)
+					usr << "\red The assembly is missing electronics."
+					return
+				usr << browse(null, "window=windoor_access")
+				playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+				user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame.")
+
+				if(do_after(user, 40))
+
+					if(!src) return
+
+					density = 1 //Shouldn't matter but just incase
+					user << "\blue You finish the windoor!"
+
+					if(secure)
+						var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc)
+						if(src.facing == "l")
+							windoor.icon_state = "leftsecureopen"
+							windoor.base_state = "leftsecure"
+						else
+							windoor.icon_state = "rightsecureopen"
+							windoor.base_state = "rightsecure"
+						windoor.dir = src.dir
+						windoor.density = 0
+
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
+						windoor.electronics = src.electronics
+						src.electronics.loc = windoor
+					else
+						var/obj/machinery/door/window/windoor = new /obj/machinery/door/window(src.loc)
+						if(src.facing == "l")
+							windoor.icon_state = "leftopen"
+							windoor.base_state = "left"
+						else
+							windoor.icon_state = "rightopen"
+							windoor.base_state = "right"
+						windoor.dir = src.dir
+						windoor.density = 0
+
+						if(src.electronics.one_access)
+							windoor.req_access = null
+							windoor.req_one_access = src.electronics.conf_access
+						else
+							windoor.req_access = src.electronics.conf_access
+						windoor.electronics = src.electronics
+						src.electronics.loc = windoor
+
+
+					del(src)
+
+
+			else
+				..()
+
+	//Update to reflect changes(if applicable)
+	update_icon()
+
+
+//Rotates the windoor assembly clockwise
+/obj/structure/windoor_assembly/verb/revrotate()
+	set name = "Rotate Windoor Assembly"
+	set category = "Object"
+	set src in oview(1)
+
+	if (src.anchored)
+		usr << "It is fastened to the floor; therefore, you can't rotate it!"
+		return 0
+	if(src.state != "01")
+		update_nearby_tiles(need_rebuild=1) //Compel updates before
+
+	src.dir = turn(src.dir, 270)
+
+	if(src.state != "01")
+		update_nearby_tiles(need_rebuild=1)
+
+	src.ini_dir = src.dir
+	update_icon()
+	return
+
+//Flips the windoor assembly, determines whather the door opens to the left or the right
+/obj/structure/windoor_assembly/verb/flip()
+	set name = "Flip Windoor Assembly"
+	set category = "Object"
+	set src in oview(1)
+
+	if(src.facing == "l")
+		usr << "The windoor will now slide to the right."
+		src.facing = "r"
+	else
+		src.facing = "l"
+		usr << "The windoor will now slide to the left."
+
+	update_icon()
+	return
+
+/obj/structure/windoor_assembly/proc/update_nearby_tiles(need_rebuild)
+	if(!air_master)
+		return 0
+
+	air_master.AddTurfToUpdate(loc)
+
+	return 1

code/game/objects/structures/window.dm

@@ -0,0 +1,416 @@
+/obj/structure/window
+	name = "window"
+	desc = "A window."
+	icon = 'icons/obj/structures.dmi'
+	density = 1
+	layer = 3.2//Just above doors
+	pressure_resistance = 4*ONE_ATMOSPHERE
+	anchored = 1.0
+	flags = ON_BORDER
+	var/health = 14.0
+	var/ini_dir = null
+	var/state = 2
+	var/reinf = 0
+	var/basestate
+	var/shardtype = /obj/item/weapon/shard
+//	var/silicate = 0 // number of units of silicate
+//	var/icon/silicateIcon = null // the silicated icon
+
+
+/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
+	health -= Proj.damage
+	..()
+	if(health <= 0)
+		new /obj/item/weapon/shard(loc)
+		new /obj/item/stack/rods(loc)
+		del(src)
+	return
+
+
+/obj/structure/window/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			new /obj/item/weapon/shard(loc)
+			if(reinf) new /obj/item/stack/rods(loc)
+			del(src)
+			return
+		if(3.0)
+			if(prob(50))
+				new /obj/item/weapon/shard(loc)
+				if(reinf) new /obj/item/stack/rods(loc)
+				del(src)
+				return
+
+
+/obj/structure/window/blob_act()
+	new /obj/item/weapon/shard(loc)
+	if(reinf) new /obj/item/stack/rods(loc)
+	del(src)
+
+
+/obj/structure/window/meteorhit()
+	//world << "glass at [x],[y],[z] Mhit"
+	new /obj/item/weapon/shard( loc )
+	if(reinf) new /obj/item/stack/rods( loc)
+	del(src)
+
+
+/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
+		return 0	//full tile window, you can't move into it!
+	if(get_dir(loc, target) == dir)
+		return !density
+	else
+		return 1
+
+
+/obj/structure/window/CheckExit(atom/movable/O as mob|obj, target as turf)
+	if(istype(O) && O.checkpass(PASSGLASS))
+		return 1
+	if(get_dir(O.loc, target) == dir)
+		return 0
+	return 1
+
+
+/obj/structure/window/hitby(AM as mob|obj)
+	..()
+	visible_message("<span class='danger'>[src] was hit by [AM].</span>")
+	var/tforce = 0
+	if(ismob(AM))
+		tforce = 40
+	else if(isobj(AM))
+		var/obj/item/I = AM
+		tforce = I.throwforce
+	if(reinf) tforce *= 0.25
+	playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+	health = max(0, health - tforce)
+	if(health <= 7 && !reinf)
+		anchored = 0
+		update_nearby_icons()
+		step(src, get_dir(AM, src))
+	if(health <= 0)
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
+		del(src)
+
+/obj/structure/window/attack_tk(mob/user as mob)
+	user.visible_message("<span class='notice'>Something knocks on [src].</span>")
+	playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
+
+/obj/structure/window/attack_hand(mob/user as mob)
+	if(HULK in user.mutations)
+		user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
+		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
+		del(src)
+	else if (usr.a_intent == "hurt")
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
+		usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
+							"\red You bang against the [src.name]!", \
+							"You hear a banging sound.")
+	else
+		playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
+		usr.visible_message("[usr.name] knocks on the [src.name].", \
+							"You knock on the [src.name].", \
+							"You hear a knocking sound.")
+	return
+
+
+/obj/structure/window/attack_paw(mob/user as mob)
+	return attack_hand(user)
+
+
+/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0)	//used by attack_alien, attack_animal, and attack_slime
+	health -= damage
+	if(health <= 0)
+		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
+		new /obj/item/weapon/shard(loc)
+		if(reinf) new /obj/item/stack/rods(loc)
+		del(src)
+	else	//for nicer text~
+		user.visible_message("<span class='danger'>[user] smashes into [src]!</span>")
+		playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1)
+
+
+/obj/structure/window/attack_alien(mob/user as mob)
+	if(islarva(user)) return
+	attack_generic(user, 15)
+
+/obj/structure/window/attack_animal(mob/user as mob)
+	if(!isanimal(user)) return
+	var/mob/living/simple_animal/M = user
+	if(M.melee_damage_upper <= 0) return
+	attack_generic(M, M.melee_damage_upper)
+
+
+/obj/structure/window/attack_slime(mob/user as mob)
+	if(!isslimeadult(user)) return
+	attack_generic(user, rand(10, 15))
+
+
+/obj/structure/window/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(!istype(W)) return//I really wish I did not need this
+
+	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))
+			var/mob/living/M = G.affecting
+			var/state = G.state
+			del(W)	//gotta delete it here because if window breaks, it won't get deleted
+			switch (state)
+				if(1)
+					M.apply_damage(7)
+					hit(10)
+					visible_message("\red [user] slams [M] against \the [src]!")
+				if(2)
+					if (prob(50))
+						M.Weaken(1)
+					M.apply_damage(10)
+					hit(25)
+					visible_message("\red <b>[user] bashes [M] against \the [src]!</b>")
+				if(3)
+					M.Weaken(5)
+					M.apply_damage(20)
+					hit(50)
+					visible_message("\red <big><b>[user] crushes [M] against \the [src]!</b></big>")
+			return
+	if(istype(W, /obj/item/weapon/screwdriver))
+		if(reinf && state >= 1)
+			state = 3 - state
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (state == 1 ? "<span class='notice'>You have unfastened the window from the frame.</span>" : "<span class='notice'>You have fastened the window to the frame.</span>")
+		else if(reinf && state == 0)
+			anchored = !anchored
+			update_nearby_icons()
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (anchored ? "<span class='notice'>You have fastened the frame to the floor.</span>" : "<span class='notice'>You have unfastened the frame from the floor.</span>")
+		else if(!reinf)
+			anchored = !anchored
+			update_nearby_icons()
+			playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1)
+			user << (anchored ? "<span class='notice'>You have fastened the window to the floor.</span>" : "<span class='notice'>You have unfastened the window.</span>")
+	else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1)
+		state = 1 - state
+		playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+		user << (state ? "<span class='notice'>You have pried the window into the frame.</span>" : "<span class='notice'>You have pried the window out of the frame.</span>")
+	else
+		if(W.damtype == BRUTE || W.damtype == BURN)
+			hit(W.force)
+			if(health <= 7)
+				anchored = 0
+				update_nearby_icons()
+				step(src, get_dir(user, src))
+		else
+			playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+		..()
+	return
+
+/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
+	if(reinf) damage *= 0.5
+	health = max(0, health - damage)
+	if(sound_effect)
+		playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
+	if(health <= 0)
+		if(dir == SOUTHWEST)
+			var/index = null
+			index = 0
+			while(index < 2)
+				new shardtype(loc)
+				if(reinf) new /obj/item/stack/rods(loc)
+				index++
+		else
+			new shardtype(loc)
+			if(reinf) new /obj/item/stack/rods(loc)
+		del(src)
+		return
+
+
+/obj/structure/window/verb/rotate()
+	set name = "Rotate Window Counter-Clockwise"
+	set category = "Object"
+	set src in oview(1)
+
+	if(anchored)
+		usr << "It is fastened to the floor therefore you can't rotate it!"
+		return 0
+
+	update_nearby_tiles(need_rebuild=1) //Compel updates before
+	dir = turn(dir, 90)
+//	updateSilicate()
+	update_nearby_tiles(need_rebuild=1)
+	ini_dir = dir
+	return
+
+
+/obj/structure/window/verb/revrotate()
+	set name = "Rotate Window Clockwise"
+	set category = "Object"
+	set src in oview(1)
+
+	if(anchored)
+		usr << "It is fastened to the floor therefore you can't rotate it!"
+		return 0
+
+	update_nearby_tiles(need_rebuild=1) //Compel updates before
+	dir = turn(dir, 270)
+//	updateSilicate()
+	update_nearby_tiles(need_rebuild=1)
+	ini_dir = dir
+	return
+
+
+/*
+/obj/structure/window/proc/updateSilicate()
+	if(silicateIcon && silicate)
+		icon = initial(icon)
+
+		var/icon/I = icon(icon,icon_state,dir)
+
+		var/r = (silicate / 100) + 1
+		var/g = (silicate / 70) + 1
+		var/b = (silicate / 50) + 1
+		I.SetIntensity(r,g,b)
+		icon = I
+		silicateIcon = I
+*/
+
+
+/obj/structure/window/New(Loc,re=0)
+	..()
+
+//	if(re)	reinf = re
+
+	ini_dir = dir
+
+	update_nearby_tiles(need_rebuild=1)
+	update_nearby_icons()
+
+	return
+
+
+/obj/structure/window/Del()
+	density = 0
+	update_nearby_tiles()
+	playsound(src, "shatter", 70, 1)
+	update_nearby_icons()
+	..()
+
+
+/obj/structure/window/Move()
+	update_nearby_tiles(need_rebuild=1)
+	..()
+	dir = ini_dir
+	update_nearby_tiles(need_rebuild=1)
+
+
+//This proc has to do with airgroups and atmos, it has nothing to do with smoothwindows, that's update_nearby_tiles().
+/obj/structure/window/proc/update_nearby_tiles(need_rebuild)
+	if(!air_master)
+		return 0
+	air_master.AddTurfToUpdate(get_turf(src))
+
+	return 1
+
+//checks if this window is full-tile one
+/obj/structure/window/proc/is_fulltile()
+	if(dir in list(5,6,9,10))
+		return 1
+	return 0
+
+//This proc is used to update the icons of nearby windows. It should not be confused with update_nearby_tiles(), which is an atmos proc!
+/obj/structure/window/proc/update_nearby_icons()
+	update_icon()
+	for(var/direction in cardinal)
+		for(var/obj/structure/window/W in get_step(src,direction) )
+			W.update_icon()
+
+//merges adjacent full-tile windows into one (blatant ripoff from game/smoothwall.dm)
+/obj/structure/window/update_icon()
+	//A little cludge here, since I don't know how it will work with slim windows. Most likely VERY wrong.
+	//this way it will only update full-tile ones
+	//This spawn is here so windows get properly updated when one gets deleted.
+	spawn(2)
+		if(!src) return
+		if(!is_fulltile())
+			icon_state = "[basestate]"
+			return
+		var/junction = 0 //will be used to determine from which side the window is connected to other windows
+		if(anchored)
+			for(var/obj/structure/window/W in orange(src,1))
+				if(W.anchored && W.density	&& W.is_fulltile()) //Only counts anchored, not-destroyed fill-tile windows.
+					if(abs(x-W.x)-abs(y-W.y) ) 		//doesn't count windows, placed diagonally to src
+						junction |= get_dir(src,W)
+		if(opacity)
+			icon_state = "[basestate][junction]"
+		else
+			if(reinf)
+				icon_state = "[basestate][junction]"
+			else
+				icon_state = "[basestate][junction]"
+
+		return
+
+/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > T0C + 800)
+		hit(round(exposed_volume / 100), 0)
+	..()
+
+
+
+/obj/structure/window/basic
+	desc = "It looks thin and flimsy. A few knocks with... anything, really should shatter it."
+	icon_state = "window"
+	basestate = "window"
+
+/obj/structure/window/plasmabasic
+	name = "plasma window"
+	desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
+	basestate = "plasmawindow"
+	icon_state = "plasmawindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	health = 120
+
+/obj/structure/window/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > T0C + 32000)
+		hit(round(exposed_volume / 1000), 0)
+	..()
+
+/obj/structure/window/plasmareinforced
+	name = "reinforced plasma window"
+	desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
+	basestate = "plasmarwindow"
+	icon_state = "plasmarwindow"
+	shardtype = /obj/item/weapon/shard/plasma
+	reinf = 1
+	health = 160
+
+/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	return
+
+/obj/structure/window/reinforced
+	name = "reinforced window"
+	desc = "It looks rather strong. Might take a few good hits to shatter it."
+	icon_state = "rwindow"
+	basestate = "rwindow"
+	health = 40
+	reinf = 1
+
+/obj/structure/window/reinforced/tinted
+	name = "tinted window"
+	desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
+	icon_state = "twindow"
+	basestate = "twindow"
+	opacity = 1
+
+/obj/structure/window/reinforced/tinted/frosted
+	name = "frosted window"
+	desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
+	icon_state = "fwindow"
+	basestate = "fwindow"
+	health = 30