Merge pull request #1473 from Cameron653/master

Serdy desc changes, serdy gun whitelist.

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -157,6 +157,16 @@
 
 	ammo_type = /obj/item/ammo_casing/a357/stun
 
+// SilencedMP5A5 : Serdykov Antoz
+/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."
+	icon = 'icons/vore/custom_guns_vr.dmi'
+	item_state = "model10"
+	icon_state = "model10"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	ammo_type = /obj/item/ammo_casing/c38r //Rubber rounds.
+
 
 // For general use
 /obj/item/weapon/gun/projectile/automatic/stg
@@ -390,7 +400,7 @@
 	w_class = ITEMSIZE_LARGE
 	fire_delay = 6
 	pixel_x = -16
-	
+
 	projectile_type = /obj/item/projectile/beam/stun/weak
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
 	modifystate = "g44estun"

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -417,7 +417,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 //SilencedMP5A5:Serdykov Antoz
 /obj/item/clothing/suit/armor/vest/wolftaur/serdy //SilencedMP5A5's specialty armor suit.
 	name = "Modified wolf-taur armor vest"
-	desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur, and seems modified."
+	desc = "A set of armor made from pieces of many other armors. There are two orange holobadges on it, one on the chestplate, one on the steel flank plates. The holobadges appear to be russian in origin. 'Kosmicheskaya Stantsiya-8' is printed in faded white letters on one side, along the spine. It smells strongly of dog."
 	species_restricted = null //Species restricted since all it cares about is a taur half
 	icon_override = 'icons/mob/taursuits_vr.dmi' //Needs to be this since it's 64*32
 	icon_state = "serdy_armor"
@@ -433,7 +433,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 
 /obj/item/clothing/head/helmet/serdy //SilencedMP5A5's specialty helmet. Uncomment if/when they make their custom item app and are accepted.
 	name = "Modified helmet"
-	desc = "Standard Security gear. Protects the head from impacts. This one appears to be modified."
+	desc = "An old production model steel-ceramic lined helmet with a white stripe and a custom orange visor. It has ear holes, and smells of dog."
 	icon = 'icons/vore/custom_clothes_vr.dmi'
 	icon_state = "serdyhelm"
 

code/modules/vore/fluffstuff/custom_permits_vr.dm

@@ -151,4 +151,17 @@
 
 	The individual named above is licensed by the Nanotrasen Department of Civil Protection
 	to carry one Derringer handgun with lethal ammo.
-	This license expires on 24/Apr/2563 and must be renewed by CentCom prior to this date."}
+	This license expires on 24/Apr/2563 and must be renewed by CentCom prior to this date."}
+
+
+
+// silenedmp5a5:Serdykov Antoz
+/obj/item/fluff/permit/silencedmp5a5
+	name = "Serdykov Antoz's Sidearm Permit"
+	desc = {"
+	<b>NAME:</b> Serdykov Antoz | <b>RACE:</b> German Shepherd | <b>HOMEWORLD:</b> N/A, Sol
+    <b>DOB:</b> 14/6/2516 | <b>HEIGHT:</b> 6'8" | <b>SEX:</b> Male
+
+	The individual named above is licensed by the Nanotrasen Department of Civil Protection
+	to carry one Vintage S&W Model 10 revolver with stun/rubber ammo.
+	This license expires on 24/Apr/2563 and must be renewed by CentCom prior to this date."}