shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor bug fix, also inhand sprites

Browse Source
This commit is contained in:
shellspeed1
2021-11-04 02:33:12 -07:00
parent 3090194042
commit 580e398e38
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/special/syringe.dm
+3 -16
View File
@@ -27,6 +27,7 @@
desc = "A high-power spring, linked to an energy-based piercing synthesiser." desc = "A high-power spring, linked to an energy-based piercing synthesiser."
projectile_type = /obj/item/projectile/bullet/dart/piercing projectile_type = /obj/item/projectile/bullet/dart/piercing
firing_effect_type = null firing_effect_type = null
var/dartvolume = 10
/obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "") /obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
if(!BB) if(!BB)
@@ -38,7 +39,7 @@
if (CG.vial == null) if (CG.vial == null)
CG.syringes_left-- CG.syringes_left--
return return
CG.vial.reagents.trans_to(BB,10) CG.vial.reagents.trans_to(BB, dartvolume)
BB.name = "chemical dart" BB.name = "chemical dart"
CG.syringes_left-- CG.syringes_left--
..() ..()
@@ -50,21 +51,7 @@
projectile_type = /obj/item/projectile/bullet/dart/syringe/dart projectile_type = /obj/item/projectile/bullet/dart/syringe/dart
firing_effect_type = null firing_effect_type = null
harmful = FALSE harmful = FALSE
dartvolume = 20
/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--
..()
/obj/item/ammo_casing/dnainjector /obj/item/ammo_casing/dnainjector
name = "rigged syringe gun spring" name = "rigged syringe gun spring"
desc = "A high-power spring that throws DNA injectors." desc = "A high-power spring that throws DNA injectors."
code/modules/projectiles/guns/misc/chem_gun.dm
+1 -1
View File
@@ -112,7 +112,7 @@
name = "smartdart repeater rifle" 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." 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" icon_state = "chemgunrepeater"
item_state = "dartgun" item_state = "syringegun"
obj/item/gun/chem/smart/Initialize() obj/item/gun/chem/smart/Initialize()
. = ..() . = ..()
code/modules/projectiles/guns/misc/syringe_gun.dm
+2 -2
View File
@@ -127,7 +127,7 @@
/obj/item/gun/syringe/dart/rapiddart /obj/item/gun/syringe/dart/rapiddart
name = "Repeating dart gun" name = "Repeating dart gun"
icon_state = "rapiddartgun" icon_state = "rapiddartgun"
item_state = "rapiddartgun" item_state = "syringegun"
/obj/item/gun/syringe/dart/rapiddart/CheckParts(list/parts_list) /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 var/obj/item/reagent_containers/glass/beaker/B = locate(/obj/item/reagent_containers/glass/beaker) in parts_list
@@ -157,7 +157,7 @@
name = "blowgun" name = "blowgun"
desc = "Fire syringes at a short distance." desc = "Fire syringes at a short distance."
icon_state = "blowgun" icon_state = "blowgun"
item_state = "blowgun" item_state = "syringegun"
fire_sound = 'sound/items/syringeproj.ogg' 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) /obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)