From a535948e900d951a3ecb7a478ba7ee0e5ec6f1c7 Mon Sep 17 00:00:00 2001 From: killer653 Date: Thu, 11 May 2017 15:30:52 -0400 Subject: [PATCH] Serdy desc changes, serdy gun whitelist. --- .../modules/vore/fluffstuff/custom_guns_vr.dm | 12 +++++++++++- .../vore/fluffstuff/custom_items_vr.dm | 4 ++-- config/custom_items.txt | 6 ++++++ icons/vore/custom_guns_vr.dmi | Bin 24184 -> 25184 bytes 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index f28c958401b..9e3cde1dd18 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/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" diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 9f06f6b383b..94bd9945580 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/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" diff --git a/config/custom_items.txt b/config/custom_items.txt index accfcbd90d0..b044a1c283c 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -480,6 +480,12 @@ character_name: Serdykov Antoz item_path: /obj/item/device/modkit_conversion/fluff/serdykit } +{ +ckey: silencedmp5a5 +character_name: Serdykov Antoz +item_path: obj/item/weapon/gun/projectile/revolver/detective/fluff/serdy +} + { ckey: silvertalismen character_name: Tasy Ruffles diff --git a/icons/vore/custom_guns_vr.dmi b/icons/vore/custom_guns_vr.dmi index 3335487d74631b242deb18156072a5404b59600f..4c2f3ac813612247a227fd50e318a5957d392164 100644 GIT binary patch delta 4831 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 delta 3837 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 g