Imperial Military Update

Adds Imperial stuff for our space elf romans.

code/game/objects/items/weapons/melee/energy_vr.dm

@@ -0,0 +1,10 @@
+/obj/item/weapon/melee/energy/sword/imperial
+	name = "energy gladius"
+	desc = "A broad, short energy blade.  You'll be glad to have this in a fight."
+	icon_state = "sword0"
+	icon = 'icons/obj/weapons_vr.dmi'
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi')
+
+/obj/item/weapon/melee/energy/sword/imperial/activate(mob/living/user)
+	..()
+	icon_state = "sword1"

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

@@ -0,0 +1,6 @@
+/obj/item/weapon/shield/energy/imperial
+	name = "energy scutum"
+	desc = "It's really easy to mispronounce the name of this shield if you've only read it in books."
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "eshield0" // eshield1 for expanded
+	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi')

code/modules/busy_space/organizations_vr.dm

@@ -59,6 +59,7 @@
 						"to a local distress beacon"
 						)
 
+/*
 /datum/lore/organization/gov/federation
 	name = "United Federation of Planets"
 	short_name = "Federation"
@@ -126,8 +127,9 @@
 						"Naro Industrial Complex on Scheddi III",
 						"Mari Industrial Complex on Furlou Prime",
 						"Runni Crystal Mines of Keid V")
+*/ // ToDo: ReDo.
 
-/datum/lore/organization/gov/unsc // change to sif_guard in future to overwrite Polaris stuff
+/datum/lore/organization/mil/unsc // change to sif_guard in future to overwrite Polaris stuff
 	name = "United Nations Space Command"
 	short_name = "" // This is blank on purpose. Otherwise they call the ships "UNSC" "UNSC Name"
 	desc = "The dedicated military force of SolGov, originally formed by the United Nations, the UNSC is the might of SolGov. It is the \

code/modules/clothing/clothing_vr.dm

@@ -26,7 +26,7 @@
 //Mask
 /obj/item/clothing/mask
 	name = "mask"
-	icon = 'icons/obj/clothing/masks_vr.dmi'
+	icon = 'icons/obj/clothing/masks_vr.dmi' // This is intentional because of our custom species.
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_masks.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_masks.dmi',

code/modules/clothing/gloves/arm_guards_vr.dm

@@ -0,0 +1,6 @@
+/obj/item/clothing/gloves/arm_guard/combat/imperial
+	name = "imperial gauntlets"
+	desc = "Made of some exotic metal, and crafted by space elves. Elves have delicate hands."
+	icon_state = "ge_gloves"
+	icon = 'icons/obj/clothing/gloves_vr.dmi'
+	icon_override = 'icons/mob/hands_vr.dmi'

code/modules/clothing/head/helmet_vr.dm

@@ -7,9 +7,23 @@
 	desc = "A helmet with 'Solar Central Government' printed on the back in gold lettering."
 
 /obj/item/clothing/head/helmet/combat/unsc
-	name = "\improper CH252 helmet"
-	desc = "If you wanna to keep your brain inside your head, you'd best put this on!"
+	name = "marine helmet"
+	desc = "If you wanna to keep your brain inside yo' head, you'd best put this on!"
 	icon_state = "unsc_helm"
 	item_state = "unsc_helm"
 	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+
+/obj/item/clothing/head/helmet/combat/imperial
+	name = "imperial soldier helmet"
+	desc = "Veni, vidi, vici; I came, I saw, I conquered."
+	icon_state = "ge_helm"
+	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+
+/obj/item/clothing/head/helmet/combat/imperial/centurion
+	name = "imperial centurion helmet"
+	desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
+	icon_state = "ge_helmcent"
+	icon = 'icons/obj/clothing/hats_vr.dmi'
 	icon_override = 'icons/mob/head_vr.dmi'

code/modules/clothing/shoes/leg_guards_vr.dm

@@ -0,0 +1,6 @@
+/obj/item/clothing/shoes/leg_guard/combat/imperial
+	name = "imperial leg guards"
+	desc = "Good for Roman around."
+	icon_state = "ge_boots"
+	icon = 'icons/obj/clothing/shoes_vr.dmi'
+	icon_override = 'icons/mob/feet_vr.dmi'

code/modules/clothing/suits/armor_vr.dm

@@ -63,9 +63,22 @@
 	desc = "A synthetic armor vest with Solar Central Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates."
 
 /obj/item/clothing/suit/armor/combat/unsc
-	name = "\improper M52B Body Armor"
+	name = "marine body armor"
 	desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon<6F>and we had to <i>share</i> the rock!"
 	icon_state = "unsc_armor"
 	icon = 'icons/obj/clothing/suits_vr.dmi'
 	icon_override = 'icons/mob/suit_vr.dmi'
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO // ToDo: Break up the armor into smaller bits.
+
+/obj/item/clothing/suit/armor/combat/imperial
+	name = "imperial soldier armor"
+	desc = "Made out of an especially light metal, it lets you conquer in style."
+	icon_state = "ge_armor"
+	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon_override = 'icons/mob/suit_vr.dmi'
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+
+/obj/item/clothing/suit/armor/combat/imperial/centurion
+	name = "imperial centurion armor"
+	desc = "Not all heroes wear capes, but it'd be cooler if they did."
+	icon_state = "ge_armorcent"

code/modules/clothing/under/imperial_vr.dm

@@ -0,0 +1,6 @@
+/obj/item/clothing/under/imperial
+	desc = "imperial military jumpsuit"
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "crimson"
+	item_state = "crimson"

code/modules/lore_codex/lore_data_vr/important_locations.dm

@@ -4,14 +4,14 @@
 	children = list(
 		/datum/lore/codex/page/virgo_erigone,
 		/datum/lore/codex/page/radiance_energy_chain,
-		/datum/lore/codex/page/virgo_prime,
 		/datum/lore/codex/page/virgo_two,
 		/datum/lore/codex/page/virgo_three,
 		/datum/lore/codex/page/virgo_three_bee,
 		/datum/lore/codex/page/nsb_adephagia,
 		/datum/lore/codex/page/virgo_central_command,
-		/datum/lore/codex/page/virgo_four,
-		/datum/lore/codex/page/virgo_five
+		/datum/lore/codex/page/virgo_prime,
+		/datum/lore/codex/page/virgo_five,
+		/datum/lore/codex/page/outer_worlds
 		)
 
 /datum/lore/codex/page/virgo_erigone/add_content()
@@ -108,19 +108,19 @@
 	atmosphere. Scientists believe this planet was once closer to its host star, but over time was pushed out beyond the habitable zone by \
 	other large planets."
 
-/datum/lore/codex/page/virgo_five/add_content()
-	name = "The Outer Planets"
-	keywords += list("The Outer Planets")
+/datum/lore/codex/page/outer_worlds/add_content()
+	name = "The Outer Worlds"
+	keywords += list("The Outer Worlds")
 	data = "The last three planets in the system are two small rocky worlds, Virgo 6 and 7, and finally Virgo 8 which is a frozen gas giant \
 	whose temperatures reach only 49<34>K. The planet has several moons, but none of these worlds are of any significance. Virgo 6 and 7, as well \
 	as 8's moons have no substantial deposits of any useful minerals, nor do they have an abundance of phoron. They are left largely ignored by \
 	the local [quick_link("TSC", "TSCs")], though this also makes them a safe haven for various pirate and smuggler stations."
 
-/* ToDo: ReDo.
 /datum/lore/codex/page/virgo_central_command/add_content()
 	name = "Virgo Central Command (Colony)"
 	keywords += list("Virgo Central Command")
-	data = "The Virgo Central Command is a large facility on [quick_link("Virgo-3B")] which handles the loading and \
+	data = "<i>This page has been ripped out. Odd.</i>"
+	/*data = "The Virgo Central Command is a large facility on [quick_link("Virgo-3B")] which handles the loading and \
 	unloading, refuelling, and general maintenance of large spacecraft. The main structure is owned by \
 	[quick_link("NanoTrasen")], but individual offices, docking/loading bays, and warehouses are often leased to individuals \
 	or organisations.  The position of the spaceport allows it to function not only as a key node for transport inside the Virgo-Erigone \
@@ -129,8 +129,7 @@
 	The station itself is mostly designed around its logistical and commercial needs, and although other strategically-placed \
 	nearby facilities owned by a mixture of corporations and entities may possess habitation space, the port itself is not \
 	designed to be a living habitat - its proximity to Virgo 3 makes transport of people and materials to and from \
-	the facility and the planet's stations via shuttle extremely cost-efficient."
-*/
+	the facility and the planet's stations via shuttle extremely cost-efficient."*/ // ToDo: ReDo.
 
 /datum/lore/codex/page/nsb_adephagia/add_content()
 	name = "NSB Adephagia (Space Elevator)"

code/modules/lore_codex/lore_data_vr/orgs.dm

@@ -32,8 +32,8 @@
 	auto_keywords = list("Gov","Government","Governments")
 	desired_type = /datum/lore/organization/gov
 
-/*
+
 /datum/lore/codex/category/auto_org/mil
 	name = "Militaries"
+	auto_keywords = list("Mil","Military", "Militaries")
 	desired_type = /datum/lore/organization/mil
-*/

code/modules/lore_codex/lore_data_vr/political_parties.dm

@@ -5,18 +5,15 @@
 	the Sol Economic Organization, and several smaller ones which tend to align themselves among one of the major parties.  In the Virgo-Erigone system, the \
 	Icarus Front's influence is much less than somewhere closer to Sol, and the other two parties being more popular."
 	children = list(
-		/datum/lore/codex/page/icarus_front,
-		/datum/lore/codex/page/shadow_coalition,
-		/datum/lore/codex/page/sol_economic_organization,
-		/datum/lore/codex/page/mercurials,
-		/datum/lore/codex/page/positronic_rights_group,
-		/datum/lore/codex/page/church_of_unitarian_god,
-		/datum/lore/codex/page/friends_of_ned,
-		/datum/lore/codex/page/multinational_movement,
-		/datum/lore/codex/page/free_trade_union,
+		/datum/lore/codex/page/blank
 		)
 
+/datum/lore/codex/page/blank/add_content()
+	name = "Blank Page"
+	keywords += list("Blank")
+	data = "<i>For some weird reason, this page is blank. This looks like a publishing error.</i>"
 
+/*
 /datum/lore/codex/page/icarus_front/add_content()
 	name = "Icarus Front"
 	keywords += list("Icarus", "IF")
@@ -33,6 +30,7 @@
 	technologies with the ability to drastically improve quality of life. While fractious and prone to infighting, the Shadow Coalition and affiliated \
 	parties remain the most popular political groups in the large towns and small cities of humanity, including [quick_link("Virgo-Erigone")]."
 
+
 /datum/lore/codex/page/sol_economic_organization/add_content()
 	name = "Sol Economic Organization"
 	keywords += list("SEO")
@@ -96,4 +94,5 @@
 	measures to reduce the amount of power held by the TSCs. In many ways a holdover from the days before the [quick_link("Shadow Coalition")], where corporate malfeasance took \
 	the place of technological development as the primary issue of debate, the FTU has found itself adopting technological positions similar to the SEO as a matter \
 	of pragmatism, although the views of individual members vary. The FTU is known for their intense lobbying of SolGov to add tax rebates to the purchases of \
-	personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success."
+	personal lathes and the creation of open-source firmware for experimental autolathes, but have thus far found little success."
+*/ // No

code/modules/lore_codex/lore_data_vr/species.dm

@@ -13,8 +13,7 @@
 		/datum/lore/codex/page/vulpkanin,
 		/datum/lore/codex/page/zorren,
 		/datum/lore/codex/category/teshari,
-		/datum/lore/codex/category/positronic,
-		/datum/lore/codex/category/drone
+		/datum/lore/codex/category/positronic
 		)
 
 /datum/lore/codex/page/human/add_content()
@@ -43,16 +42,12 @@
 
 /datum/lore/codex/page/unathi
 	name = "Unathi"
-	data = "The author wishes to apologize to the reader, as they currently lack enough knowledge of the Unathi to write about them, as they are \
-	rather rare inside Vir." // Replace this when Anewbe finishes the lizard rewrite.
-	/*
 	data = "Raging in from Moghes, the Unathi are a race of tall, reptilian humanoids that possess both crocodile-like and serpent-like features. \
 	They are a proud, warlike species that favors honor and strength, their home, Moghes, is a desert planet but was once believed to be full of life. \
 	Of all the currently known sentient species, the Unathi are the most unequal in gender with females tending to be property of the males. Most Unathi \
 	outside of Moghes tend to be exiles however, and with influence of other species the gender difference is not nearly as pronounced. Unathi were \
 	humanity's second contact, and despite their aggressive nature, seem to get along well enough with humanity, though are often considered to be \
-	'second-class' citizens and are rarely seen in jobs other than where muscle is needed." // This probably needs to be updated.
-	*/
+	'second-class' citizens and are rarely seen in jobs other than where muscle is needed." // ToDo: Update with Unathi rewrite from Polaris.
 
 /datum/lore/codex/page/tajaran
 	name = "Tajaran"
@@ -246,6 +241,7 @@
 	unless on a contractual basis or otherwise under their own volition."
 
 // Drone lore
+/*
 /datum/lore/codex/category/drone
 	name = "Drones"
 	keywords = list("Drone")
@@ -262,7 +258,7 @@
 		/datum/lore/codex/page/emergence,
 		/datum/lore/codex/page/emergent_intelligence_oversight,
 		/datum/lore/codex/category/drone_classes,
-		)
+		)*/
 
 /datum/lore/codex/page/codeline
 	name = "Codeline"
@@ -272,6 +268,7 @@
 	codeline<6E>s initial state or from a fully realized individual of that codeline. The degree of similarity between forks of the same codeline varies \
 	on the intelligence of the codeline, with low-level forks being virtually identical to high-level forks being no more similar than family members."
 
+/*
 /datum/lore/codex/page/emergence
 	name = "Emergence"
 	keywords = list("Seed AI")
@@ -279,6 +276,7 @@
 	extend to financial systems learning language, for instance, it is usually applied to hypothetical intelligences that become more intelligent than humans. \
 	Humanity has a long-standing cultural fear of emergent \"seed\" AI, egged on by Icarus memeticists and the occasional very real partial emergence events, where \
 	colony-control AI or other powerful systems begin to advance drastically in power, usually ending with the AI being shut down after crashing a handful of major systems."
+*/
 
 /datum/lore/codex/page/emergent_intelligence_oversight
 	name = "Emergent Intelligence Oversight"
@@ -288,7 +286,7 @@
 	groups bristle at the EIO<49>s human-centric viewpoint, but most are glad to have a different boogeyman in the form of drone intelligences. The tiny population \
 	of A-class drones are generally frightened of the EIO<49>s total power over them."
 
-/datum/lore/codex/category/drone_classes
+/*/datum/lore/codex/category/drone_classes
 	name = "Drone Classifications"
 	keywords = list("Class", "Drone Class")
 	data = "To aid in its work, the EIO has created a system of classifications corresponding to different levels of drone intelligence. Higher classes are more \
@@ -368,3 +366,4 @@
 	data = "X-class drones emerge from unrated software, are produced by rogue labs, or cross the border from foreign space. They are considered a threat to national \
 	security and deleted when encountered in SolGov space, with the producers prosecuted legally if it has a SolGov origin. The few Skrellian drone labs will usually \
 	rate their product with EIO to allow their product to be imported."
+*/

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -1468,4 +1468,4 @@ Departamental Swimsuits, for general use
 	icon_state = "sfjacket"
 
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
-	item_state = "sfjacket_mob"
+	item_state = "sfjacket_mob"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -31,10 +31,13 @@
 
 */
 
+
+////////////////////////////////////////////////////////////
 //////////////////// Projectile Weapons ////////////////////
+////////////////////////////////////////////////////////////
 // For general use
 /obj/item/weapon/gun/projectile/automatic/battlerifle
-	name = "\improper BR55 Service Rifle"
+	name = "\improper UNSC service rifle"
 	desc = "You had your chance to be afraid before you joined my beloved Corps! But, to guide you back to the true path, I brought this motivational device! Uses unique 9.5x40mm rounds."
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "battlerifle"
@@ -56,24 +59,65 @@
 
 // For general use
 /obj/item/weapon/gun/projectile/shotgun/pump/unsc
-	name = "\improper M45E Tactical Shotgun"
-	desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day."
-
+	name = "\improper UNSC tactical shotgun"
+	desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day. Uses 12g rounds."
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "haloshotgun"
-
 	icon_override = 'icons/obj/gun_vr.dmi'
 	item_state = "haloshotgun_i"
 	item_icons = null
-
 	ammo_type = /obj/item/ammo_casing/a12g
 	max_shells = 12
 
+// For general use
+/obj/item/weapon/gun/projectile/automatic/pdw
+	name = "personal defense weapon"
+	desc = "The X-9MM is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, but hasn't yet caught on with NanoTrasen. Uses 9mm rounds."
+	icon = 'icons/obj/gun_vr.dmi'
+	icon_state = "pdw"
+	item_state = "c20r" // Placeholder
+	w_class = ITEMSIZE_NORMAL
+	caliber = "9mm"
+	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
+	slot_flags = SLOT_BELT
+	load_method = MAGAZINE
+	magazine_type = /obj/item/ammo_magazine/m9mml
+	allowed_magazines = list(/obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mml)
+
+	firemodes = list(
+		list(mode_name="semiauto",       burst=1, fire_delay=0,    move_delay=null, burst_accuracy=null, dispersion=null),
+		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6,    burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6))
+		)
+
+/obj/item/weapon/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands)
+	..()
+	if(istype(ammo_magazine,/obj/item/ammo_magazine/m9mm))
+		icon_state = "pdw-short"
+	else
+		icon_state = (ammo_magazine)? "pdw" : "pdw-empty"
+	if(!ignore_inhands) update_held_icon()
+
+// For general use
+/obj/item/weapon/gun/energy/imperial
+	name = "imperial energy pistol"
+	desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that is only about the size of an average energy pistol, yet with the fire power of a laser carbine."
+	icon_state = "ge_pistol"
+	item_state = "ge_pistol"
+	fire_sound = 'sound/weapons/mandalorian.ogg'
+	icon = 'icons/obj/gun_vr.dmi'
+	item_icons = list(slot_r_hand_str = 'icons/obj/gun_vr.dmi', slot_l_hand_str = 'icons/obj/gun_vr.dmi') // WORK YOU FUCKING CUNT PIECE OF SHIT BASTARD STUPID BITCH ITEM ICON AAAAHHHH
+	item_state_slots = list(slot_r_hand_str = "ge_pistol_r", slot_l_hand_str = "ge_pistol_l")
+	slot_flags = SLOT_BELT
+	w_class = ITEMSIZE_NORMAL
+	force = 10
+	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2)
+	matter = list(DEFAULT_WALL_MATERIAL = 2000)
+	projectile_type = /obj/item/projectile/beam/imperial
+
 // jertheace : Jeremiah 'Ace' Acacius
 /obj/item/weapon/gun/projectile/shotgun/pump/unsc/fluff/ace
-	name = "Ace's M45D Tactical Shotgun" // D-model holds half as many shells as the normal version so as not to be OP as shit. Better than shotgun, worse than combat shotgun.
-	desc = "Owned by the respected (or feared?) veteran Captain of VORE Station. Inscribed on the barrel are the words \"Speak softly, and carry a big stick.\" It has a folding stock so it can fit into bags."
-	w_class = ITEMSIZE_NORMAL // Because collapsable stock so it fits in backpacks.
+	name = "Ace's tactical shotgun" // D-model holds half as many shells as the normal version so as not to be OP as shit. Better than normal shotgun, worse than combat shotgun.
+	desc = "Owned by the respected (or feared?) veteran Captain of VORE Station. Inscribed on the barrel are the words \"Speak softly, and carry a big stick.\""
 	ammo_type = /obj/item/ammo_casing/a12g/stunshell
 	max_shells = 6
 
@@ -81,40 +125,31 @@
 /obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian //Now that it is actually Single-Action and not hacky broken SA, I see no reason to nerf this down to .38. --Joan Risu
 	name = "Big Iron revolver"
 	desc = "A .357 revolver for veteran rangers on the planet Orta. The right side of the handle has a logo for Quarion industries, and the left is the Rangers. The primary ammo for this gun is .357 rubber. According to the CentCom Chief of Security, this revolver was more controversial than it needed to be."
-
 	icon = 'icons/vore/custom_guns_vr.dmi'
 	icon_state = "tasaldrevolver"
-
 	item_state = "revolver"
-
 	fire_sound = 'sound/weapons/pistol.ogg'
 	ammo_type = /obj/item/ammo_casing/a357/rubber //Like I said, no reason to nerf. --Joan Risu
 	var/recentpump = 0
 	var/cocksound = 'sound/weapons/revolvercock.ogg'
-
 	consume_next_projectile()
 		if(chambered)
 			return chambered.BB
 		usr << "<span class='warning'>It's a single action revolver, pull the hammer back!</span>"
 		return null
-
 	attack_self(mob/living/user as mob)
 		if(world.time >= recentpump + 10)
 			pump(user)
 			recentpump = world.time
-
 	proc/pump(mob/M as mob)
 		playsound(M, cocksound, 60, 1)
-
 		if(chambered)//We have a shell in the chamber
 			chambered.loc = get_turf(src)//Eject casing
 			chambered = null
-
 		if(loaded.len)
 			var/obj/item/ammo_casing/AC = loaded[1] //load next casing.
 			loaded -= AC //Remove casing from loaded list.
 			chambered = AC
-
 		update_icon()
 
 /obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian/attack_hand(mob/user as mob)
@@ -127,10 +162,8 @@
 /obj/item/weapon/gun/projectile/revolver/fluff/ryan_winz_revolver
 	name = "Ryan's 'Devilgun'"
 	desc = "You notice the serial number on the revolver is 666. The word 'Sin' is engraved on the blood-red rosewood grip. Uses .357 rounds."
-
 	icon = 'icons/vore/custom_guns_vr.dmi'
 	icon_state = "ryan_winz"
-
 	item_state = "revolver"
 
 /obj/item/weapon/gun/projectile/revolver/fluff/ryan_winz_revolver/redemption
@@ -153,7 +186,6 @@
 	desc = "This unique looking handgun is engraved with roses along the barrel and the cylinder as well as the initials DM under the grip. Along the middle of the barrel an engraving shows the words 'Mateba Unica 6'. Uses .357 rounds."
 	icon_state = "mateba"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
-
 	ammo_type = /obj/item/ammo_casing/a357/stun
 
 // SilencedMP5A5 : Serdykov Antoz
@@ -195,71 +227,6 @@
 	item_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	if(!ignore_inhands) update_held_icon()
 
-/*
-// For general use
-/obj/item/weapon/gun/projectile/automatic/m14/fluff/gallian
-	name = "\improper Gallian 4 Rifle"
-	desc = "The ever reliable Gallian 4 Rifle. Produced by the National Armory on the Planet of Gaia located in Gallia, the Gallian 4 Rifle offers high accuracy and is widely used in the United Federation's Military. Uses 7.62mm rounds."
-*/
-
-// For general use
-/obj/item/weapon/gun/projectile/shotgun/pump/rifle/zmkar
-	name = "\improper ZM Kar 1"
-	desc = "A reproduction of an old ZM Kar 1 Rifle from the Autocratic East Europan Imperial Alliance of Gaia. Popular among imperials and collectors within the Federation and its allies. Uses 7.62mm rounds."
-
-// For general use
-/obj/item/weapon/gun/projectile/shotgun/pump/rifle/wicked
-	name = "Wicked Butterfly ZM Kar S1"
-	desc = "A customized bolt-action sniper rifle that was carried by some of the most revered snipers in the Federation. The stock has a small butterfly engraved on it. Uses 7.62mm rounds."
-
-	icon = 'icons/vore/custom_guns_vr.dmi'
-	icon_state = "wickedbutterfly"
-
-	icon_override = 'icons/obj/gun_vr.dmi'
-	item_state = "SVD"
-	item_icons = null
-
-	recoil = 2 //extra kickback
-	accuracy = -1
-	scoped_accuracy = 2
-	load_method = SINGLE_CASING
-
-	verb/scope()
-		set category = "Object"
-		set name = "Use Scope"
-		set popup_menu = 1
-
-		toggle_scope(2.0)
-
-// For general use
-/obj/item/weapon/gun/projectile/automatic/pdw // Vorestation SMG because the WT550 is ugly and bad.
-	name = "personal defense weapon"
-	desc = "The X-9MM is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, but hasn't yet caught on with NanoTrasen. Uses 9mm rounds."
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_state = "pdw"
-	item_state = "c20r" // Placeholder
-	w_class = ITEMSIZE_NORMAL
-	caliber = "9mm"
-	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
-	slot_flags = SLOT_BELT
-	load_method = MAGAZINE
-	magazine_type = /obj/item/ammo_magazine/m9mml
-	allowed_magazines = list(/obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mml)
-
-	firemodes = list(
-		list(mode_name="semiauto",       burst=1, fire_delay=0,    move_delay=null, burst_accuracy=null, dispersion=null),
-		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6,    burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6))
-		)
-
-/obj/item/weapon/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands)
-	..()
-	if(istype(ammo_magazine,/obj/item/ammo_magazine/m9mm))
-		icon_state = "pdw-short"
-	else
-		icon_state = (ammo_magazine)? "pdw" : "pdw-empty"
-	if(!ignore_inhands) update_held_icon()
-
-
 //Currently, the only problem I have now is that this weapon's item_state isn't working.
 /obj/item/weapon/gun/projectile/automatic/fluff/crestrose
 	name = "Crescent Rose"
@@ -423,18 +390,18 @@
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/fluff/kari_akiren
 	name = "clockwork rifle"
 	desc = "Brass, copper, and lots of gears. Well lubricated for fluid movement as each round is loaded, locked, and fired. Just like clockwork."
-
 	icon = 'icons/vore/custom_guns_vr.dmi'
 	icon_state = "clockworkrifle_icon"
-
 	icon_override = 'icons/vore/custom_guns_vr.dmi'
 	item_state = "clockworkrifle"
 	item_icons = null
 
+/* Permit Expired
 //Razerwing:Archer Maximus
 /obj/item/weapon/gun/projectile/colt/fluff/archercolt
 	name = "\improper MEUSOC .45"
 	desc = "Some serious drywall work, coming up!"
+*/
 
 //////////////////// Energy Weapons ////////////////////
 
@@ -442,18 +409,13 @@
 /obj/item/weapon/gun/energy/gun/eluger
 	name = "energy Luger"
 	desc = "The finest sidearm produced by RauMauser, this pistol can punch a hole through inch thick steel plating. This ain't your great-grand-daddy's Luger! Can switch between stun and kill."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "elugerstun100"
-
 	item_state = "gun"
-
 	charge_cost = 100 //How much energy is needed to fire.
 	projectile_type = /obj/item/projectile/beam/stun
-
 	modifystate = "elugerstun"
 	fire_sound = 'sound/weapons/Taser.ogg'
-
 	firemodes = list(
 	list(mode_name="stun", charge_cost=100,projectile_type=/obj/item/projectile/beam/stun, modifystate="elugerstun", fire_sound='sound/weapons/Taser.ogg'),
 	list(mode_name="lethal", charge_cost=200,projectile_type=/obj/item/projectile/beam/eluger, modifystate="elugerkill", fire_sound='sound/weapons/eluger.ogg'),
@@ -464,20 +426,16 @@
 /obj/item/weapon/gun/projectile/lamia
 	name = "FS HG .44 \"Lamia\""
 	desc = "Uses .44 rounds."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "Headdeagle"
 	item_state = "revolver"
-
 	fire_sound = 'sound/weapons/Gunshot.ogg'
-
 	caliber = ".44"
 	magazine_type = /obj/item/ammo_magazine/m44/rubber
 	allowed_magazines = list(/obj/item/ammo_magazine/m44,/obj/item/ammo_magazine/m44/rubber)
 	load_method = MAGAZINE
 	auto_eject = 1
 	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
-
 	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4)
 
 /obj/item/weapon/gun/projectile/lamia/update_icon()
@@ -493,21 +451,16 @@
 /obj/item/weapon/gun/projectile/giskard
 	name = "FS HG .32 \"Giskard\""
 	desc = "Can even fit into the pocket! Uses .32 rounds."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "giskardcivil"
-
 	caliber = ".32"
 	magazine_type = /obj/item/ammo_magazine/m32
 	allowed_magazines = list(/obj/item/ammo_magazine/m32)
 	load_method = MAGAZINE
 	fire_delay = 0.6
 	accuracy = 1
-
 	w_class = ITEMSIZE_SMALL
-
 	fire_sound = 'sound/weapons/semiauto.ogg'
-
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3)
 
 /obj/item/weapon/gun/projectile/giskard/update_icon()
@@ -521,26 +474,21 @@
 /obj/item/weapon/gun/projectile/olivaw
 	name = "FS HG .32 \"Olivaw\""
 	desc = "A more advanced version of the \"Giskard\". This one seems to have a two-round burst-fire mode. Uses .32 rounds."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "olivawcivil"
-
 	caliber = ".32"
 	magazine_type = /obj/item/ammo_magazine/m32
 	allowed_magazines = list(/obj/item/ammo_magazine/m32)
 	fire_delay = 1.2
 	load_method = MAGAZINE
 	accuracy = 2
-
 	fire_sound = 'sound/weapons/semiauto.ogg'
-
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	firemodes = list(
 		list(mode_name="semiauto",       burst=1, fire_delay=1.2,    move_delay=null, burst_accuracy=null, dispersion=null),
 		list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4,    burst_accuracy=list(0,-1),       dispersion=list(1.2, 1.8)),
 		)
 
-	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
-
 /obj/item/weapon/gun/projectile/olivaw/update_icon()
 	..()
 	if(ammo_magazine && ammo_magazine.stored_ammo.len)
@@ -552,15 +500,12 @@
 /obj/item/weapon/gun/projectile/revolver/consul
 	name = "FS REV .44 \"Consul\""
 	desc = "Are you feeling lucky, punk? Uses .44 rounds."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "inspector"
 	item_state = "revolver"
-
 	caliber = ".44"
 	ammo_type = /obj/item/ammo_casing/a44/rubber
 	handle_casings = CYCLE_CASINGS
-
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 
 /obj/item/weapon/gun/projectile/revolver/consul/proc/update_charge()
@@ -577,21 +522,17 @@
 /obj/item/weapon/gun/projectile/automatic/SMG_sol
 	name = "FS SMG 9x19 \"Sol\""
 	desc = "A standard-issued weapon used by Ironhammer operatives. Compact and reliable. Uses 9mm rounds."
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "SMG-IS"
 	item_state = "wt550"
-
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BELT
-
 	caliber = "9mm"
 	magazine_type = /obj/item/ammo_magazine/m9mm
 	allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
 	load_method = MAGAZINE
 	multi_aim = 1
 	burst_delay = 2
-
 	firemodes = list(
 		list(mode_name="semiauto",       burst=1, fire_delay=0,    move_delay=null, burst_accuracy=null, dispersion=null),
 		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4,    burst_accuracy=list(0,-1,-1),       dispersion=list(0.0, 0.6, 1.0)),
@@ -617,28 +558,22 @@
 /obj/item/weapon/gun/energy/gun/martin
 	name = "FS PDW E \"Martin\""
 	desc = "A small holdout e-gun. Don't miss!"
-
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "PDW"
 	item_state = "gun"
-
 	w_class = ITEMSIZE_SMALL
-
 	projectile_type = /obj/item/projectile/beam/stun
 	charge_cost = 1200
 	charge_meter = 0
 	modifystate = null
 	battery_lock = 1
-
 	fire_sound = 'sound/weapons/Taser.ogg'
-
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	firemodes = list(
 		list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
 		)
 
-	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
-
 /obj/item/weapon/gun/energy/gun/martin/proc/update_mode()
 	var/datum/firemode/current_mode = firemodes[sel_mode]
 	switch(current_mode.name)
@@ -649,15 +584,30 @@
 	overlays.Cut()
 	update_mode()
 
+/////////////////////////////////////////////////////
 //////////////////// Custom Ammo ////////////////////
+/////////////////////////////////////////////////////
 //---------------- Beams ----------------
 /obj/item/projectile/beam/eluger
 	name = "laser beam"
-	icon_state = "emitter"
+	icon_state = "xray"
+	light_color = "#00FF00"
+	muzzle_type = /obj/effect/projectile/xray/muzzle
+	tracer_type = /obj/effect/projectile/xray/tracer
+	impact_type = /obj/effect/projectile/xray/impact
+
+/obj/item/projectile/beam/imperial
+	name = "laser beam"
+	icon_state = "darkb"
+	light_color = "#8837A3"
+	muzzle_type = /obj/effect/projectile/darkmatter/muzzle
+	tracer_type = /obj/effect/projectile/darkmatter/tracer
+	impact_type = /obj/effect/projectile/darkmatter/impact
 
 /obj/item/projectile/beam/stun/kin21
 	name = "kinh21 stun beam"
 	icon_state = "omnilaser"
+	light_color = "#0000FF"
 	muzzle_type = /obj/effect/projectile/laser_omni/muzzle
 	tracer_type = /obj/effect/projectile/laser_omni/tracer
 	impact_type = /obj/effect/projectile/laser_omni/impact
@@ -778,7 +728,6 @@
 	caliber = ".357"
 	ammo_type = /obj/item/ammo_casing/a357/flash
 
-
 /obj/item/ammo_casing/a357/flash
 	desc = "A .357 flash bullet casing."
 	caliber = ".357"

vorestation.dme

@@ -924,6 +924,7 @@
 #include "code\game\objects\items\weapons\RSF.dm"
 #include "code\game\objects\items\weapons\scrolls.dm"
 #include "code\game\objects\items\weapons\shields.dm"
+#include "code\game\objects\items\weapons\shields_vr.dm"
 #include "code\game\objects\items\weapons\stunbaton.dm"
 #include "code\game\objects\items\weapons\surgery_tools.dm"
 #include "code\game\objects\items\weapons\swords_axes_etc.dm"
@@ -997,6 +998,7 @@
 #include "code\game\objects\items\weapons\material\twohanded.dm"
 #include "code\game\objects\items\weapons\material\whetstone.dm"
 #include "code\game\objects\items\weapons\melee\energy.dm"
+#include "code\game\objects\items\weapons\melee\energy_vr.dm"
 #include "code\game\objects\items\weapons\melee\misc.dm"
 #include "code\game\objects\items\weapons\storage\backpack.dm"
 #include "code\game\objects\items\weapons\storage\backpack_vr.dm"
@@ -1339,6 +1341,7 @@
 #include "code\modules\clothing\glasses\hud.dm"
 #include "code\modules\clothing\glasses\hud_vr.dm"
 #include "code\modules\clothing\gloves\arm_guards.dm"
+#include "code\modules\clothing\gloves\arm_guards_vr.dm"
 #include "code\modules\clothing\gloves\boxing.dm"
 #include "code\modules\clothing\gloves\color.dm"
 #include "code\modules\clothing\gloves\gauntlets.dm"
@@ -1358,12 +1361,14 @@
 #include "code\modules\clothing\masks\boxing.dm"
 #include "code\modules\clothing\masks\breath.dm"
 #include "code\modules\clothing\masks\gasmask.dm"
+#include "code\modules\clothing\masks\gasmask_vr.dm"
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\monitor.dm"
 #include "code\modules\clothing\masks\voice.dm"
 #include "code\modules\clothing\shoes\boots.dm"
 #include "code\modules\clothing\shoes\colour.dm"
 #include "code\modules\clothing\shoes\leg_guards.dm"
+#include "code\modules\clothing\shoes\leg_guards_vr.dm"
 #include "code\modules\clothing\shoes\magboots.dm"
 #include "code\modules\clothing\shoes\miscellaneous.dm"
 #include "code\modules\clothing\spacesuits\alien.dm"
@@ -1412,6 +1417,7 @@
 #include "code\modules\clothing\suits\wiz_robe.dm"
 #include "code\modules\clothing\suits\xenos\seromi.dm"
 #include "code\modules\clothing\under\color.dm"
+#include "code\modules\clothing\under\imperial_vr.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
 #include "code\modules\clothing\under\miscellaneous_vr.dm"
 #include "code\modules\clothing\under\nanotrasen_vr.dm"