New projectile added called the shock projectile.

Three new weapons added to R&D(the protolathe). The Chem Sprayer, the Shock Gun and the Stun Revolver.

A new costume is added to the theatre, the female clown suit and mask.

Thanks for the weapon sprites goes to Khodoque.

Thanks for the female clown suit sprite goes to Cheridan.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1855 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/alien/egg.dm

@@ -20,6 +20,8 @@
 			health -= 50
 		if (PROJECTILE_LASER)
 			health -= 10
+		if (PROJECTILE_SHOCK)
+			health -= 15
 	healthcheck()
 	return
 

code/game/objects/alien/facehugger.dm

@@ -93,6 +93,8 @@
 				health -= 4
 			if (PROJECTILE_LASER)
 				health -= 10
+			if (PROJECTILE_SHOCK)
+				health -= 20
 			if (PROJECTILE_PULSE)
 				health -= 35
 		healthcheck()

code/game/objects/alien/resin.dm

@@ -25,6 +25,8 @@
 			health -= 50
 		if (PROJECTILE_LASER)
 			health -= 10
+		if (PROJECTILE_SHOCK)
+			health -= 15
 	healthcheck()
 	return
 

code/game/objects/displaycase.dm

@@ -25,6 +25,10 @@
 		src.health -= 2
 		src.healthcheck()
 		return
+	if (flag != PROJECTILE_SHOCK)
+		src.health -= 4
+		src.healthcheck()
+		return
 	else
 		src.health -= 5
 		src.healthcheck()

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

@@ -6,6 +6,7 @@ var/const/PROJECTILE_BOLT = 5
 var/const/PROJECTILE_WEAKBULLET = 6
 var/const/PROJECTILE_TELEGUN = 7
 var/const/PROJECTILE_DART = 8
+var/const/PROJECTILE_SHOCK = 9
 
 ///////////////////////////////////////////////
 ////////////////AMMO SECTION///////////////////
@@ -47,6 +48,12 @@ var/const/PROJECTILE_DART = 8
 			damage_type = PROJECTILE_PULSE
 			icon_state = "u_laser"
 
+	fireball
+		name = "shock"
+		damage_type = PROJECTILE_SHOCK
+		icon_state = "fireball"
+		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+
 	dart
 		name = "dart"
 		damage_type = PROJECTILE_DART
@@ -775,6 +782,50 @@ var/const/PROJECTILE_DART = 8
 						return 1
 					return 0
 
+		shockgun
+			name = "shock gun"
+			icon_state = "shockgun"
+			fire_sound = 'Laser.ogg'
+			charge_cost = 50
+
+			load_into_chamber()
+				if(in_chamber)
+					return 1
+				if(power_supply.charge <= charge_cost)
+					return 0
+				in_chamber = new /obj/item/projectile/fireball(src)
+				power_supply.use(charge_cost)
+				return 1
+
+			attack_self(mob/living/user as mob)
+				return
+
+			New()
+				power_supply = new /obj/item/weapon/cell/super(src)
+				power_supply.give(power_supply.maxcharge)
+
+		stunrevolver
+			name = "stun revolver"
+			icon_state = "stunrevolver"
+			fire_sound = 'Gunshot.ogg'
+			charge_cost = 25
+
+			load_into_chamber()
+				if(in_chamber)
+					return 1
+				if(power_supply.charge <= charge_cost)
+					return 0
+				in_chamber = new /obj/item/projectile/electrode(src)
+				power_supply.use(charge_cost)
+				return 1
+
+			attack_self(mob/living/user as mob)
+				return
+
+			New()
+				power_supply = new /obj/item/weapon/cell/crap(src)
+				power_supply.give(power_supply.maxcharge)
+
 		freeze
 			name = "freeze gun"
 			icon_state = "freezegun"

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

@@ -52,6 +52,54 @@ MOP
 	..()
 	return
 
+/obj/item/weapon/chemsprayer/New()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("cleaner", 10)
+
+/obj/item/weapon/chemsprayer/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+	return
+
+/obj/item/weapon/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob)
+	if (istype(A, /obj/item/weapon/storage/backpack ))
+		return
+	else if (src.reagents.total_volume < 1)
+		user << "\blue Add more cleaner!"
+		return
+
+	var/obj/decal/D = new/obj/decal(get_turf(src))
+	D.name = "chemicals"
+	D.icon = 'chemical.dmi'
+	D.icon_state = "chempuff"
+	D.create_reagents(10)
+	src.reagents.trans_to(D, 10)
+	playsound(src.loc, 'spray2.ogg', 50, 1, -6)
+
+	spawn(0)
+		for(var/i=0, i<6, i++)
+			step_towards(D,A)
+			D.reagents.reaction(get_turf(D))
+			for(var/atom/T in get_turf(D))
+				D.reagents.reaction(T)
+			sleep(6)
+		del(D)
+
+	if(isrobot(user)) //Cyborgs can clean forever if they keep charged
+		var/mob/living/silicon/robot/janitor = user
+		janitor.cell.charge -= 20
+		var/refill = src.reagents.get_master_reagent_id()
+		spawn(600)
+			src.reagents.add_reagent(refill, 10)
+
+	return
+
+/obj/item/weapon/chemsprayer/examine()
+	set src in usr
+	usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume)
+	..()
+	return
+
 // MOP
 
 /obj/item/weapon/mop/New()

code/game/objects/lamarr.dm

@@ -43,6 +43,14 @@
 		src.health -= 5
 		src.healthcheck()
 		return
+	if (flag != PROJECTILE_SHOCK)
+		src.health -= 4
+		src.healthcheck()
+		return
+	else
+		src.health -= 7
+		src.healthcheck()
+		return
 
 
 /obj/lamarr/blob_act()

code/game/objects/livestock.dm

@@ -144,6 +144,8 @@
 				src.health -= 8
 			if(PROJECTILE_LASER)
 				src.health -= 10
+			if(PROJECTILE_SHOCK)
+				src.health -= 15
 			if(PROJECTILE_PULSE)
 				src.health -= 25
 				if(prob(30))