mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 * grammer / typeblock * 15 is not more than 15 * how did I miss this, I swear I put in 3 * path + crafting * Update code/modules/crafting/guncrafting.dm Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
@@ -329,3 +329,10 @@
|
||||
projectile_type = /obj/item/projectile/beam/laser/detective/overcharged
|
||||
e_cost = 200
|
||||
select_name = "overcharged"
|
||||
|
||||
/obj/item/ammo_casing/energy/silencer_ammo
|
||||
projectile_type = /obj/item/projectile/beam/silencer
|
||||
muzzle_flash_effect = null
|
||||
select_name = "silencing dissidents"
|
||||
e_cost = 62.5 // 16 shots
|
||||
fire_sound = 'sound/weapons/silencer_laser.ogg'
|
||||
|
||||
@@ -67,3 +67,13 @@
|
||||
/obj/item/gun/energy/disabler/cyborg/newshot()
|
||||
..()
|
||||
robocharge()
|
||||
|
||||
/obj/item/gun/energy/disabler/silencer
|
||||
name = "u-ION Silencer"
|
||||
desc = "Nanotrasen's take on silenced weapons. A quiet lethal disabler, designed to make the death look like a natural cause."
|
||||
icon_state = "tesla"
|
||||
item_state = "tesla"
|
||||
origin_tech = "combat=6;syndicate=2"
|
||||
shaded_charge = TRUE
|
||||
ammo_type = list(/obj/item/ammo_casing/energy/silencer_ammo)
|
||||
suppressed = TRUE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
|
||||
icon_state = "pistol"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
origin_tech = "combat=3;materials=2;syndicate=4"
|
||||
origin_tech = "combat=3;materials=2;syndicate=3"
|
||||
can_holster = TRUE
|
||||
mag_type = /obj/item/ammo_box/magazine/m10mm
|
||||
fire_sound = 'sound/weapons/gunshots/gunshot_pistol.ogg'
|
||||
|
||||
@@ -227,3 +227,15 @@
|
||||
to_chat(firer, "<span class='danger'>Weapon Alert: unable to generate warrant on [target]!</span>")
|
||||
return
|
||||
to_chat(firer, "<span class='danger'>Weapon Alert: unable to track [target]!</span>")
|
||||
|
||||
/obj/item/projectile/beam/silencer
|
||||
name = "energy beam" //Keep it vague? It's not a laser, but it's silenced, does a person know what it is?
|
||||
icon_state = "omnilaser"
|
||||
stamina = 30
|
||||
damage = 15
|
||||
damage_type = OXY
|
||||
flag = "energy"
|
||||
hitsound = 'sound/weapons/tap.ogg'
|
||||
eyeblur = 0
|
||||
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
|
||||
light_color = LIGHT_COLOR_CYAN
|
||||
|
||||
Reference in New Issue
Block a user