Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

Major Gun Refactor

code/game/objects/items/robot/robot_upgrades.dm

@@ -125,13 +125,13 @@
 		to_chat(usr, "This robot has had its disabler removed!")
 		return 0
 
-	if(T.recharge_time <= 2)
+	if(T.charge_delay <= 2)
 		to_chat(R, "Maximum cooling achieved for this hardpoint!")
 		to_chat(usr, "There's no room for another cooling unit!")
 		return 0
 
 	else
-		T.recharge_time = max(2 , T.recharge_time - 4)
+		T.charge_delay = max(2 , T.charge_delay - 4)
 
 	return 1
 
@@ -214,4 +214,4 @@
 		return 0
 
 	R.emagged = 1
-	return 1
+	return 1

code/game/objects/items/shooting_range.dm

@@ -114,7 +114,7 @@
 			bmark.pixel_x--
 			bmark.pixel_y--
 
-			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/practice))
+			if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
 				bmark.icon_state = "scorch"
 				bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
 
@@ -178,4 +178,4 @@
 		b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4)
 		b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4)
 
-		Target.bulletholes.Add(src)
+		Target.bulletholes.Add(src)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -140,7 +140,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \

code/game/objects/items/toys.dm

@@ -1318,7 +1318,7 @@ obj/item/toy/cards/deck/syndicate/black
 /obj/item/toy/russian_revolver
 	name = "russian revolver"
 	desc = "for fun and games!"
-	icon = 'icons/obj/gun.dmi'
+	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "detective_gold"
 	item_state = "gun"
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'

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

@@ -41,12 +41,11 @@
 	icon = 'icons/obj/chronos.dmi'
 	icon_state = "chronogun"
 	item_state = "chronogun"
-	w_class = 3.0
-	projectile_type = "/obj/item/projectile/energy/chrono_beam"
-	fire_sound = 'sound/weapons/Laser.ogg'
-	charge_cost = 0
-	fire_delay = 50
+	w_class = 3
 	flags = NODROP
+	ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
+	can_charge = 0
+	fire_delay = 50
 	var/obj/item/weapon/chrono_eraser/TED = null
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null
@@ -60,12 +59,13 @@
 		qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/dropped()
+	..()
 	qdel(src)
 
 /obj/item/weapon/gun/energy/chrono_gun/update_icon()
 	return
 
-/obj/item/weapon/gun/energy/chrono_gun/Fire()
+/obj/item/weapon/gun/energy/chrono_gun/process_fire()
 	if(field)
 		field_disconnect(field)
 	..()
@@ -125,18 +125,23 @@
 	nodamage = 1
 	var/obj/item/weapon/gun/energy/chrono_gun/gun = null
 
-/obj/item/projectile/energy/chrono_beam/process()
+/obj/item/projectile/energy/chrono_beam/fire()
 	gun = firer.get_active_hand()
 	if(istype(gun))
 		return ..()
 	else
 		return 0
 
-/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target)
+/obj/item/projectile/energy/chrono_beam/on_hit(atom/target)
 	if(target && gun && isliving(target))
 		var/obj/effect/chrono_field/F = new(target.loc, target, gun)
 		gun.field_connect(F)
 
+/obj/item/ammo_casing/energy/chrono_beam
+	name = "eradication beam"
+	projectile_type = /obj/item/projectile/energy/chrono_beam
+	icon_state = "chronobolt"
+	e_cost = 0
 
 /obj/effect/chrono_field
 	name = "eradication field"
@@ -256,4 +261,4 @@
 
 
 #undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
+#undef CHRONO_FRAME_COUNT

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

@@ -128,7 +128,6 @@
 	materials = list()
 	minor_fault = 1
 
-
 /obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
@@ -138,6 +137,12 @@
 	materials = list()
 	self_recharge = 1 // Infused slime cores self-recharge, over time
 
+/obj/item/weapon/stock_parts/cell/pulse //200 pulse shots
+	name = "pulse rifle power cell"
+	maxcharge = 40000
+	rating = 3
+	chargerate = 1500
+
 /obj/item/weapon/stock_parts/cell/pulse/carbine
 	name = "pulse carbine power cell"
 	maxcharge = 4000
@@ -168,9 +173,3 @@
 
 /obj/item/weapon/stock_parts/cell/emproof/corrupt()
 	return
-
-/obj/item/weapon/stock_parts/cell/temperaturegun
-	name = "temperature gun cell"
-	desc = "A specially designed power cell for heating and cooling projectiles"
-	icon_state = "icell"
-	maxcharge = 900

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -115,7 +115,7 @@
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/taperoll/police(src)
-		new /obj/item/weapon/gun/energy/hos(src)
+		new /obj/item/weapon/gun/energy/gun/hos(src)
 		new /obj/item/weapon/door_remote/head_of_security(src)
 
 
@@ -152,7 +152,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/melee/baton/loaded(src)
-		new /obj/item/weapon/gun/energy/advtaser(src)
+		new /obj/item/weapon/gun/energy/gun/advtaser(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/weapon/storage/box/holobadge(src)