Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/projectiles/projectile/beams.dm

@@ -1,5 +1,5 @@
 /obj/item/projectile/beam
-	name = "laser"
+	name = "\improper Laser"
 	icon_state = "laser"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	damage = 20
@@ -49,19 +49,19 @@
 			del(src)
 
 /obj/item/projectile/beam/heavylaser
-	name = "heavy laser"
+	name = "\improper Heavy Laser"
 	icon_state = "heavylaser"
 	damage = 40
 
 
 /obj/item/projectile/beam/pulse
-	name = "pulse"
+	name = "\improper Pulse"
 	icon_state = "u_laser"
 	damage = 50
 
 
 /obj/item/projectile/beam/deathlaser
-	name = "death laser"
+	name = "\improper Death Laser"
 	icon_state = "heavylaser"
 	damage = 60
 

code/modules/projectiles/projectile/bullets.dm

@@ -1,5 +1,5 @@
 /obj/item/projectile/bullet
-	name = "bullet"
+	name = "\improper Bullet"
 	icon_state = "bullet"
 	damage = 60
 	damage_type = BRUTE
@@ -20,24 +20,24 @@
 	eyeblur = 3
 
 /obj/item/projectile/bullet/suffocationbullet//How does this even work?
-	name = "co bullet"
+//	name = "\improper ullet"
 	damage = 20
 	damage_type = OXY
 
 
 /obj/item/projectile/bullet/cyanideround
-	name = "poison bullet"
+	name = "\improper Poison Bullet"
 	damage = 40
 	damage_type = TOX
 
 
 /obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
-	name = "exploding bullet"
+	name = "\improper Exploding Bullet"
 	damage = 20
 
 
 /obj/item/projectile/bullet/stunshot
-	name = "stunshot"
+	name = "\improper Stunshot"
 	damage = 5
 	stun = 10
 	weaken = 10

code/modules/projectiles/projectile/change.dm

@@ -1,5 +1,5 @@
 /obj/item/projectile/change
-	name = "bolt of change"
+	name = "\improper Bolt of Change"
 	icon_state = "ice_1"
 	damage = 0
 	damage_type = BURN

code/modules/projectiles/projectile/energy.dm

@@ -1,5 +1,5 @@
 /obj/item/projectile/energy
-	name = "energy"
+	name = "\improper Energy"
 	icon_state = "spark"
 	damage = 0
 	damage_type = BURN
@@ -7,17 +7,17 @@
 
 
 /obj/item/projectile/energy/electrode
-	name = "electrode"
+	name = "\improper Electrode"
 	icon_state = "spark"
 	nodamage = 1
-	stun = 10
-	weaken = 10
+	stun = 15
+	weaken = 15
 	stutter = 10
-	flag = "melee" //Give it a better chance to be blocked.
+	flag = "laser" //Give it a better chance to be blocked.
 
 
 /obj/item/projectile/energy/declone
-	name = "declown"
+	name = "\improper Decloner Bolt"
 	icon_state = "declone"
 	nodamage = 1
 	damage_type = CLONE
@@ -25,7 +25,7 @@
 
 
 /obj/item/projectile/energy/dart
-	name = "dart"
+	name = "\improper Dart"
 	icon_state = "toxin"
 	damage = 5
 	damage_type = TOX
@@ -33,7 +33,7 @@
 
 
 /obj/item/projectile/energy/bolt
-	name = "bolt"
+	name = "\improper Bolt"
 	icon_state = "cbbolt"
 	damage = 10
 	damage_type = TOX
@@ -43,7 +43,7 @@
 
 
 /obj/item/projectile/energy/bolt/large
-	name = "largebolt"
+	name = "\improper Large Bolt"
 	damage = 20
 
 

code/modules/projectiles/projectile/special.dm

@@ -1,5 +1,5 @@
 /obj/item/projectile/ion
-	name = "ion bolt"
+	name = "\improper Ion Bolt"
 	icon_state = "ion"
 	damage = 0
 	damage_type = BURN
@@ -13,7 +13,7 @@
 
 
 /obj/item/projectile/bullet/gyro
-	name ="gyro"
+	name ="\improper Rocket"
 	icon_state= "bolter"
 	damage = 50
 	flag = "bullet"
@@ -24,7 +24,7 @@
 		return 1
 
 /obj/item/projectile/temp
-	name = "freeze beam"
+	name = "\improper Freeze Beam"
 	icon_state = "ice_2"
 	damage = 0
 	damage_type = BURN