mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
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)
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -73,11 +73,12 @@
|
||||
/obj/item/fluff/permit/aronai_kadigan
|
||||
name = "Aronai Kadigan's Sidearm Permit"
|
||||
desc = {"
|
||||
<b>NAME:</b> Aronai Kadigan | <b>RACE:</b> Cross Fox | <b>HOMEWORLD:</b> New Kitsuhana, KHI1
|
||||
<b>NAME:</b> Aronai Kadigan | <b>RACE:</b> Cross Fox (Synth) | <b>HOMEWORLD:</b> Kitsuhana Prime
|
||||
<b>DOB:</b> 12/Jul/2530 | <b>HEIGHT:</b> 188cm | <b>SEX:</b> 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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 22 KiB |
Reference in New Issue
Block a user