Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.

code/modules/admin/secrets.dm

@@ -54,6 +54,7 @@
 			<A href='?src=\ref[src];[HrefToken()];secrets=quickpower'>Power all SMES</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=traitor_all'>Everyone is the traitor</A><BR>
+			<A href='?src=\ref[src];[HrefToken()];secrets=ak47s'>AK-47s For Everyone!</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=guns'>Summon Guns</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=magic'>Summon Magic</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=events'>Summon Events (Toggle)</A><BR>
@@ -457,6 +458,13 @@
 			message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
 			priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
 
+		if("ak47s")
+			if(!check_rights(R_FUN))
+				return
+			message_admins("[key_name_admin(usr)] activated AK-47s for Everyone!")
+			usr.client.ak47s()
+			sound_to_playing_players('sound/misc/ak47s.ogg')
+
 		if("guns")
 			if(!check_rights(R_FUN))
 				return

code/modules/admin/verbs/ak47s.dm

@@ -0,0 +1,22 @@
+GLOBAL_VAR_INIT(terrorism, FALSE)
+/client/proc/ak47s() // For when you just can't summon guns worthy of a firefight
+	if(!SSticker.HasRoundStarted())
+		alert("The game hasn't started yet!")
+		return
+	GLOB.terrorism = TRUE
+
+	for(var/mob/living/carbon/human/H in GLOB.player_list)
+		if(H.stat == DEAD || !(H.client))
+			continue
+		H.make_terrorism()
+
+	send_to_playing_players("<span class='boldannounce'><font size=6>MOTHER RUSSIA ARMS THE MOB!</font></span>")
+
+/mob/living/carbon/human/proc/make_terrorism()
+	for(var/obj/item/I in held_items)
+		qdel(I)
+	var/obj/item/gun/energy/laser/LaserAK/AK = new(src)
+	if(!GLOB.terrorism)
+		AK.admin_spawned = TRUE //To prevent announcing
+	put_in_hands(AK)
+	AK.pickup(src) //For the stun shielding

code/modules/clothing/glasses/vg_glasses.dm

@@ -6,18 +6,21 @@
 	name = "purple sunglasses"
 	icon_state = "sun_purple"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/glasses.dmi'
 
 /obj/item/clothing/glasses/sunglasses/star
 	name = "star-shaped sunglasses"
 	desc = "Novelty sunglasses, both lenses are in the shape of a star."
 	icon_state = "sun_star"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/glasses.dmi'
 
 /obj/item/clothing/glasses/sunglasses/rockstar
 	name = "red star-shaped sunglasses"
 	desc = "Novelty sunglasses with a fancy silver frame and two red-tinted star-shaped lenses. You should probably stomp on them and get a pair of normal ones."
 	icon_state = "sun_star_silver"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/glasses.dmi'
 
 /obj/item/clothing/glasses/gglasses
 	name = "Green Glasses"
@@ -25,6 +28,7 @@
 	icon_state = "gglasses"
 	item_state = "gglasses"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/glasses.dmi'
 
 /obj/item/clothing/glasses/welding/superior
 	name = "superior welding goggles"
@@ -32,6 +36,7 @@
 	icon_state = "rwelding-g"
 	item_state = "rwelding-g"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/glasses.dmi'
 	actions_types = list(/datum/action/item_action/toggle)
 	flash_protect = 2
 	tint = 1

code/modules/clothing/head/cit_hats.dm

@@ -4,3 +4,4 @@
 	icon = 'icons/obj/clothing/cit_hats.dmi'
 	icon_state = "hunter"
 	item_state = "hunter_worn"
+	icon_override = 'icons/mob/citadel/head.dmi'

code/modules/clothing/head/vg_hats.dm

@@ -13,6 +13,7 @@
 	flags_1 = STOPSPRESSUREDMAGE_1
 	strip_delay = 80
 	dog_fashion = null
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/helmet/aviatorhelmet
 	name = "Aviator Helmet"
@@ -21,6 +22,7 @@
 	item_state = "aviator_helmet"
 	icon_state = "aviator_helmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/helmet/biker
 	name = "Biker's Helmet"
@@ -28,6 +30,7 @@
 	armor = list(melee = 25, bullet = 15, laser = 20, energy = 10, bomb = 10, bio = 0, rad = 0)
 	icon_state = "biker_helmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
 
 /obj/item/clothing/head/helmet/richard
@@ -36,6 +39,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	icon_state = "richard"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
 
 /obj/item/clothing/head/helmet/megahelmet
@@ -44,6 +48,7 @@
 	icon_state = "megahelmet"
 	item_state = "megahelmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	siemens_coefficient = 1
 
 /obj/item/clothing/head/helmet/protohelmet
@@ -52,6 +57,7 @@
 	icon_state = "protohelmet"
 	item_state = "protohelmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	siemens_coefficient = 1
 
 /obj/item/clothing/head/helmet/megaxhelmet
@@ -60,7 +66,7 @@
 	icon_state = "megaxhelmet"
 	item_state = "megaxhelmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
-	siemens_coefficient = 1
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/helmet/joehelmet
 	name = "Sniper Helmet"
@@ -69,7 +75,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
 	item_state = "joehelmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
-	siemens_coefficient = 1
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/helmet/doomguy
 	name = "Doomguy's helmet"
@@ -78,8 +84,8 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
 	item_state = "doom"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	armor = list(melee = 50, bullet = 40, laser = 40,energy = 40, bomb = 5, bio = 0, rad = 0)
-	siemens_coefficient = 1
 
 /obj/item/clothing/head/helmet/neorussian
 	name = "neo-Russian helmet"
@@ -87,6 +93,7 @@
 	icon_state = "nr_helmet"
 	item_state = "nr_helmet"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 
 /obj/item/clothing/head/stalhelm
@@ -95,20 +102,23 @@
 	icon_state = "stalhelm"
 	item_state = "stalhelm"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/panzer
 	name = "Panzer Cap"
-	desc = "Ein Hut passen nur für die größten Tanks."
+	desc = "Command any mech in style."
 	icon_state = "panzercap"
 	item_state = "panzercap"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/naziofficer
 	name = "Officer Cap"
-	desc = "Ein Hut von Offizieren in der Nazi-Partei getragen."
+	desc = "Style is all that matters."
 	icon_state = "officercap"
 	item_state = "officercap"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 
 /obj/item/clothing/head/russobluecamohat
@@ -124,6 +134,7 @@
 	icon_state = "russofurhat"
 	item_state = "russofurhat"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/squatter_hat
 	name = "slav squatter hat"
@@ -131,6 +142,7 @@
 	item_state = "squatter_hat"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
 	desc = "Cyka blyat."
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/snake
 	name = "snake head"
@@ -138,6 +150,7 @@
 	icon_state = "snakehead"
 	item_state = "snakehead"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/mummy_rags
 	name = "mummy rags"
@@ -146,6 +159,7 @@
 	item_state = "mummy"
 	item_color = "mummy"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
 
 /obj/item/clothing/head/clownpiece
@@ -154,6 +168,7 @@
 	icon_state = "clownpiece"
 	item_state = "clownpiece"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/mitre
 	name = "mitre"
@@ -161,6 +176,7 @@
 	icon_state = "mitre"
 	item_state = "mitre"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/head/tinfoil
 	name = "tinfoil hat"
@@ -168,6 +184,7 @@
 	icon_state = "foilhat"
 	item_state = "paper"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	siemens_coefficient = 2
 
 /obj/item/clothing/head/celtic
@@ -176,3 +193,4 @@
 	icon_state = "celtic_crown"
 	item_state = "celtic_crown"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'

code/modules/clothing/masks/vg_masks.dm

@@ -3,15 +3,18 @@
 	desc = "Some pranksters are truly magical."
 	icon_state = "wizzclown"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/masks.dmi'
 
 /obj/item/clothing/mask/chapmask
 	name = "venetian mask"
 	desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut."
 	icon_state = "chapmask"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/masks.dmi'
 
 /obj/item/clothing/mask/neorussian
 	name = "neo-Russian mask"
 	desc = "Somehow, it makes you act and look way more polite than usual."
 	icon_state = "nr_mask"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/masks.dmi'

code/modules/clothing/shoes/vg_shoes.dm

@@ -5,6 +5,7 @@
 	icon_state = "leather"
 	item_color = "leather"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/magboots/deathsquad
 	desc = "Very expensive and advanced magnetic boots, used only by the elite during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -12,6 +13,7 @@
 	icon_state = "DS-magboots0"
 	magboot_state = "DS-magboots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	origin_tech = null
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
@@ -20,6 +22,7 @@
 	name = "atmospherics magboots"
 	icon_state = "atmosmagboots0"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 	magboot_state = "atmosmagboots"
 	resistance_flags = FIRE_PROOF
 
@@ -28,81 +31,95 @@
 	desc = "Simon's Shoes."
 	icon_state = "simonshoes"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/kneesocks
 	name = "kneesocks"
 	desc = "A pair of girly knee-high socks."
 	icon_state = "kneesock"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/jestershoes
 	name = "Jester Shoes"
 	desc = "As worn by the clowns of old."
 	icon_state = "jestershoes"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/aviatorboots
 	name = "Aviator Boots"
 	desc = "Boots suitable for just about any occasion."
 	icon_state = "aviator_boots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/libertyshoes
 	name = "Liberty Shoes"
 	desc = "Freedom isn't free, neither were these shoes."
 	icon_state = "libertyshoes"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/megaboots
 	name = "DRN-001 Boots"
 	desc = "Large armored boots, very weak to large spikes."
 	icon_state = "megaboots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/protoboots
 	name = "Prototype Boots"
 	desc = "Functionally identical to the DRN-001 model's boots, but in red."
 	icon_state = "protoboots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/megaxboots
 	name = "Maverick Hunter boots"
 	desc = "Regardless of how much stronger these boots are than the DRN-001 model's, they're still extremely easy to pierce with a large spike."
 	icon_state = "megaxboots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/joeboots
 	name = "Sniper Boots"
 	desc = "Nearly identical to the Prototype's boots, except in black."
 	icon_state = "joeboots"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/doomguy
 	name = "Doomguy's boots"
-	desc = ""
+	desc = "If you look closely, you might see skull fragments still buried in these boots."
 	icon_state = "doom"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/rottenshoes
 	name = "rotten shoes"
 	desc = "These shoes seem perfect for sneaking around."
 	icon_state = "rottenshoes"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/sandal/slippers
 	name = "magic slippers"
 	icon_state = "slippers"
 	desc = "For the wizard that puts comfort first. Who's going to laugh?"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/slippers_worn
 	name = "worn bunny slippers"
 	desc = "Fluffy..."
 	icon_state = "slippers_worn"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'
 
 /obj/item/clothing/shoes/jackboots/neorussian
 	name = "neo-Russian boots"
 	desc = "Tovarish, no one will realize you stepped on a pile of shit if your pair already looks like shit."
 	icon_state = "nr_boots"
-	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/head.dmi'

code/modules/clothing/suits/vg_suits.dm

@@ -5,9 +5,10 @@
 	icon_state = "xcomarmor2"
 	item_state = "xcomarmor2"
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	armor = list(melee = 10, bullet = 50, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
 	siemens_coefficient = 0.5
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/armor/xcomsquaddie/dredd
 	name = "Judge Armor"
@@ -15,6 +16,7 @@
 	icon_state = "dredd-suit"
 	item_state = "dredd-suit"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 
 /obj/item/clothing/suit/armor/xcomarmor
@@ -23,10 +25,11 @@
 	icon_state = "xcomarmor1"
 	item_state = "xcomarmor1"
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	armor = list(melee = 50, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 30, bomb = 60, bio = 30, rad = 20)
 	slowdown = 1
 	siemens_coefficient = 0.5
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/armor/vest/neorussian
 	name = "neo-Russian vest"
@@ -34,6 +37,7 @@
 	icon_state = "nr_vest"
 	item_state = "nr_vest"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/armor/doomguy
 	name = "Doomguy's armor"
@@ -44,6 +48,7 @@
 	slowdown = 0
 	armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0)
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 
 /obj/item/clothing/suit/kaminacape
@@ -52,6 +57,7 @@
 	icon_state = "kaminacape"
 	body_parts_covered = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/officercoat
 	name = "Officer's Coat"
@@ -74,6 +80,7 @@
 	allowed = list(/obj/item/gun)
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/doshjacket
 	name = "Plasterer's Jacket"
@@ -81,6 +88,7 @@
 	icon_state = "doshjacket"
 	body_parts_covered = CHEST|GROIN|ARMS
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/maidapron
 	name = "Apron"
@@ -88,6 +96,7 @@
 	icon_state = "maidapron"
 	body_parts_covered = CHEST|GROIN
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/clownpiece
 	name = "small fairy wings"
@@ -95,12 +104,14 @@
 	icon_state = "clownpiece"
 	body_parts_covered = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/clownpiece/flying
 	name = "small fairy wings"
 	desc = "Some small and translucid insect-like wings. Looks like these are the real deal!"
 	icon_state = "clownpiece-fly"
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 /obj/item/clothing/suit/raincoat
 	name = "Raincoat"
@@ -108,5 +119,6 @@
 	icon_state = "raincoat"
 	body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/suit.dmi'
 
 

code/modules/clothing/under/vg_under.dm

@@ -5,6 +5,8 @@
 	item_color = "stripper_p"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/stripper_green
 	name = "green stripper outfit"
@@ -13,6 +15,8 @@
 	item_color = "stripper_g"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 
 /obj/item/clothing/under/wedding/bride_orange
@@ -23,6 +27,8 @@
 	item_color = "bride_orange"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/wedding/bride_purple
 	name = "purple wedding dress"
@@ -32,6 +38,8 @@
 	item_color = "bride_purple"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/wedding/bride_blue
 	name = "blue wedding dress"
@@ -41,6 +49,8 @@
 	item_color = "bride_blue"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/wedding/bride_red
 	name = "red wedding dress"
@@ -50,6 +60,8 @@
 	item_color = "bride_red"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/wedding/bride_white
 	name = "white wedding dress"
@@ -59,6 +71,8 @@
 	item_color = "bride_white"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/mankini
 	name = "pink mankini"
@@ -67,6 +81,8 @@
 	item_color = "mankini"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+/*
 
 /obj/item/clothing/under/psysuit
 	name = "dark undersuit"
@@ -76,6 +92,8 @@
 	item_color = "psysuit"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/officeruniform
 	name = "officer's uniform"
@@ -85,6 +103,8 @@
 	item_color = "officeruniform"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/soldieruniform
 	name = "soldier's uniform"
@@ -94,7 +114,9 @@
 	item_color = "soldieruniform"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
 
+*/
 /obj/item/clothing/under/squatter_outfit
 	name = "slav squatter tracksuit"
 	desc = "Cyka blyat."
@@ -103,6 +125,8 @@
 	item_color = "squatteroutfit"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/russobluecamooutfit
 	name = "russian blue camo"
@@ -112,6 +136,8 @@
 	item_color = "russobluecamo"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/stilsuit
 	name = "stillsuit"
@@ -121,6 +147,8 @@
 	item_color = "stilsuit"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/aviatoruniform
 	name = "aviator uniform"
@@ -130,6 +158,8 @@
 	item_color = "aviator_uniform"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/bikersuit
 	name = "biker's outfit"
@@ -138,6 +168,8 @@
 	item_color = "biker"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/jacketsuit
 	name = "richard's outfit"
@@ -147,6 +179,8 @@
 	item_color = "jacket"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 obj/item/clothing/under/mega
 	name = "\improper DRN-001 suit"
@@ -156,6 +190,8 @@ obj/item/clothing/under/mega
 	item_color = "mega"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/proto
 	name = "The Prototype Suit"
@@ -165,6 +201,8 @@ obj/item/clothing/under/mega
 	item_color = "proto"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/megax
 	name = "\improper Maverick Hunter regalia"
@@ -174,6 +212,8 @@ obj/item/clothing/under/mega
 	item_color = "megax"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/joe
 	name = "The Sniper Suit"
@@ -183,6 +223,8 @@ obj/item/clothing/under/mega
 	item_color = "joe"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/roll
 	name = "\improper DRN-002 Dress"
@@ -192,6 +234,8 @@ obj/item/clothing/under/mega
 	item_color = "roll"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/gokugidown
 	name = "turtle hermit undershirt"
@@ -201,6 +245,8 @@ obj/item/clothing/under/mega
 	item_color = "gokugidown"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/gokugi
 	name = "turtle hermit outfit"
@@ -210,6 +256,8 @@ obj/item/clothing/under/mega
 	item_color = "gokugi"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/doomguy
 	name = "\improper Doomguy's pants"
@@ -219,6 +267,8 @@ obj/item/clothing/under/mega
 	item_color = "doom"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/vault13
 	name = "vault 13 Jumpsuit"
@@ -228,6 +278,8 @@ obj/item/clothing/under/mega
 	item_color = "v13-jumpsuit"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/vault
 	name = "vault jumpsuit"
@@ -237,6 +289,8 @@ obj/item/clothing/under/mega
 	item_color = "v-jumpsuit"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/clownpiece
 	name = "Clownpiece's Pierrot suit"
@@ -246,6 +300,8 @@ obj/item/clothing/under/mega
 	item_color = "clownpiece"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/cia
 	name = "casual IAA outfit"
@@ -255,6 +311,8 @@ obj/item/clothing/under/mega
 	item_color = "cia"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/greaser
 	name = "greaser outfit"
@@ -263,6 +321,8 @@ obj/item/clothing/under/mega
 	item_state = "greaser_default"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/greaser/New()
 	var/greaser_colour = "default"
@@ -290,6 +350,8 @@ obj/item/clothing/under/mega
 	item_color = "shizunewinter"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 
 /obj/item/clothing/under/casualwear
@@ -300,6 +362,8 @@ obj/item/clothing/under/mega
 	item_color = "shizunenormal"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/keyholesweater
 	name = "keyhole sweater"
@@ -309,6 +373,8 @@ obj/item/clothing/under/mega
 	item_color = "keyholesweater"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/casualhoodie
 	name = "casual hoodie"
@@ -318,6 +384,8 @@ obj/item/clothing/under/mega
 	item_color = "hoodiejeans"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 
 /obj/item/clothing/under/casualhoodie/skirt
@@ -326,7 +394,7 @@ obj/item/clothing/under/mega
 	item_color = "hoodieskirt"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
-
+/*
 /obj/item/clothing/under/mummy_rags
 	name = "mummy rags"
 	desc = "Ancient rags taken off from some mummy."
@@ -336,6 +404,8 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	has_sensor = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+
 
 /obj/item/clothing/under/neorussian
 	name = "neo-Russian uniform"
@@ -345,6 +415,8 @@ obj/item/clothing/under/mega
 	item_color = "nr_uniform"
 	can_adjust = 0
 	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'
+*/
 
 /obj/item/clothing/under/rottensuit
 	name = "rotten suit"
@@ -353,4 +425,5 @@ obj/item/clothing/under/mega
 	item_state = "rottensuit"
 	item_color = "rottensuit"
 	can_adjust = 0
-	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon = 'icons/obj/clothing/vg_clothes.dmi'
+	icon_override = 'icons/mob/citadel/uniforms.dmi'

code/modules/mob/living/carbon/human/update_icons.dm

@@ -129,10 +129,10 @@ There are several things that need to be remembered:
 		if(dna && dna.species.sexes)
 			var/G = (gender == FEMALE) ? "f" : "m"
 			if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
-				uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/uniform.dmi', isinhands = FALSE, femaleuniform = U.fitted)
+				uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE, femaleuniform = U.fitted)
 
 		if(!uniform_overlay)
-			uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = 'icons/mob/uniform.dmi', isinhands = FALSE)
+			uniform_overlay = U.build_worn_icon(state = "[t_color]", default_layer = UNIFORM_LAYER, default_icon_file = ((w_uniform.icon_override) ? w_uniform.icon_override : 'icons/mob/uniform.dmi'), isinhands = FALSE)
 
 		overlays_standing[UNIFORM_LAYER] = uniform_overlay
 
@@ -154,7 +154,7 @@ There are several things that need to be remembered:
 		update_observer_view(wear_id)
 
 		//TODO: add an icon file for ID slot stuff, so it's less snowflakey
-		overlays_standing[ID_LAYER] = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = 'icons/mob/mob.dmi')
+		overlays_standing[ID_LAYER] = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.icon_override) ? wear_id.icon_override : 'icons/mob/mob.dmi'))
 
 	apply_overlay(ID_LAYER)
 
@@ -185,7 +185,7 @@ There are several things that need to be remembered:
 		var/t_state = gloves.item_state
 		if(!t_state)
 			t_state = gloves.icon_state
-		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = 'icons/mob/hands.dmi')
+		overlays_standing[GLOVES_LAYER] = gloves.build_worn_icon(state = t_state, default_layer = GLOVES_LAYER, default_icon_file = ((gloves.icon_override) ? gloves.icon_override : 'icons/mob/hands.dmi'))
 
 	apply_overlay(GLOVES_LAYER)
 
@@ -208,7 +208,7 @@ There are several things that need to be remembered:
 		update_observer_view(glasses,1)
 		if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES)))
 
-			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/eyes.dmi')
+			overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(state = glasses.icon_state, default_layer = GLASSES_LAYER, default_icon_file = ((glasses.icon_override) ? glasses.icon_override : 'icons/mob/eyes.dmi'))
 
 	apply_overlay(GLASSES_LAYER)
 
@@ -230,7 +230,7 @@ There are several things that need to be remembered:
 				client.screen += ears					//add it to the client's screen
 		update_observer_view(ears,1)
 
-		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = 'icons/mob/ears.dmi')
+		overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.icon_override) ? ears.icon_override : 'icons/mob/ears.dmi'))
 
 	apply_overlay(EARS_LAYER)
 
@@ -251,7 +251,7 @@ There are several things that need to be remembered:
 			if(hud_used.inventory_shown)			//if the inventory is open
 				client.screen += shoes					//add it to client's screen
 		update_observer_view(shoes,1)
-		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/feet.dmi')
+		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(state = shoes.icon_state, default_layer = SHOES_LAYER, default_icon_file = ((shoes.icon_override) ? shoes.icon_override : 'icons/mob/feet.dmi'))
 
 	apply_overlay(SHOES_LAYER)
 
@@ -297,7 +297,7 @@ There are several things that need to be remembered:
 		if(!t_state)
 			t_state = belt.icon_state
 
-		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = 'icons/mob/belt.dmi')
+		overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.icon_override) ? belt.icon_override : 'icons/mob/belt.dmi'))
 
 
 	apply_overlay(BELT_LAYER)
@@ -318,7 +318,7 @@ There are several things that need to be remembered:
 				client.screen += wear_suit
 		update_observer_view(wear_suit,1)
 
-		overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = 'icons/mob/suit.dmi')
+		overlays_standing[SUIT_LAYER] = wear_suit.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.icon_override) ? wear_suit.icon_override : 'icons/mob/suit.dmi'))
 
 	update_hair()
 	update_mutant_bodyparts()

code/modules/projectiles/ammunition/plasma.dm

@@ -6,7 +6,7 @@
 
 /obj/item/ammo_casing/energy/plasmagun/rifle
 	projectile_type = /obj/item/projectile/energy/plasmabolt/rifle
-	e_cost = 150
+	e_cost = 100
 
 /obj/item/ammo_casing/energy/plasmagun/light
 	projectile_type = /obj/item/projectile/energy/plasmabolt/light

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

@@ -8,7 +8,9 @@
 	clumsy_check = 0
 	needs_permit = 0
 	selfcharge = 1
+	cell_type = "/obj/item/stock_parts/cell/pulse"
 	icon = 'icons/obj/guns/VGguns.dmi'
+
 /obj/item/gun/energy/megabuster/proto
 	name = "Proto-buster"
 	icon_state = "protobuster"

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

@@ -4,8 +4,11 @@
 	icon_state = "xray"
 	w_class = WEIGHT_CLASS_NORMAL
 	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun)
+	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
 	ammo_x_offset = 2
 	shaded_charge = 1
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
 
 
 /obj/item/gun/energy/plasma/rifle
@@ -47,8 +50,11 @@
 	icon_state = "xcomlasergun"
 	item_state = null
 	icon = 'icons/obj/guns/VGguns.dmi'
+	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	ammo_x_offset = 4
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
 
 /obj/item/gun/energy/laser/LaserAK
 	name = "Laser AK470"
@@ -56,5 +62,8 @@
 	icon_state = "LaserAK"
 	item_state = null
 	icon = 'icons/obj/guns/VGguns.dmi'
+	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
 	ammo_type = list(/obj/item/ammo_casing/energy/laser)
 	ammo_x_offset = 4
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'

code/modules/projectiles/projectile/megabuster.dm

@@ -7,9 +7,13 @@
 	hitsound = 'sound/weapons/sear.ogg'
 	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
 	icon = 'icons/obj/VGprojectile.dmi'
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
 
 /obj/item/projectile/energy/megabuster
 	name = "buster pellet"
 	icon_state = "megabuster"
 	nodamage = 1
 	icon = 'icons/obj/VGprojectile.dmi'
+	lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'icons/mob/citadel/guns_righthand.dmi'

code/modules/projectiles/projectile/plasma.dm

@@ -2,7 +2,6 @@ obj/item/projectile/energy/plasmabolt
 	icon = 'icons/obj/VGProjectile.dmi'
 	name = "plasma bolt"
 	icon_state = "plasma"
-	knockdown = 0
 	flag = "energy"
 	damage_type = BURN
 	hitsound = 'sound/weapons/sear.ogg'
@@ -10,21 +9,27 @@ obj/item/projectile/energy/plasmabolt
 	light_range = 3
 	light_color = LIGHT_COLOR_GREEN
 
+/obj/item/projectile/energy/plasmabolt/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(isturf(target) || istype(target, /obj/structure/))
+		target.ex_act(EXPLODE_LIGHT)
+
+
 /obj/item/projectile/energy/plasmabolt/light
-	damage = 35
+	damage = 30
 	icon_state = "plasma2"
-	irradiate = 20
-	knockdown = 60
+	irradiate = 10
+	stamina = 20
 
 /obj/item/projectile/energy/plasmabolt/rifle
 	damage = 50
 	icon_state = "plasma3"
 	irradiate = 35
-	knockdown = 120
+	stamina = 120
 
 /obj/item/projectile/energy/plasmabolt/MP40k
 	damage = 35
 	eyeblur = 4
 	irradiate = 25
-	knockdown = 100
+	stamina = 100
 	icon_state = "plasma3"