Fixed blood overlays for batons. Also,changelog.

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

@@ -111,39 +111,48 @@
 	icon_state = "telebaton_0"
 	item_state = "telebaton_0"
 	flags = FPRINT | TABLEPASS
-	attack_verb = list("smacked", "struck", "hit", "slapped")
+	slot_flags = SLOT_BELT
 	w_class = 2
 	force = 3
 	var/on = 0
-	var/mob/lastAttacked	//fix for blood overlays not updating
+
 
 /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob)
 	on = !on
-	src.clean_blood()
 	if(on)
 		user.visible_message("\red You extend the baton.",\
 		"\red With a flick of their wrist, [user] extends their telescopic baton.",\
 		"You hear an ominous click.")
-		playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 		icon_state = "telebaton_1"
 		item_state = "telebaton_1"
 		w_class = 4
 		force = 15//quite robust
+		attack_verb = list("smacked", "struck", "slapped")
 	else
 		user.visible_message("\blue You collapse the baton.",\
 		"\blue [user] collapses their telescopic baton.",\
 		"You hear a click.")
-		playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
 		icon_state = "telebaton_0"
 		item_state = "telebaton_0"
 		w_class = 2
 		force = 3//not so robust now
-	src.add_blood(lastAttacked)
-	src.add_fingerprint(user)
+		attack_verb = list("hit", "punched")
+	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+	add_fingerprint(user)
+
+	if(blood_overlay && (blood_DNA.len >= 1))							//updates blood overlay, if any
+		overlays.Cut()//this might delete other item overlays as well but eeeeeeeh
+
+		var/icon/I = new /icon(src.icon, src.icon_state)
+		I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD)
+		I.Blend(new /icon('icons/effects/blood.dmi', "itemblood"),ICON_MULTIPLY)
+		blood_overlay = I
+
+		overlays += blood_overlay
+
 	return
 
 /obj/item/weapon/melee/telebaton/attack(mob/target as mob, mob/living/user as mob)
-	lastAttacked = target
 	if(on)
 		if ((CLUMSY in user.mutations) && prob(50))
 			user << "\red You club yourself over the head."
@@ -157,8 +166,8 @@
 
 		if(!..()) return
 		playsound(src.loc, "swing_hit", 50, 1, -1)
-		target.Stun(8)
-		target.Weaken(8)
+		target.Stun(4)
+		target.Weaken(4)
 		return
 	else
 		return ..()

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

@@ -26,6 +26,7 @@
 		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)
 		return
 
 

html/changelog.html

@@ -58,7 +58,13 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
-
+<div class="commit sansserif">
+	<h2 class="date">15.04.2013</h2>
+	<h3 class="author">Spamcat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Added <a href=http://www.safecity.com.au/aspchrlar.jpg>telescopic batons</a> to HoS's and captain's lockers. These are quite robust and easily concealable.</li>
+	</ul>
+</div>
 
 <div class="commit sansserif">
 	<h2 class="date">March 27th 2013</h2>