Merge remote-tracking branch 'refs/remotes/VOREStation/master' into SHARP_MELEE_FIX

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -191,7 +191,7 @@
 	name = "Serdy's Weapon Box"
 	has_items = list(
 		/obj/item/weapon/permit/gun/fluff/silencedmp5a5,
-		/obj/item/weapon/gun/projectile/revolver/detective/fluff/serdy)
+		/obj/item/weapon/gun/projectile/colt/fluff/serdy)
 
 
 /*

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -1468,4 +1468,15 @@ Departamental Swimsuits, for general use
 	icon_state = "sfjacket"
 
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
-	item_state = "sfjacket_mob"
+	item_state = "sfjacket_mob"
+
+//General use
+/obj/item/clothing/head/fluff/headbando
+	name = "basic headband"
+	desc = "Perfect for martial artists, sweaty rogue operators, and tunnel gangsters."
+
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "headbando"
+
+	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+	item_state = "headbando"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -189,6 +189,16 @@
 	ammo_type = /obj/item/ammo_casing/a357/stun
 
 // SilencedMP5A5 : Serdykov Antoz
+/obj/item/weapon/gun/projectile/colt/fluff/serdy
+	name = "Raikov PPS/45"
+	desc = "An expertly crafted and reliable .45 sidearm with a 7 round single-stack magazine, originally built and in 2369 for frontier men and peacekeepers. The frame and slide are nickel plated, and it has a synthetic black ivory grip. The words 'Krasnaya Raketa' are engraved on the slide near the muzzle. It's relatively thin, but heavy. It also has an ambidextrous mag release and safety lever, making it grippable in either hand comfortably."
+	icon = 'icons/vore/custom_guns_vr.dmi'
+	item_state = "raikov"
+	icon_state = "raikov"
+	fire_sound = 'sound/weapons/45pistol_vr.ogg'
+	magazine_type = /obj/item/ammo_magazine/m45/rubber
+
+/* //Commented out due to weapon change.
 /obj/item/weapon/gun/projectile/revolver/detective/fluff/serdy //This forces it to be .38 bullets only
 	name = "Vintage S&W Model 10"
 	desc = "It's a classic S&W Model 10 revolver. This one in particular is beautifully restored with a chromed black frame and cylinder, and a nice redwood grip. The name 'Serdykov A.' is engraved into the base of the grip."
@@ -198,6 +208,7 @@
 	fire_sound = 'sound/weapons/deagle.ogg'
 	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
 	ammo_type = /obj/item/ammo_casing/a38r //Rubber rounds.
+*/
 
 // LuminescentRing : Briana Moore
 /obj/item/weapon/gun/projectile/derringer/fluff/briana

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -996,6 +996,30 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 	item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
 	item_flags = AIRTIGHT
 
+//verkister: Opie Eggbert - Spiffy fluff goggles
+/obj/item/clothing/glasses/spiffygogs
+	name = "Chad Goggles"
+	desc = "You can almost feel the raw power radiating off these strange specs."
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+	icon_state = "spiffygogs"
+	item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses")
+	toggleable = 1
+	off_state = "spiffygogsup"
+
+//General use
+/obj/item/clothing/accessory/tronket
+	name = "metal necklace"
+	desc = "A shiny steel chain with a vague metallic object dangling off it."
+	w_class = ITEMSIZE_SMALL
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+	icon_state = "tronket"
+	item_state = "tronket"
+	overlay_state = "tronket"
+	slot_flags = SLOT_TIE
+	slot = "over"
+
 //The perfect adminboos device?
 /obj/item/device/perfect_tele
 	name = "personal translocator"