Merge pull request #26 from Duck-/master

Guns, preliminary cult changes, damp rag

code/modules/detectivework/footprints_and_rag.dm

@@ -30,7 +30,7 @@
 /obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
 	if(ismob(target) && target.reagents && reagents.total_volume)
 		user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
-		src.reagents.reaction(target, TOUCH)
+		src.reagents.reaction(target, INGEST)
 		spawn(5) src.reagents.clear_reagents()
 		return
 	else
@@ -50,4 +50,4 @@
 		return
 	usr << "That's \a [src]."
 	usr << desc
-	return
+	return

code/modules/projectiles/guns/energy/laser.dm

@@ -71,7 +71,7 @@ obj/item/weapon/gun/energy/laser/retro
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"
 
-	fire_delay = 20
+	fire_delay = 8
 
 	isHandgun()
 		return 0
@@ -169,4 +169,4 @@ obj/item/weapon/gun/energy/laser/retro
 		if(!power_supply) return 0
 		power_supply.give(100)
 		update_icon()
-		return 1
+		return 1

code/modules/projectiles/guns/energy/special.dm

@@ -200,7 +200,9 @@ obj/item/weapon/gun/energy/staff/focus
 	desc = "A specialized firearm designed to fire lethal bolts of toxins."
 	icon_state = "toxgun"
 	fire_sound = 'sound/effects/stealthoff.ogg'
-	w_class = 3.0
+	fire_delay = 0
+	w_class = 2.0
+	cell_type = "/obj/item/weapon/cell/crap"
 	origin_tech = "combat=5;plasmatech=4"
 	projectile_type = "/obj/item/projectile/energy/plasma"
 

code/modules/projectiles/projectile/beams.dm

@@ -93,7 +93,7 @@ var/list/beam_master = list()
 /obj/item/projectile/beam/heavylaser
 	name = "heavy laser"
 	icon_state = "heavylaser"
-	damage = 40
+	damage = 80
 
 /obj/item/projectile/beam/xray
 	name = "xray beam"
@@ -168,4 +168,4 @@ var/list/beam_master = list()
 	damage = 60
 	stun = 5
 	weaken = 5
-	stutter = 5
+	stutter = 5

code/modules/projectiles/projectile/energy.dm

@@ -64,7 +64,7 @@
 	icon_state = "energy"
 	damage = 20
 	damage_type = TOX
-	irradiate = 20
+	irradiate = 40
 
 /obj/item/projectile/energy/electrode/instant
 	name = "electrode"
@@ -84,4 +84,4 @@
 	stutter = 10
 	*/
 	agony = 70
-	damage_type = HALLOSS
+	damage_type = HALLOSS

code/modules/projectiles/projectile/force.dm

@@ -2,7 +2,7 @@
 	name = "force bolt"
 	icon = 'icons/obj/projectiles.dmi'
 	icon_state = "ice_1"
-	damage = 20
+	damage = 40
 	flag = "energy"
 	embed = 1
 
@@ -27,4 +27,4 @@
 			throwdir = get_dir(src,target)
 			M.throw_at(get_edge_target_turf(M, throwdir),15,1)
 	return ..()
-*/
+*/

code/modules/reagents/Chemistry-Reagents-Antidepressants.dm

@@ -20,6 +20,18 @@
 				M << "\blue Your mind feels focused and undivided."
 		..()
 		return
+		
+/*			on_mob_life(var/mob/living/M as mob)
+				if(ishuman(M))
+					if((M.mind in ticker.mode.cult))
+						M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more.  You are now deaf to the commands of Nar-Sie."
+						ticker.mode.remove_cultist(M.mind)
+						for(var/mob/O in viewers(M, null))
+							O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked.
+				
+				return
+				
+*/
 
 /datum/chemical_reaction/methylphenidate
 	name = "Methylphenidate"
@@ -49,6 +61,19 @@
 		..()
 		return
 
+
+/*			on_mob_life(var/mob/living/M as mob)
+				if(ishuman(M))
+					if((M.mind in ticker.mode.cult))
+						M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more.  You are now deaf to the commands of Nar-Sie."
+						ticker.mode.remove_cultist(M.mind)
+						for(var/mob/O in viewers(M, null))
+							O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked.
+				
+				return
+				
+*/
+
 /datum/chemical_reaction/citalopram
 	name = "Citalopram"
 	id = "citalopram"
@@ -82,6 +107,20 @@
 		..()
 		return
 
+/*			on_mob_life(var/mob/living/M as mob)
+				if(ishuman(M))
+					if((M.mind in ticker.mode.cult))
+						M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more.  You are now deaf to the commands of Nar-Sie."
+						ticker.mode.remove_cultist(M.mind)
+						for(var/mob/O in viewers(M, null))
+							O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked.
+				
+				return
+				
+*/
+
+
+
 /datum/chemical_reaction/paroxetine
 	name = "Paroxetine"
 	id = "paroxetine"

code/modules/reagents/Chemistry-Reagents.dm

@@ -1624,6 +1624,31 @@ datum
 				..()
 				return
 
+		chefspecial
+			// Quiet and lethal, needs atleast 4 units in the person before they'll die
+			name = "Chef's Special"
+			id = "chefspecial"
+			description = "An extremely toxic chemical that will surely end in death."
+			reagent_state = LIQUID
+			color = "#CF3600" // rgb: 207, 54, 0
+			custom_metabolism = 0.39
+
+			on_mob_life(var/mob/living/M as mob)
+				var/random = rand(150,180)
+				if(!M) M = holder.my_atom
+				if(!data) data = 1
+				switch(data)
+					if(0 to 5)
+						..()
+				if(data >= random)
+					if(M.stat != DEAD)
+						M.death(0)
+						M.attack_log += "\[[time_stamp()]\]<font color='red'>Died a quick and painless death by <font color='green'>Chef Excellence's Special Sauce</font>.</font>"
+				data++
+				return
+
+
+
 		toxin/minttoxin
 			name = "Mint Toxin"
 			id = "minttoxin"