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

tiny bit more polish, some number tweaks, and research.

Browse Source
This commit is contained in:
shellspeed1
2021-10-31 04:18:15 -07:00
parent f148eb0a4c
commit 026ce5dec4
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/special/syringe.dm
+12 -11
View File
@@ -35,11 +35,10 @@
var/obj/item/gun/chem/CG = loc
if(CG.syringes_left <= 0)
return
//vial.reagents.trans_to(target, vial.amount_per_transfer_from_this, log = "hypospray fill")
//CG.reagents.trans_to(BB, 10)
if (CG.vial == null)
CG.syringes_left--
return
CG.vial.reagents.trans_to(BB,10)
CG.vial.reagents.trans_to(BB, 10)
BB.name = "chemical dart"
CG.syringes_left--
..()
@@ -49,19 +48,21 @@
name = "smartdart synthesiser"
desc = "A high-power spring, linked to an energy-based smartdart synthesiser."
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 = "")
/obj/item/ammo_casing/chemgun/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/SG = loc
if(SG.syringes_left <= 0)
if(istype(loc, /obj/item/gun/chem))
var/obj/item/gun/chem/CG = loc
if(CG.syringes_left <= 0)
return
SG.reagents.trans_to(BB, 20) //change to set syringe transfer
BB.name = "Smart chemical dart"
SG.syringes_left--
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
code/modules/projectiles/guns/misc/chem_gun.dm
+4 -6
View File
@@ -13,15 +13,13 @@
custom_materials = list(/datum/material/iron=2000)
clumsy_check = FALSE
fire_sound = 'sound/items/syringeproj.ogg'
var/time_per_syringe = 300
var/syringes_left = 5
var/max_syringes = 5
var/time_per_syringe = 200
var/syringes_left = 3
var/max_syringes = 6
var/last_synth = 0
var/obj/item/reagent_containers/glass/bottle/vial/vial
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/small, /obj/item/reagent_containers/glass/bottle/vial/large)
var/spawnwithvial = TRUE
var/start_vial = null
var/quickload = FALSE
var/quickload = TRUE //
/obj/item/gun/chem/Initialize()
. = ..()