Merge remote-tracking branch 'citadel/master' into small_guncode_refactor

code/modules/projectiles/guns/energy/dueling.dm

@@ -22,6 +22,11 @@
 	var/list/fired = list()
 	var/countdown_length = 10
 	var/countdown_step = 0
+	var/static/next_id = 1
+	var/id
+
+/datum/duel/New()
+	id = next_id++
 
 /datum/duel/proc/try_begin()
 	//Check if both guns are held and if so begin.
@@ -157,6 +162,13 @@
 	setting_overlay = mutable_appearance(icon,setting_iconstate())
 	add_overlay(setting_overlay)
 
+/obj/item/gun/energy/dueling/examine(mob/user)
+	. = ..()
+	if(duel)
+		. += "Its linking number is [duel.id]."
+	else
+		. += "ERROR: No linking number on gun."
+
 /obj/item/gun/energy/dueling/proc/setting_iconstate()
 	switch(setting)
 		if(DUEL_SETTING_A)
@@ -316,7 +328,7 @@
 		if(DUEL_HUGBOX_NONE)
 			var/obj/item/bodypart/B = L.get_bodypart(BODY_ZONE_HEAD)
 			B.dismember()
-			qdel(B)
+			QDEL_IN(B, 1)
 		if(DUEL_HUGBOX_LETHAL)
 			L.adjustBruteLoss(180)
 			L.death()				//Die, powergamers.
@@ -370,6 +382,8 @@
 
 /obj/item/storage/lockbox/dueling/hugbox
 	gun_type = /obj/item/gun/energy/dueling/hugbox
+	req_access = list(ACCESS_ARMORY)
 
 /obj/item/storage/lockbox/dueling/hugbox/stamina
 	gun_type = /obj/item/gun/energy/dueling/hugbox/stamina
+	req_access = null

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -297,7 +297,7 @@
 /obj/item/borg/upgrade/modkit/proc/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user)
 	. = TRUE
 	if(src in KA.modkits) // Sanity check to prevent installing the same modkit twice thanks to occasional click/lag delays.
-		return
+		return FALSE
 	if(minebot_upgrade)
 		if(minebot_exclusive && !istype(KA.loc, /mob/living/simple_animal/hostile/mining_drone))
 			to_chat(user, "<span class='notice'>The modkit you're trying to install is only rated for minebot use.</span>")
@@ -317,7 +317,7 @@
 	if(KA.get_remaining_mod_capacity() >= cost)
 		if(.)
 			if(!user.transferItemToLoc(src, KA))
-				return
+				return FALSE
 			to_chat(user, "<span class='notice'>You install the modkit.</span>")
 			playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
 			KA.modkits += src
@@ -382,7 +382,7 @@
 		var/old = KA.overheat_time
 		KA.overheat_time = max(0, KA.overheat_time - modifier)
 		decreased = old - KA.overheat_time
-		
+
 
 /obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/gun/energy/kinetic_accelerator/KA)
 	KA.overheat_time += decreased

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

@@ -16,6 +16,19 @@
 	clumsy_check = 0
 	item_flags = NONE
 
+/obj/item/gun/energy/laser/practice/hyperburst
+	name = "toy hyper-burst launcher"
+	desc = "A toy laser with a unique beam shaping lens that projects harmless bolts capable of going through objects. Compatible with existing laser tag systems."
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/magtag)
+	icon_state = "toyburst"
+	obj_flags = NONE
+	fire_delay = 40
+	weapon_weight = WEAPON_HEAVY
+	selfcharge = EGUN_SELFCHARGE
+	charge_delay = 2
+	recoil = 2
+	cell_type = /obj/item/stock_parts/cell/toymagburst
+
 /obj/item/gun/energy/laser/retro
 	name ="retro laser gun"
 	icon_state = "retro"

code/modules/projectiles/guns/energy/special.dm

@@ -105,13 +105,15 @@
 
 /obj/item/gun/energy/kinetic_accelerator/crossbow/large
 	name = "energy crossbow"
-	desc = "A reverse engineered weapon using syndicate technology."
+	desc = "A reverse engineered weapon using syndicate technology. This thing seems incredibly unwieldly, and seems to be using similar internals to the Proto-Kinetic Accelerator. It might not play nice when brought near weapons similar to it."
 	icon_state = "crossbowlarge"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_BULKY
 	materials = list(MAT_METAL=4000)
 	suppressed = null
 	ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
+	weapon_weight = WEAPON_HEAVY
 	pin = null
+	unique_frequency = FALSE
 
 /obj/item/gun/energy/plasmacutter
 	name = "plasma cutter"