Gun Code Overhaul Phase 1: (Now with 50% less wasted code!)

- Gun code condensed to make future modifications easier. Functionality should (mostly) remain the same.
- Taser guns shoot ONE WHOLE SHOT more then they do now. Yippy!
- Energy Crossbow has a slightly higher shot capacity (still automatically recharges).
- Guns that shoot projectiles (such as revolvers) now eject the ammo casings when they fire (this will be adjusted somewhat in phase 2).
- Revolvers can either be loaded one shell at a time or all at once with an ammo box.
- All guns now have a badmin var. Have fun (think shotguns).
- A few admin-only guns have been removed (for now). They'll get re-added in a future update.
- Shotguns no longer need to be pumped before firing (will change back in phase 2).
- All gunshots fired by players are now logged in both the firer's and the target's attack_log. So if someone gets shot and it doesn't show up, it's because a turret or something shot them.

Hopefully I didn't miss anything.


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

code/modules/admin/verbs/striketeam.dm

@@ -157,7 +157,7 @@ var/global/sent_strike_team = 0
 
 	equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
 
-	equip_if_possible(new /obj/item/weapon/ammo/a357(src), slot_in_backpack)
+	equip_if_possible(new /obj/item/ammo_magazine(src), slot_in_backpack)
 	equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
 	equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack)
 	equip_if_possible(new /obj/item/device/flashlight(src), slot_in_backpack)
@@ -170,10 +170,8 @@ var/global/sent_strike_team = 0
 	equip_if_possible(new /obj/item/weapon/sword(src), slot_l_store)
 	equip_if_possible(new /obj/item/weapon/flashbang(src), slot_r_store)
 	equip_if_possible(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store)
+	equip_if_possible(new /obj/item/weapon/gun/projectile/mateba(src), slot_belt)
 
-	var/obj/item/weapon/gun/revolver/GUN = new /obj/item/weapon/gun/revolver/mateba(src)
-	GUN.bullets = 7
-	equip_if_possible(GUN, slot_belt)
 	//equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle(src), slot_l_hand)
 	/*Commented out because Commandos now have their rifles spawn in front of them, along with operation manuals.
 	Useful for copy pasta since I'm lazy.*/

code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm

@@ -189,7 +189,7 @@
 			if(!istype(U, /turf))
 				return
 
-			var/obj/bullet/neurodart/A = new /obj/bullet/neurodart(usr.loc)
+			var/obj/item/projectile/dart/A = new /obj/item/projectile/dart(usr.loc)
 
 			A.current = U
 			A.yo = U.y - T.y

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -135,9 +135,8 @@ obj/item/weapon/robot_module/syndicate
 	..()
 	src.modules += new /obj/item/weapon/baton(src)
 	src.modules += new /obj/item/weapon/handcuffs(src)
-	src.modules += new /obj/item/weapon/gun/energy/taser_gun(src)
-	src.emag = new /obj/item/weapon/gun/energy/laser_gun(src)
-	src.emag:shot_delay = 7
+	src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
+	src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
 
 
 /obj/item/weapon/robot_module/janitor/New()
@@ -175,7 +174,7 @@ obj/item/weapon/robot_module/syndicate
 */ //Merged with Service borg, not a death, just a transformation
 
 obj/item/weapon/robot_module/syndicate/New()
-	src.modules += new /obj/item/weapon/gun/energy/crossbow(src)
+	src.modules += new /obj/item/weapon/gun/energy/crossbow/cyborg(src)
 	src.modules += new /obj/item/weapon/card/emag(src)
 
 

code/modules/power/singularity/emitter.dm

@@ -85,7 +85,7 @@
 				src.fire_delay = rand(20,100)
 				src.shot_number = 0
 			use_power(1000)
-			var/obj/beam/a_laser/A = new /obj/beam/a_laser( src.loc )
+			var/obj/item/projectile/beam/A = new /obj/item/projectile/beam( src.loc )
 			A.icon_state = "u_laser"
 			playsound(src.loc, 'emitter.ogg', 25, 1)
 			if(prob(35))