Merge branch 'master' of https://github.com/Markolie/Paradise

Conflicts:
	maps/cyberiad.dmm

code/game/objects/items/flag.dm

@@ -200,11 +200,6 @@
 	desc = "A flag proudly boasting the logo of the Syndicate, in defiance of NT."
 	icon_state = "syndiflag"
 
-/obj/item/flag/ninja
-	name = "Spider Clan flag"
-	desc = "A flag proudly boasting the logo of the Spider Clan, in defiance of NT."
-	icon_state = "ninjaflag"
-
 /obj/item/flag/wiz
 	name = "Wizard Federation flag"
 	desc = "A flag proudly boasting the logo of the Wizard Federation, sworn enemies of NT."

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

@@ -1,29 +0,0 @@
-/obj/item/weapon/ninja_manuscript
-	name = "Manuscript"
-	desc = "A mysterious manuscript..."
-	icon = 'icons/obj/library.dmi'
-	icon_state = "book1"
-	throw_speed = 1
-	throw_range = 5
-	w_class = 3
-	attack_verb = list("bashed", "whacked", "educated")
-
-	var/charges = 1
-
-/obj/item/weapon/ninja_manuscript/attack_self(var/mob/user as mob)
-
-	if(charges <= 0)
-		user << "\red The manuscript's power appears spent..."
-		return
-
-	else
-		user << "\blue You intently read the manuscript and come to the realization that true balance is achieved through self-will."
-		user << "\blue You relax and concentrate deeply; something in your mind alights ablaze and you realize the only way to true balance is the way of the Ninja."
-
-		charges--
-
-
-		user.mind.assigned_role = "MODE"
-		user.mind.special_role = "Ninja"
-
-	return

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

@@ -121,8 +121,8 @@
 			user.do_attack_animation(L)
 			baton_stun(L, user)
 		else
-			L.visible_message("<span class='warning'>[L] has been prodded with [src] by [user]. Luckily it was off.</span>", \
-							"<span class='warning'>You've been prodded with [src] by [user]. Luckily it was off</span>")
+			L.visible_message("<span class='warning'>[user] has prodded [L] with [src]. Luckily it was off.</span>", \
+							"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
 			return
 	else
 		..()
@@ -138,8 +138,8 @@
 	L.Weaken(stunforce)
 	L.apply_effect(STUTTER, stunforce)
 
-	L.visible_message("<span class='danger'>[L] has been stunned with [src] by [user]!</span>", \
-							"<span class='userdanger'>You've been stunned with [src] by [user]!</span>")
+	L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
+							"<span class='userdanger'>[user] has stunned you with [src]!</span>")
 	playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 
 	if(isrobot(loc))
@@ -163,22 +163,9 @@
 	..()
 
 //secborg stun baton module
-/obj/item/weapon/melee/baton/robot
-	hitcost = 500
+/obj/item/weapon/melee/baton/loaded/robot
+	hitcost = 1000
 
-/obj/item/weapon/melee/baton/robot/New()
-	..()
-	return
-
-/obj/item/weapon/melee/baton/robot/attack_self(mob/user)
-	//try to find our power cell
-	var/mob/living/silicon/robot/R = loc
-	if (istype(R))
-		bcell = R.cell
-	return ..()
-
-/obj/item/weapon/melee/baton/robot/attackby(obj/item/weapon/W, mob/user, params)
-	return
 
 /obj/item/weapon/melee/baton/loaded/ntcane
 	name = "fancy cane"