Merge branch 'master' into dogborg-end

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

@@ -4,6 +4,11 @@ var/global/list/active_radio_jammers = list()
 	var/turf/Tr = get_turf(radio)
 	if(!Tr) return 0 //Nullspace radios don't get jammed.
 
+	var/area/our_area = get_area(Tr)
+
+	if(our_area.no_comms)
+		return TRUE
+
 	for(var/obj/item/device/radio_jammer/J as anything in active_radio_jammers)
 		var/turf/Tj = get_turf(J)
 
@@ -111,4 +116,3 @@ var/global/list/active_radio_jammers = list()
 		cut_overlays()
 		add_overlay("jammer_overlay_[overlay_percent]")
 		last_overlay_percent = overlay_percent
-

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

@@ -490,7 +490,12 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
 	else if(subspace_transmission)
 		var/list/jamming = is_jammed(src)
 		if(jamming)
-			var/distance = jamming["distance"]
+			var/distance = 0
+			var/area/our_area = get_area(src)
+			if(our_area.no_comms)
+				distance = 99
+			else
+				distance = jamming["distance"]
 			to_chat(M, "<span class='danger'>\icon[src][bicon(src)] You hear the [distance <= 2 ? "loud hiss" : "soft hiss"] of static.</span>")
 			return FALSE
 

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

@@ -217,8 +217,10 @@ This device records all warnings given and teleport events for admin review in c
 
 	//No, you can't teleport if there's a jammer.
 	if(is_jammed(src) || is_jammed(destination))
-		to_chat(user,"<span class='warning'>\The [src] refuses to teleport you, due to strong interference!</span>")
-		return FALSE
+		var/area/our_area = get_area(src)
+		if(!our_area.no_comms)	//I don't actually want this to block teleporters, just comms
+			to_chat(user,"<span class='warning'>\The [src] refuses to teleport you, due to strong interference!</span>")
+			return FALSE
 
 	//No, you can't port to or from away missions. Stupidly complicated check.
 	var/turf/uT = get_turf(user)

code/game/objects/items/weapons/material/twohanded_vr.dm

@@ -26,7 +26,6 @@
     edge = TRUE
     sharp = TRUE
 
-
 /obj/item/weapon/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
 	if (src.wielded == 1)
 		if(unique_parry_check(user, attacker, damage_source) && prob(50))
@@ -34,3 +33,49 @@
 			playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
 		return 1
 	return 0
+
+/obj/item/weapon/material/twohanded/staff
+	w_class = ITEMSIZE_LARGE
+	default_material = MAT_WOOD
+	name = "staff"
+	desc = "A sturdy length of metal or wood. A common traveler's aid mostly used for support or probing unstable ground, but also a fairly effective weapon in a pinch."
+	description_info = "When wielded with two hands, staves can be used to parry incoming melee attacks. Being on disarm intent also grants them an added chance to stun or knock down opponents, and increases your chances of parrying an attack."
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "mat_staff"
+	base_icon = "mat_staff"
+	item_state = "mat_staff"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi',
+			)
+	force_wielded = 18	//a bit stronger than a stun baton
+	force_divisor = 0.45
+	unwielded_force_divisor = 0.1
+	var/base_parry_chance = 20
+	var/disarm_defense = 1.5	//bonus multiplier to parry rate when in disarm stance
+	var/stun_chance = 25	//chance to weaken an opponent when used in disarm stance only, remembering that disarm also halves damage dealt
+	var/stun_duration = 2
+	attack_verb = list("struck","smashed","thumped","thrashed","beaten","slammed","battered")
+	edge = FALSE
+	sharp = FALSE
+
+/obj/item/weapon/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+	var/parry_chance
+	if(istype(damage_source, /obj/item/projectile))	//can't block ranged attacks, only melee!
+		return 0
+	if(src.wielded == 1)
+		if(user.a_intent == I_DISARM)
+			parry_chance = base_parry_chance * disarm_defense
+		else
+			parry_chance = base_parry_chance
+		if(unique_parry_check(user, attacker, damage_source) && prob(parry_chance))
+			user.visible_message("<span class='danger'>\The [user] parries [attack_text] with \the [src]!</span>")
+			playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
+		return 1
+	return 0
+
+/obj/item/weapon/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+	. = ..()
+	if(src.wielded == 1 && user.a_intent == I_DISARM && prob(stun_chance))
+		target.Weaken(stun_duration)
+		user.visible_message("<span class='danger'>\The [user] trips [target] with \the [src]!</span>")