Merge pull request #3447 from Kelprunner/kelpo-guns-01

Kelp's TG Blasters (ACTUALLY GOOD TO MERGE THIS TIME I SWEAR)

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -1526,6 +1526,20 @@
 	subcategory = CAT_WEAPON
 	always_available = FALSE
 
+//scrap tg laser
+/datum/crafting_recipe/scraplaser
+	name = "improvised laser"
+	result = /obj/item/gun/energy/laser/tg/scrap
+	reqs = list(/obj/item/stack/sheet/metal = 5,
+				/obj/item/stack/crafting/goodparts = 3,
+				/obj/item/stack/crafting/electronicparts = 3
+				)
+	tools = list(TOOL_WORKBENCH)
+	time = 30
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_available = TRUE
+
 //aer9
 /datum/crafting_recipe/AER9
 	name = "AER-9"

code/game/objects/effects/spawners/masterlootdrop.dm

@@ -409,6 +409,7 @@
 		/obj/item/gun/energy/laser/pistol = 1,
 		/obj/item/gun/energy/laser/complianceregulator = 1,
 		/obj/item/gun/energy/laser/auto = 1,
+		/obj/item/gun/energy/laser/tg/carbine/pistol = 2,
 	)
 
 /obj/effect/spawner/lootdrop/f13/uncommon_energy
@@ -417,6 +418,9 @@
 		/obj/item/gun/energy/laser/wattz2k = 2,
 		/obj/item/gun/energy/laser/aer9 = 5,
 		/obj/item/gun/energy/laser/plasma/pistol = 1,
+		/obj/item/gun/energy/laser/tg/rifle = 1,
+		/obj/item/gun/energy/laser/tg/carbine = 2,
+		/obj/item/gun/energy/laser/tg/recharger/nuclear = 1,
 	)
 
 /obj/effect/spawner/lootdrop/f13/rare_energy
@@ -430,6 +434,9 @@
 		/obj/item/gun/energy/ionrifle = 5,
 		/obj/item/gun/energy/laser/wattz2k/extended = 10,
 		/obj/item/gun/energy/laser/solar = 15,
+		/obj/item/gun/energy/laser/tg/rifle/heavy = 5,
+		/obj/item/gun/energy/laser/tg/rifle/auto = 5,
+		/obj/item/gun/energy/laser/tg/recharger/nuclear/rifle = 1,
 	)
 
 ////////////////////
@@ -521,6 +528,7 @@
 		/obj/item/gun/ballistic/automatic/m41br = 2,
 		/obj/item/gun/ballistic/automatic/pistol/goldendeag = 2,
 		/obj/item/gun/ballistic/automatic/recoilessrifle = 1,
+		/obj/item/gun/energy/laser/tg/recharger = 5,
 	)
 
 /obj/effect/spawner/lootdrop/f13/rare_unique //most uniques gonna end up here: the epitome of high tier loot
@@ -550,7 +558,7 @@
 		/obj/item/gun/energy/laser/plasma/carbine = 10,
 		/obj/item/gun/energy/laser/plasma/scatter = 5,
 		/obj/item/gun/energy/ionrifle/carbine = 10,
-		/obj/item/gun/energy/tesla/teslacannon = 10, //it'll be fiiiiine
+		/obj/item/gun/energy/laser/tg/particlecannon = 10, // old tesla cannon was kind of... bad. In several ways.
 		/obj/item/melee/onehanded/dragonfire = 1, //edgy
 		/obj/item/melee/unarmed/deathclawgauntlet = 20,
 		/obj/item/melee/unarmed/powerfist/goliath = 20,

code/game/objects/items/loadout_beacons.dm

@@ -772,7 +772,7 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 /obj/item/storage/box/gun/melee/energykatana
 	name = "Energy Katana"
 	w_class = WEIGHT_CLASS_NORMAL
-	
+
 /obj/item/storage/box/gun/melee/energykatana/PopulateContents()
 	new	/obj/item/melee/transforming/plasmacutter/regular/energykatana(src)
 
@@ -2537,3 +2537,18 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 /obj/item/storage/box/magic/rodwands/PopulateContents()
 	new /obj/item/gun/magic/wand/kelpmagic/basiczappies(src)
 	new /obj/item/gun/magic/wand/kelpmagic/basiczappies(src)
+
+// Putting this down here because it refuses to work. Needs to be fixed later.
+
+/datum/loadout_box/energy/tglaser
+	entry_tag = "Laser Pistol and Carbine"
+	entry_flags = LOADOUT_FLAG_WASTER
+	entry_class = LOADOUT_CAT_ENERGY
+	spawn_thing = /obj/item/storage/box/gun/energy/tglaser
+
+/obj/item/storage/box/gun/energy/tglaser
+	name = "laser pistol and carbine case"
+
+/obj/item/storage/box/gun/energy/tglaser/PopulateContents()
+	new /obj/item/gun/energy/laser/tg/carbine(src)
+	new /obj/item/gun/energy/laser/tg/carbine/pistol(src)

code/modules/power/cell.dm

@@ -555,6 +555,11 @@
 	name = "S.I.D.A. breeder"
 	maxcharge = 16500
 
+// TG Blaster Internal Cell
+/obj/item/stock_parts/cell/ammo/breeder/tg
+	name = "Type-G internal powercell"
+	desc = "An internal battery intended for use in TG-brand blasters. How in the world did you get ahold of this?"
+	maxcharge = 5000
 
 
 // Electron charge pack - rapid fire energy

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

@@ -389,6 +389,47 @@ Avoid decimals when possible when it comes to e_cost!
 	fire_sound = 'sound/weapons/taser.ogg'
 	e_cost = 400 // 50 shots
 
+// Kelp's TG blaster casings, internal cell has 5000 power units, CANNOT BE RELOADED IN THE FIELD KEEP THAT IN MIND.
+
+/obj/item/ammo_casing/energy/laser/tg
+	projectile_type = /obj/item/projectile/beam/laser/tg
+	e_cost = 250 // 20 shots
+
+/obj/item/ammo_casing/energy/laser/tg/carbine
+	projectile_type = /obj/item/projectile/beam/laser/tg
+	e_cost = 200 // 25 shots
+
+/obj/item/ammo_casing/energy/laser/tg/rifle
+	projectile_type = /obj/item/projectile/beam/laser/tg
+	e_cost = 125 // 40 shots
+
+/obj/item/ammo_casing/energy/laser/tg/rifle/heavy
+	projectile_type = /obj/item/projectile/beam/laser/tg/heavy
+	e_cost = 208 // 24 shots
+	fire_sound = 'sound/weapons/pulse.ogg'
+
+/obj/item/ammo_casing/energy/laser/tg/rifle/auto
+	projectile_type = /obj/item/projectile/beam/laser/tg
+	e_cost = 83 // 60 shots
+
+/obj/item/ammo_casing/energy/laser/tg/recharger
+	projectile_type = /obj/item/projectile/beam/laser/tg
+	e_cost = 312 // 16 shots
+
+/obj/item/ammo_casing/energy/laser/tg/nuclear
+	projectile_type = /obj/item/projectile/beam/laser/tg/nuclear
+	e_cost = 312 // 16 shots
+	fire_sound = 'sound/weapons/laser3.ogg'
+
+/obj/item/ammo_casing/energy/laser/tg/nuclear/rifle
+	projectile_type = /obj/item/projectile/beam/laser/tg/nuclear
+	e_cost = 208 // 24 shots
+
+/obj/item/ammo_casing/energy/laser/tg/particle
+	projectile_type = /obj/item/projectile/beam/laser/tg/particle
+	e_cost = 1000 // 5 shots
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
 // BETA // Obsolete
 /obj/item/ammo_casing/energy/laser/pistol/lasertest
 	projectile_type = /obj/item/projectile/beam/laser/pistol/lasertesting

code/modules/projectiles/guns/energy.dm

@@ -343,7 +343,7 @@
 		if(sounds_and_words)
 			to_chat(user, span_notice("There's no cell in \the [src]."))
 		return
-	if(can_charge == 0 && can_remove == 0)
+	if(can_remove == 0)
 		if(sounds_and_words)
 			to_chat(user, span_notice("You can't remove the cell from \the [src]."))
 		return
@@ -382,7 +382,7 @@
 
 /obj/item/gun/energy/examine(mob/user)
 	. = ..()
-	if(can_charge == 1)
+	if(can_remove == 1)
 		. += span_notice("Alt-click to eject the battery.")
 
 /obj/item/gun/energy/ui_data(mob/user)