minor bug fix, also inhand sprites
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
desc = "A high-power spring, linked to an energy-based piercing synthesiser."
|
||||
projectile_type = /obj/item/projectile/bullet/dart/piercing
|
||||
firing_effect_type = null
|
||||
var/dartvolume = 10
|
||||
|
||||
/obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
|
||||
if(!BB)
|
||||
@@ -38,7 +39,7 @@
|
||||
if (CG.vial == null)
|
||||
CG.syringes_left--
|
||||
return
|
||||
CG.vial.reagents.trans_to(BB,10)
|
||||
CG.vial.reagents.trans_to(BB, dartvolume)
|
||||
BB.name = "chemical dart"
|
||||
CG.syringes_left--
|
||||
..()
|
||||
@@ -50,21 +51,7 @@
|
||||
projectile_type = /obj/item/projectile/bullet/dart/syringe/dart
|
||||
firing_effect_type = null
|
||||
harmful = FALSE
|
||||
|
||||
/obj/item/ammo_casing/chemgun/smart/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
|
||||
if(!BB)
|
||||
return
|
||||
if(istype(loc, /obj/item/gun/chem/smart))
|
||||
var/obj/item/gun/chem/smart/CG = loc
|
||||
if(CG.syringes_left <= 0)
|
||||
return
|
||||
if (CG.vial == null)
|
||||
CG.syringes_left--
|
||||
return
|
||||
CG.vial.reagents.trans_to(BB,20)
|
||||
BB.name = "smart chemical dart"
|
||||
CG.syringes_left--
|
||||
..()
|
||||
dartvolume = 20
|
||||
/obj/item/ammo_casing/dnainjector
|
||||
name = "rigged syringe gun spring"
|
||||
desc = "A high-power spring that throws DNA injectors."
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
name = "smartdart repeater rifle"
|
||||
desc = "An experimental improved version of the smart dart rifle. It synthesizes medicinal smart darts which it fills using an inserted hypovial. It can accommodate both large and small hypovials."
|
||||
icon_state = "chemgunrepeater"
|
||||
item_state = "dartgun"
|
||||
item_state = "syringegun"
|
||||
|
||||
obj/item/gun/chem/smart/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
/obj/item/gun/syringe/dart/rapiddart
|
||||
name = "Repeating dart gun"
|
||||
icon_state = "rapiddartgun"
|
||||
item_state = "rapiddartgun"
|
||||
item_state = "syringegun"
|
||||
|
||||
/obj/item/gun/syringe/dart/rapiddart/CheckParts(list/parts_list)
|
||||
var/obj/item/reagent_containers/glass/beaker/B = locate(/obj/item/reagent_containers/glass/beaker) in parts_list
|
||||
@@ -157,7 +157,7 @@
|
||||
name = "blowgun"
|
||||
desc = "Fire syringes at a short distance."
|
||||
icon_state = "blowgun"
|
||||
item_state = "blowgun"
|
||||
item_state = "syringegun"
|
||||
fire_sound = 'sound/items/syringeproj.ogg'
|
||||
|
||||
/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
|
||||
|
||||
Reference in New Issue
Block a user