Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/devices/uplinks.dm
	code/game/objects/weapons.dm
	code/modules/mining/mine_items.dm
	html/changelog.html
	icons/obj/chemical.dmi
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/objects/items/weapons/cigs_lighters.dm

@@ -106,6 +106,9 @@ ZIPPO
 		if(M.lit > 0)
 			light("\red [user] lights their [name] with their [W].")
 
+	else if(istype(W, /obj/item/device/assembly/igniter))
+		light("\red [user] fiddles with [W], and manages to light their [name].")
+
 	//can't think of any other way to update the overlays :<
 	user.update_inv_wear_mask(0)
 	user.update_inv_l_hand(0)

code/game/objects/items/weapons/implants/implantuplink.dm

@@ -0,0 +1,23 @@
+/obj/item/weapon/implant/uplink
+	name = "uplink"
+	desc = "Summon things."
+	var/activation_emote = "chuckle"
+
+/obj/item/weapon/implant/uplink/New()
+	activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+	hidden_uplink = new(src)
+	hidden_uplink.uses = 5
+	..()
+	return
+
+/obj/item/weapon/implant/uplink/implanted(mob/source)
+	activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
+	source.mind.store_memory("Uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
+	source << "The implanted uplink implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+	return 1
+
+
+/obj/item/weapon/implant/uplink/trigger(emote, mob/source as mob)
+	if(hidden_uplink && usr == source) // Let's not have another people activate our uplink
+		hidden_uplink.check_trigger(source, emote, activation_emote)
+	return

code/game/objects/items/weapons/mousetraps.dm

@@ -0,0 +1,94 @@
+/obj/item/weapon/mousetrap/examine()
+	set src in oview(12)
+	..()
+	if(armed)
+		usr << "\red It looks like it's armed."
+
+/obj/item/weapon/mousetrap/proc/triggered(mob/target as mob, var/type = "feet")
+	if(!armed)
+		return
+	var/datum/organ/external/affecting = null
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		switch(type)
+			if("feet")
+				if(!H.shoes)
+					affecting = H.get_organ(pick("l_leg", "r_leg"))
+					H.Weaken(3)
+			if("l_hand", "r_hand")
+				if(!H.gloves)
+					affecting = H.get_organ(type)
+					H.Stun(3)
+		if(affecting)
+			if(affecting.take_damage(1, 0))
+				H.UpdateDamageIcon()
+			H.updatehealth()
+	else if(ismouse(target))
+		var/mob/living/simple_animal/mouse/M = target
+		src.visible_message("\red <b>SPLAT!</b>")
+		M.splat()
+	playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+	icon_state = "mousetrap"
+	armed = 0
+/*
+	else if (ismouse(target))
+		target.adjustBruteLoss(100)
+*/
+
+/obj/item/weapon/mousetrap/attack_self(mob/living/user as mob)
+	if(!armed)
+		icon_state = "mousetraparmed"
+		user << "\blue You arm the mousetrap."
+	else
+		icon_state = "mousetrap"
+		if(( (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
+			var/which_hand = "l_hand"
+			if(!user.hand)
+				which_hand = "r_hand"
+			src.triggered(user, which_hand)
+			user << "\red <B>You accidentally trigger the mousetrap!</B>"
+			for(var/mob/O in viewers(user, null))
+				if(O == user)
+					continue
+				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
+			return
+		user << "\blue You disarm the mousetrap."
+	armed = !armed
+	playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+
+/obj/item/weapon/mousetrap/attack_hand(mob/living/user as mob)
+	if(armed)
+		if(( (user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50))
+			var/which_hand = "l_hand"
+			if(!user.hand)
+				which_hand = "r_hand"
+			src.triggered(user, which_hand)
+			user << "\red <B>You accidentally trigger the mousetrap!</B>"
+			for(var/mob/O in viewers(user, null))
+				if(O == user)
+					continue
+				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
+			return
+	..()
+
+/obj/item/weapon/mousetrap/HasEntered(AM as mob|obj)
+	if(armed)
+		if(ishuman(AM))
+			var/mob/living/carbon/H = AM
+			if(H.m_intent == "run")
+				src.triggered(H)
+				H << "\red <B>You accidentally step on the mousetrap!</B>"
+				for(var/mob/O in viewers(H, null))
+					if(O == H)
+						continue
+					O.show_message("\red <B>[H] accidentally steps on the mousetrap.</B>", 1)
+		if(ismouse(AM))
+			triggered(AM)
+	..()
+
+/obj/item/weapon/mousetrap/hitby(A as mob|obj)
+	if(!armed)
+		return ..()
+	for(var/mob/O in viewers(src, null))
+		O.show_message("\red <B>The mousetrap is triggered by [A].</B>", 1)
+	src.triggered(null)

code/game/objects/items/weapons/swords_axes_etc.dm

@@ -1,5 +1,6 @@
 /*
 CONTAINS:
+BANHAMMER
 SWORD
 BLADE
 AXE
@@ -7,8 +8,10 @@ CLASSIC BATON
 ENERGY SHIELD (where else should i even put this)
 */
 
-
-
+//BANHAMMER
+/obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob)
+	M << "<font color='red'><b> You have been banned FOR NO REISIN by [user]<b></font>"
+	user << "<font color='red'> You have <b>BANNED</b> [M]</font>"
 
 // SWORD
 /obj/item/weapon/melee/energy/sword/IsShield()