Antag Uplink Expansion (#6788)

* Adds Energy Daggerpens, Thieves gloves and Buzzer Ring.

* Updoot

* fixfix weakfire

* Extra Touches

* chlgongog

* Fix antag injector cases.

code/game/objects/items.dm

@@ -634,6 +634,8 @@ modules/mob/mob_movement.dm if you move you will be zoomed out
 modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 */
 //Looking through a scope or binoculars should /not/ improve your periphereal vision. Still, increase viewsize a tiny bit so that sniping isn't as restricted to NSEW
+/obj/item/var/ignore_visor_zoom_restriction = FALSE
+
 /obj/item/proc/zoom(var/tileoffset = 14,var/viewsize = 9) //tileoffset is client view offset in the direction the user is facing. viewsize is how far out this thing zooms. 7 is normal view
 
 	var/devicename
@@ -682,7 +684,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 				H.client.pixel_y = 0
 
 		H.visible_message("[usr] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].")
-		H.looking_elsewhere = TRUE
+		if(!ignore_visor_zoom_restriction)
+			H.looking_elsewhere = TRUE
 		H.handle_vision()
 
 	else

code/game/objects/items/weapons/implants/implantaugment.dm

@@ -75,12 +75,12 @@
 
 		var/obj/item/organ/external/E = setup_augment_slots(H, NewOrgan)
 		to_chat(H, "<span class='notice'>You feel a tingling sensation in your [part].</span>")
-		if(E && istype(E) && !(H.internal_organs_by_name[NewOrgan.organ_tag]))
+		NewOrgan.forceMove(H)
+		NewOrgan.owner = H
+		if(E && istype(E) && !(H.internal_organs_by_name[NewOrgan.organ_tag]) && NewOrgan.check_verb_compatability())
 			spawn(rand(1 SECONDS, 30 SECONDS))
 				to_chat(H, "<span class='alien'>You feel a pressure in your [E] as the tingling fades, the lump caused by the implant now gone.</span>")
 
-			NewOrgan.forceMove(H)
-			NewOrgan.owner = H
 			if(E.internal_organs == null)
 				E.internal_organs = list()
 			E.internal_organs |= NewOrgan

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

@@ -186,15 +186,22 @@
 	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "[icon_state]_blade")
 	if(lcolor)
 		blade_overlay.color = lcolor
+		color = lcolor
 	cut_overlays()		//So that it doesn't keep stacking overlays non-stop on top of each other
 	if(active)
 		add_overlay(blade_overlay)
 		item_state = "[icon_state]_blade"
 		set_light(lrange, lpower, lcolor)
 	else
+		color = "FFFFFF"
 		set_light(0)
 		item_state = "[icon_state]"
 
+	if(istype(usr,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = usr
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
 /obj/item/weapon/shield/energy/AltClick(mob/living/user)
 	if(!in_range(src, user))	//Basic checks to prevent abuse
 		return
@@ -204,7 +211,7 @@
 	if(alert("Are you sure you want to recolor your shield?", "Confirm Recolor", "Yes", "No") == "Yes")
 		var/energy_color_input = input(usr,"","Choose Energy Color",lcolor) as color|null
 		if(energy_color_input)
-			lcolor = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
+			lcolor = sanitize_hexcolor(energy_color_input)
 		update_icon()
 
 /obj/item/weapon/shield/energy/examine(mob/user)

code/game/objects/items/weapons/storage/quickdraw.dm

@@ -77,4 +77,22 @@
 		/obj/item/weapon/reagent_containers/syringe,
 		/obj/item/weapon/reagent_containers/syringe,
 		/obj/item/weapon/reagent_containers/syringe
-	)
+	)
+
+/obj/item/weapon/storage/quickdraw/syringe_case/clotting
+	desc = "A small case for safely carrying sharps around. This one is deluxe!"
+	max_w_class = ITEMSIZE_SMALL
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting
+	)
+
+/obj/item/weapon/storage/quickdraw/syringe_case/bonemed
+	desc = "A small case for safely carrying sharps around. This one is deluxe!"
+	max_w_class = ITEMSIZE_SMALL
+	starts_with = list(
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed
+	)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -266,6 +266,37 @@
 		/obj/item/weapon/tool/screwdriver
 	)
 
+/obj/item/weapon/storage/box/syndie_kit/voidsuit
+	starts_with = list(
+		/obj/item/clothing/suit/space/void/merc,
+		/obj/item/clothing/head/helmet/space/void/merc,
+		/obj/item/clothing/shoes/magboots,
+		/obj/item/weapon/tank/jetpack/oxygen
+	)
+
+/obj/item/weapon/storage/box/syndie_kit/voidsuit/fire
+	starts_with = list(
+		/obj/item/clothing/suit/space/void/merc/fire,
+		/obj/item/clothing/head/helmet/space/void/merc/fire,
+		/obj/item/clothing/shoes/magboots,
+		/obj/item/weapon/tank/jetpack/oxygen
+	)
+
+/obj/item/weapon/storage/box/syndie_kit/concussion_grenade
+	starts_with = list(
+		/obj/item/weapon/grenade/concussion = 8
+		)
+
+/obj/item/weapon/storage/box/syndie_kit/deadliest_game
+	starts_with = list(
+		/obj/item/weapon/beartrap/hunting = 4
+		)
+
+/obj/item/weapon/storage/box/syndie_kit/viral
+	starts_with = list(
+		/obj/item/weapon/virusdish/random = 3
+		)
+
 /obj/item/weapon/storage/secure/briefcase/rifle
 	name = "secure briefcase"
 	starts_with = list(
@@ -275,6 +306,15 @@
 		/obj/item/ammo_casing/a145 = 4
 	)
 
+/obj/item/weapon/storage/secure/briefcase/flamer
+	name = "secure briefcase"
+	starts_with = list(
+		/obj/item/weapon/gun/magnetic/gasthrower,
+		/obj/item/weapon/cell/super,
+		/obj/item/weapon/stock_parts/capacitor/adv,
+		/obj/item/weapon/tank/phoron/pressurized = 2
+	)
+
 /obj/item/weapon/storage/secure/briefcase/fuelrod
 	name = "heavy briefcase"
 	desc = "A heavy, locked briefcase."

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -113,6 +113,19 @@
 	air_contents.adjust_gas("phoron", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
+/obj/item/weapon/tank/phoron/pressurized
+	name = "fuel can"
+	icon_state = "phoron_vox"
+	w_class = ITEMSIZE_NORMAL
+
+/obj/item/weapon/tank/phoron/pressurized/Initialize()
+	..()
+
+	adjust_scale(0.8)
+
+	air_contents.adjust_gas("phoron", (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
+
 /*
  * Emergency Oxygen
  */

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

@@ -105,6 +105,7 @@
 	L.Stun(stun_length)
 	to_chat(L, "<span class='danger'>The steel jaws of \the [src] bite into you, trapping you in place!</span>")
 	deployed = 0
+	anchored = FALSE
 	can_buckle = initial(can_buckle)
 
 /obj/item/weapon/beartrap/Crossed(atom/movable/AM as mob|obj)