From 1efad3d5b95f5f990a39c3fb1dc3962b212a497d Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 15 Feb 2017 20:17:15 -0500 Subject: [PATCH] More guns + permit renewal Adds 2.5 new guns (one isn't finished yet, it's got weird code so it's going to take a bit). They 'eat' the ammo they're loaded with and destroy the casings. So, if anyone wants caseless ammo, look at how I did it here. Also renews my permit. Haven't done it IC yet, but I'll just delete it and the gun until I have. (Gosh if you can trust me to not just spawn random guns for myself you can trust me to do that :V) --- .../vore/fluffstuff/custom_boxes_vr.dm | 5 +- .../modules/vore/fluffstuff/custom_guns_vr.dm | 73 +++++++++++++++++- .../vore/fluffstuff/custom_permits_vr.dm | 7 +- icons/obj/gun_vr.dmi | Bin 21927 -> 22562 bytes 4 files changed, 80 insertions(+), 5 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index cb6866a8b3..94e811f343 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -156,7 +156,10 @@ has_items = list( /obj/item/weapon/storage/backpack/fluff/aronai, /obj/item/weapon/rig/light/hacker/fluff/aronai, - /obj/item/clothing/under/rank/khi/fluff/aronai) + /obj/item/clothing/under/rank/khi/fluff/aronai, + /obj/item/fluff/permit/aronai_kadigan, + /obj/item/weapon/gun/projectile/khi/pistol, + /obj/item/ammo_magazine/c45m/flash) /* Swimsuits, for general use, to avoid arriving to work with your swimsuit. diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 228942ed1c..d9c709d639 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -313,7 +313,6 @@ if(!ignore_inhands) update_held_icon() //-----------------------G44 Energy Variant-------------------- - /obj/item/weapon/gun/energy/gun/burst/g44e name = "G44 Energy Rifle" desc = "The G44 Energy is a laser variant of the G44 lightweight assault rifle manufactured by the National Armory of Gaia. Though almost exclusively to the United Federation's Military Assault Command Operations Department (MACOs) and Starfleet, it is occassionally sold to security departments for their stun capabilities." @@ -358,6 +357,78 @@ name = "\improper MEUSOC .45" desc = "Some serious drywall work, coming up!" +//-----------------------KHI Common---------------------------------- +/obj/item/weapon/gun/projectile/khi/process_chambered() + if (!chambered) return + qdel(chambered) //Devours ammo rather than fires it. + +//-----------------------KHI Pistol---------------------------------- +/obj/item/weapon/gun/projectile/khi/pistol + name = "alien pistol" + desc = "This KHI handgun doesn't so much 'fire' .45 ammo as 'devour' it and make it's own proprietary ammunition." + icon = 'icons/obj/gun_vr.dmi' + icon_state = "khipistol" + item_state = "gun" // Placeholder + magazine_type = /obj/item/ammo_magazine/c45m/flash //Dun wanna KILL all the people. + allowed_magazines = list(/obj/item/ammo_magazine/c45m) + caliber = ".45" + handle_casings = CYCLE_CASINGS + origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5) + fire_sound = 'sound/weapons/semiauto.ogg' + load_method = MAGAZINE + dna_lock = 1 + +//-----------------------KHI PDW---------------------------------- +// For general use +/obj/item/weapon/gun/projectile/automatic/khi/pdw + name = "alien pdw" + desc = "The KHI personal defense mainstay. If KHI had any standards whatsoever, that is. Insert 9mm ammo for good times." + icon = 'icons/obj/gun_vr.dmi' + icon_state = "khipdw" + item_state = "c20r" // Placeholder + w_class = ITEMSIZE_NORMAL + caliber = "9mm" + origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5) + slot_flags = SLOT_BELT + load_method = MAGAZINE + handle_casings = CYCLE_CASINGS + magazine_type = /obj/item/ammo_magazine/mc9mml + allowed_magazines = list(/obj/item/ammo_magazine/mc9mm, /obj/item/ammo_magazine/mc9mml) + dna_lock = 1 + + 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)) + ) + +//-----------------------KHI LIM Rifle---------------------------------- +//Unfinished +/obj/item/weapon/limrifle //Not even a subtype of gun because it behaves differently. + name = "lim rifle" + desc = "The KHI-101-R linear induction motor rifle can propel a small 2mm slug at extreme velocity through nearly any solid object. Whether it has the time to impart any force is another question entirely." + //icon = 'icons/obj/gun64_vr.dmi' + icon_state = "limrifle" + item_state = "gun" //Should probably be huge-r + //dna_lock = 1 + //safety_level = 1 + + var/charge_time = 5 SECONDS + var/charge_percent = 100 + +/obj/item/weapon/limrifle/New() + ..() + update_icon() + +/obj/item/weapon/limrifle/update_icon() + ..() + var/charge_icon = round(charge_percent,20) + icon_state = "[initial(icon_state)]_[charge_icon]" + +/obj/item/weapon/limrifle/proc/recharge() + charge_percent = 0 + update_icon() + + //////////////////// Energy Weapons //////////////////// // -------------- Dominator ------------- /obj/item/weapon/gun/energy/gun/fluff/dominator diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm index 04e14991bf..a9f2d1d035 100644 --- a/code/modules/vore/fluffstuff/custom_permits_vr.dm +++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm @@ -73,11 +73,12 @@ /obj/item/fluff/permit/aronai_kadigan name = "Aronai Kadigan's Sidearm Permit" desc = {" - NAME: Aronai Kadigan | RACE: Cross Fox | HOMEWORLD: New Kitsuhana, KHI1 + NAME: Aronai Kadigan | RACE: Cross Fox (Synth) | HOMEWORLD: Kitsuhana Prime DOB: 12/Jul/2530 | HEIGHT: 188cm | SEX: Male - The individual named above is licensed by the Nanotrasen Department of Civil Protection to carry one KIN-H21 (Egun Variant). - This license expires on 30/Sep/2560 and must be renewed by CentCom prior to this date."} + The individual named above is licensed by the Nanotrasen Department of Civil Protection + to carry one KIN (foreign) handgun with flash ammo. + This license expires on 16/Feb/2562 and must be renewed by CentCom prior to this date."} // joanrisu:Joan Risu /obj/item/fluff/permit/joanrisu diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index 4a996eedb530a1b88d0e55c2a18b07075986aec5..48dbdeb4afbe1721f87ed18d6e0304407d3f3424 100644 GIT binary patch delta 1983 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