From 6347f2edec7b78db7d1e0c588b7a16a5c75085a4 Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Mon, 12 Dec 2016 20:18:59 +0900 Subject: [PATCH] Adding the G44 and its energy variant. --- .../modules/vore/fluffstuff/custom_guns_vr.dm | 46 ++++++++++++++++++ icons/vore/custom_guns_vr.dmi | Bin 24031 -> 25540 bytes 2 files changed, 46 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 3073cbc827..8668791695 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -289,6 +289,52 @@ return 1 return 0 +//-----------------------G44---------------------------------- +/obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44 + name = "G44 Rifle" + desc = "The G44 is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)." + icon = 'icons/vore/custom_guns_vr.dmi' + icon_state = "g44" + item_state = "bullpup" + +/obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands) + ..() + if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m)) + icon_state = "bullpupm" + else + icon_state = (ammo_magazine)? "g44" : "g44-empty" + item_state = (ammo_magazine)? "bullpup" : "bullpup-empty" + if(!ignore_inhands) update_held_icon() + +//-----------------------G44 Energy Variant-------------------- + +/obj/item/weapon/gun/energy/gun/burst + 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." + icon = 'icons/vore/custom_guns_vr.dmi' + icon_state = "g44estun100" + item_state = "energystun100" //This is temporary. + fire_sound = 'sound/weapons/Taser.ogg' + charge_cost = 100 + force = 8 + w_class = ITEMSIZE_LARGE + fire_delay = 6 + + projectile_type = /obj/item/projectile/beam/stun/weak + origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3) + modifystate = "g44estun" + +// requires_two_hands = 1 + one_handed_penalty = 2 + + firemodes = list( + list(mode_name="stun", burst=1, projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 100), + list(mode_name="stun burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg'), + list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 200), + list(mode_name="lethal burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg'), + ) + + // molenar:Kari Akiren /obj/item/weapon/gun/projectile/shotgun/pump/rifle/fluff/kari_akiren name = "clockwork rifle" diff --git a/icons/vore/custom_guns_vr.dmi b/icons/vore/custom_guns_vr.dmi index 1af9143b261bc4b0bc49733e1e171318ef6ead3c..ab4da9212c0671b3516cd96cd345bbcfa7b3b302 100644 GIT binary patch delta 5552 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 delta 4008 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