Merge pull request #3334 from VOREStation/aro-gunstuff

Removes a bunch of my unused fluff stuff

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -181,14 +181,14 @@
 		..() //Might look like a lot... but all small items.
 		//Centcom stuff and permit
 		new /obj/item/weapon/card/id/centcom/station/fluff/aronai(src)
-		new /obj/item/clothing/accessory/permit/gun/fluff/aronai_kadigan(src)
+		//new /obj/item/clothing/accessory/permit/gun/fluff/aronai_kadigan(src)
 		//Gun and holster
-		new /obj/item/weapon/gun/projectile/nsfw(src)
-		new /obj/item/ammo_magazine/nsfw_mag(src)
-		new /obj/item/ammo_casing/nsfw_batt/stun(src)
-		new /obj/item/ammo_casing/nsfw_batt/stun(src)
-		new /obj/item/ammo_casing/nsfw_batt/net(src)
-		new /obj/item/clothing/accessory/holster(src)
+		//new /obj/item/weapon/gun/projectile/nsfw(src)
+		//new /obj/item/ammo_magazine/nsfw_mag(src)
+		//new /obj/item/ammo_casing/nsfw_batt/stun(src)
+		//new /obj/item/ammo_casing/nsfw_batt/stun(src)
+		//new /obj/item/ammo_casing/nsfw_batt/net(src)
+		//new /obj/item/clothing/accessory/holster(src)
 
 /obj/item/weapon/storage/backpack/satchel/gen/fluff/aronai/digest_act(...)
 	return FALSE //I get eaten a lot, okay

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -331,68 +331,6 @@
 	configured = 1
 	to_chat(user, "<span class='notice'>Card settings set.</span>")
 
-//arokha:Aronai Kadigan - Bloo glasses
-/obj/item/clothing/glasses/omnihud/med/fluff/aronai
-	name = "AR-K glasses"
-	desc = "The KHI-63-K AR glasses are KHI's normal AR shades for people who don't want implanted AR. \
-	These seem pretty fully featured in terms of medical software."
-	mode = "med"
-	flash_prot = 2
-
-	icon = 'icons/vore/custom_items_vr.dmi'
-	icon_override = 'icons/vore/custom_clothes_vr.dmi'
-	icon_state = "arohud"
-
-/obj/item/clothing/glasses/omnihud/med/fluff/aronai/verb/toggle_on()
-	set name = "Toggle AR-K HUD"
-	set category = "Object"
-	set desc = "Toggle on/off the AR-K HUD projection."
-	set src in usr
-
-	if(!ishuman(usr)) return
-
-	var/mob/living/carbon/human/H = usr
-
-	if(icon_state == initial(icon_state))
-		icon_state = "[initial(icon_state)]_on"
-		to_chat(H, "<span class='notice'>You ENABLE the AR-K HUD.</span>")
-	else
-		icon_state = initial(icon_state)
-		to_chat(H, "<span class='notice'>You DISABLE the AR-K HUD.</span>")
-
-	H.update_inv_glasses()
-
-//arokha:Aronai Kadigan - Fluff hypospray
-/obj/item/weapon/reagent_containers/hypospray/vial/fluff/aronai
-	name = "worn hypospray"
-	desc = "This hypospray seems a bit well-used. The blue band indicates it's from the CentCom medical division. There's an 'A' scratched into the bottom."
-	icon = 'icons/vore/custom_items_vr.dmi'
-	icon_state = "aro_hypo"
-
-/obj/item/weapon/reagent_containers/hypospray/vial/fluff/aronai/New()
-	..()
-	loaded_vial.name = "[initial(loaded_vial.name)] (tricord)"
-	loaded_vial.desc = "30 Tricordrazine"
-	reagents.add_reagent("tricordrazine", 30)
-
-//arokha:Aronai Kadigan - Vials to go with mk2 hypo
-/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_st
-	name = "vial (stabilize)"
-	desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline"
-	prefill = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
-/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_bt
-	name = "vial (brute)"
-	desc = "25 Bicaridine, 5 Tricordrazine"
-	prefill = list("bicaridine"=25,"tricordrazine"=5)
-/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_bu
-	name = "vial (burn)"
-	desc = "10 Kelotane, 15 Dermaline, 5 Tricordrazine"
-	prefill = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
-/obj/item/weapon/reagent_containers/glass/beaker/vial/fluff/aro_tx
-	name = "vial (toxins)"
-	desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine"
-	prefill = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
-
 //Swat43:Fortune Bloise
 /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
 	name = "Coloured Satchel"