Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak

code/game/objects/effects/forcefields.dm

@@ -3,14 +3,13 @@
 	name = "FORCEWALL"
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "m_shield"
-	anchored = 1.0
+	anchored = 1
 	opacity = 0
 	density = 1
 	unacidable = 1
 
-
-
-
+/obj/effect/forcefield/CanAtmosPass(turf/T)
+	return !density
 
 ///////////Mimewalls///////////
 
@@ -18,7 +17,7 @@
 	icon_state = "empty"
 	name = "invisible wall"
 	desc = "You have a bad feeling about this."
-	var/timeleft = 50
+	var/timeleft = 300
 	var/last_process = 0
 
 /obj/effect/forcefield/mime/New()

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

@@ -19,13 +19,19 @@
 	if(!ishuman(user))
 		user << "\red You don't know how to use this!"
 		return
-	if(user:miming || user.silent)
-		user << "\red You find yourself unable to speak at all."
+	if(user.silent)
+		user << "<span class='warning'>You find yourself unable to speak at all.</span>"
 		return
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(H & H.mind)
+			if(H.mind.miming)
+				user << "<span class='warning'>Your vow of silence prevents you from speaking.</span>"
+				return
 	if(spamcheck)
 		user << "\red \The [src] needs to recharge!"
 		return
-	
+
 	var/message = input(user, "Shout a message:", "Megaphone") as text|null
 	if(!message)
 		return

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

@@ -285,6 +285,9 @@ var/global/list/default_medbay_channels = list(
 	if(wires.IsIndexCut(WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
 		return 0
 
+	if(!M.IsVocal())
+		return 0
+
 	M.last_target_click = world.time
 
 	/* Quick introduction:

code/game/objects/structures/ladders.dm

@@ -7,6 +7,7 @@
 	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
+	var/use_verb = "climbs"
 
 /obj/structure/ladder/New()
 	spawn(8)
@@ -14,9 +15,13 @@
 			if(L.id == id)
 				if(L.height == (height - 1))
 					down = L
+					if(isnull(L.up))
+						L.up = src
 					continue
 				if(L.height == (height + 1))
 					up = L
+					if(isnull(L.down))
+						L.down = src
 					continue
 
 			if(up && down)	//if both our connections are filled
@@ -42,12 +47,12 @@
 			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)
+				user.forceMove(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)
+				user.forceMove(get_turf(down))
 				down.add_fingerprint(user)
 			if("Cancel")
 				return
@@ -55,16 +60,43 @@
 	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)
+		user.forceMove(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)
+		user.forceMove(get_turf(down))
 		down.add_fingerprint(user)
 
 	add_fingerprint(user)
 
 /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
-	return attack_hand(user)
+	return attack_hand(user)
+
+/obj/structure/ladder/dive_point/buoy
+	name = "diving point bouy"
+	desc = "A buoy marking the location of an underwater dive area."
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "buoy"
+	id = "dive"
+	height = 2
+	use_verb = "dives"
+	layer = MOB_LAYER + 0.2		//0.1 higher than the water overlay, this also means people can "swim" behind/under it
+
+/obj/structure/ladder/dive_point/anchor
+	name = "diving point anchor"
+	desc = "An anchor tethered to the buoy at the surface, to keep the dive area marked."
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "anchor"
+	id = "dive"
+	height = 1
+	use_verb = "ascends"
+	light_range = 5
+
+/obj/structure/ladder/dive_point/New()
+	..()
+	set_light(light_range, light_power)		//magical glowing anchor
+
+/obj/structure/ladder/dive_point/update_icon()
+	return