Merge Pull Requests #430 and #431 from ZomgPonies/master

code/game/objects/items/toys.dm

@@ -424,7 +424,7 @@
 	desc = "Your palm is oozing this stuff!"
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "red slime extract"
-	throwforce = 30.0
+	throwforce = 5.0
 	throw_speed = 10
 	throw_range = 30
 	w_class = 1

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

@@ -297,7 +297,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "pipeoff"
 	icon_on = "pipeon"  //Note - these are in masks.dmi
 	icon_off = "pipeoff"
-	smoketime = 100
+	smoketime = 1000
+	chem_volume = 50
 
 /obj/item/clothing/mask/cigarette/pipe/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
@@ -353,7 +354,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "cobpipeoff"
 	icon_on = "cobpipeon"  //Note - these are in masks.dmi
 	icon_off = "cobpipeoff"
-	smoketime = 400
+	smoketime = 800
+	chem_volume = 40
 
 
 

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

@@ -343,20 +343,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		return 1
 
 /obj/item/weapon/implant/traitor
-	name = "Greytide Implant"
-	desc = "Greytide Station wide"
+	name = "Mindslave Implant"
+	desc = "Divide and Conquer"
 	icon_state = "implant_evil"
 
 	get_data()
 		var/dat = {"
 <b>Implant Specifications:</b><BR>
-<b>Name:</b> Greytide Mind-Slave Implant<BR>
+<b>Name:</b> Mind-Slave Implant<BR>
 <b>Life:</b> ??? <BR>
-<b>Important Notes:</b> Any humanoid injected with this implant will become loyal to the injector and the greytide, unless of course the host is already loyal to someone else.<BR>
+<b>Important Notes:</b> Any humanoid injected with this implant will become loyal to the injector, unless of course the host is already loyal to someone else.<BR>
 <HR>
 <b>Implant Details:</b><BR>
 <b>Function:</b> Contains a small pod of nanobots that manipulate the host's mental functions.<BR>
-<b>Special Features:</b> Glory to the Greytide!<BR>
+<b>Special Features:</b> Diplomacy was never so easy.<BR>
 <b>Integrity:</b> Implant will last so long as the nanobots are inside the bloodstream."}
 		return dat
 
@@ -367,9 +367,9 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		if(!M.mind) return 0
 		var/mob/living/carbon/human/H = M
 		if(M == user)
-			user << "<span class='notice'>You feel quite stupid for doing that.</span>"
+			user << "<span class='notice'>Making yourself loyal to yourself was a great idea! Perhaps the best idea, ever! Actually, you just feel like an idiot.</span>"
 			if(isliving(user))
-				user:brainloss += 10
+				user:brainloss += 20
 			return
 		if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/traitor) in H.contents)
 			H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.")
@@ -389,7 +389,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		ticker.mode:implanter[ref] = implanters
 		ticker.mode.traitors += H.mind
 		H.mind.special_role = "traitor"
-		H << "<B>\red You've been shown the Greytide by [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost."
+		H << "<B>\red You're now completely loyal to [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost."
 		var/datum/objective/protect/p = new
 		p.owner = H.mind
 		p.target = user:mind

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

@@ -54,8 +54,8 @@
 
 
 /obj/item/weapon/implanter/traitor
-	name = "implanter-greytide"
-	desc = "Greytide Stationwide."
+	name = "implanter-mindslave"
+	desc = "Divide and Conquer."
 
 	New()
 		src.imp = new /obj/item/weapon/implant/traitor(src)

code/game/objects/items/weapons/storage/bible.dm

@@ -12,8 +12,10 @@
 	autoignition_temperature = 522 // Kelvin
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is farting lightly on the [src.name]! It looks like \he's  trying to commit suicide!</b>"
-		return (user.death(1))
+		user.emote("fart")
+		viewers(user) << "\red <b>[user] farts on the [src.name]!</b>"
+		viewers(user) << "\blue <b>A mysterious force smites [user]!</b>"
+		return (user.gib(1))
 
 
 /obj/item/weapon/storage/bible/booze

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -135,8 +135,8 @@
 	new /obj/item/ammo_box/a357(src)
 	return
 
-/obj/item/weapon/storage/box/syndie_kit/greytide
-	name = "box (GT)"
+/obj/item/weapon/storage/box/syndie_kit/mindslave
+	name = "box (MS)"
 
 	New()
 		..()