Merge branch 'Paradise-clean' into buffs_duffs

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

@@ -133,6 +133,9 @@
 	new /obj/item/clothing/shoes/sandal(src)
 	new /obj/item/clothing/shoes/sandal(src)
 	new /obj/item/clothing/shoes/sandal(src)
+	new /obj/item/clothing/shoes/footwraps(src)
+	new /obj/item/clothing/shoes/footwraps(src)
+	new /obj/item/clothing/shoes/footwraps(src)
 
 
 /obj/structure/closet/wardrobe/orange

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

@@ -1,5 +1,3 @@
-//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."
@@ -434,12 +432,41 @@
 		return newgas
 
 
-/obj/structure/closet/crate/bin
-	desc = "A large bin."
-	name = "large bin"
+/obj/structure/closet/crate/can
+	desc = "A large can, looks like a bin to me."
+	name = "garbage can"
 	icon_state = "largebin"
 	icon_opened = "largebinopen"
 	icon_closed = "largebin"
+	anchored = TRUE
+
+/obj/structure/closet/crate/attackby(obj/item/weapon/W, mob/living/user, params)
+	add_fingerprint(user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(iswrench(W))
+		if(anchored)
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("[user] starts loosening [src]'s floor casters.", \
+								 					"<span class='notice'>You start loosening [src]'s floor casters...</span>")
+			if(do_after(user, 40 * W.toolspeed, target = src))
+				if(!loc || !anchored)
+					return
+				user.visible_message("[user] loosened [src]'s floor casters.", \
+									 					"<span class='notice'>You loosen [src]'s floor casters.</span>")
+				anchored = FALSE
+		else
+			if(!isfloorturf(loc))
+				user.visible_message("<span class='warning'>A floor must be present to secure [src]!</span>")
+				return
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("[user] start securing [src]'s floor casters...", \
+													"<span class='notice'>You start securing [src]'s floor casters...</span>")
+			if(do_after(user, 40 * W.toolspeed, target = src))
+				if(!loc || anchored)
+					return
+				user.visible_message("[user] has secured [src]'s floor casters.", \
+						 								"<span class='notice'>You have secured [src]'s floor casters.</span>")
+				anchored = TRUE
 
 /obj/structure/closet/crate/radiation
 	desc = "A crate with a radiation sign on it."

code/game/objects/structures/decor/decor.dm

@@ -0,0 +1,7 @@
+// The purpose of "Decor" structures is to look like pre-existing objects without having functionality
+
+/obj/structure/decor
+	name = "Non-existent Decor"
+	desc = "Yell at a coder!"
+	anchored = TRUE
+	density = TRUE

code/game/objects/structures/decor/machinery/telecomms.dm

@@ -0,0 +1,23 @@
+/obj/structure/decor/machinery/telecomms/processor
+	name = "Processor Unit"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "processor"
+	desc = "This machine is used to process large quantities of information."
+
+/obj/structure/decor/machinery/telecomms/hub
+	name = "Telecommunication Hub"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "hub"
+	desc = "A mighty piece of hardware used to send/receive massive amounts of data."
+
+/obj/structure/decor/machinery/telecomms/server
+	name = "Telecommunication Server"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "comm_server"
+	desc = "A machine used to store data and network statistics."
+
+/obj/structure/decor/machinery/telecomms/relay
+	name = "Telecommunication Relay"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "relay"
+	desc = "A mighty piece of hardware used to send massive amounts of data far away."

code/game/objects/structures/misc.dm

@@ -61,7 +61,7 @@
 /obj/structure/respawner
 	name = "\improper Long-Distance Cloning Machine"
 	desc = "Top-of-the-line Nanotrasen technology allows for cloning of crew members from off-station upon bluespace request."
-	icon = 'icons/obj/xenoarchaeology.dmi'
+	icon = 'icons/obj/objects.dmi'
 	icon_state = "borgcharger1(old)"
 	anchored = 1
 	density = 1
@@ -121,3 +121,12 @@
 	if(last_ghost_alert + ghost_alert_delay < world.time)
 		notify_ghosts("[src] active in [get_area(src)].", 'sound/effects/ghost2.ogg', title = alert_title, source = attack_atom, action = (attack_atom == src ? NOTIFY_JUMP : NOTIFY_ATTACK))
 		last_ghost_alert = world.time
+
+/obj/structure/boulder
+	name = "boulder"
+	desc = "A large rock."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "boulder1"
+	density = TRUE
+	opacity = TRUE
+	anchored = TRUE

code/game/objects/structures/musician.dm

@@ -57,10 +57,11 @@
 		return
 	// and play
 	var/turf/source = get_turf(instrumentObj)
+	var/sound/music_played = sound(soundfile)
 	for(var/mob/M in hearers(15, source))
 		if(!M.client || !(M.client.prefs.sound & SOUND_INSTRUMENTS))
 			continue
-		M.playsound_local(source, soundfile, 100, falloff = 5)
+		M.playsound_local(source, null, 100, falloff = 5, S = music_played)
 
 /datum/song/proc/shouldStopPlaying(mob/user)
 	if(instrumentObj)

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

@@ -41,12 +41,12 @@
 			var/mob/living/carbon/human/driver = user
 			var/obj/item/organ/external/l_hand = driver.get_organ("l_hand")
 			var/obj/item/organ/external/r_hand = driver.get_organ("r_hand")
-			if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED)))
+			if(!l_hand && !r_hand)
 				return 0 // No hands to drive your chair? Tough luck!
 
 			for(var/organ_name in list("l_hand","r_hand","l_arm","r_arm"))
 				var/obj/item/organ/external/E = driver.get_organ(organ_name)
-				if(!E || (E.status & ORGAN_DESTROYED))
+				if(!E)
 					calculated_move_delay += 4
 				else if(E.status & ORGAN_SPLINTED)
 					calculated_move_delay += 0.5
@@ -129,12 +129,12 @@
 			var/mob/living/carbon/human/driver = user
 			var/obj/item/organ/external/l_hand = driver.get_organ("l_hand")
 			var/obj/item/organ/external/r_hand = driver.get_organ("r_hand")
-			if((!l_hand || (l_hand.status & ORGAN_DESTROYED)) && (!r_hand || (r_hand.status & ORGAN_DESTROYED)))
+			if(!l_hand && !r_hand)
 				calculated_move_delay += 0.5	//I can ride my bike with no handlebars... (but it's slower)
 
 			for(var/organ_name in list("l_leg","r_leg","l_foot","r_foot"))
 				var/obj/item/organ/external/E = driver.get_organ(organ_name)
-				if(!E || (E.status & ORGAN_DESTROYED))
+				if(!E)
 					return 0	//Bikes need both feet/legs to work. missing even one makes it so you can't ride the bike
 				else if(E.status & ORGAN_SPLINTED)
 					calculated_move_delay += 0.5