mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 22:50:26 +01:00
[MIRROR] Mecha medical and other_equipment refactor (#926)
* Mecha medical and other_equipment refactor (#53637) * Mecha medical and other_equipment refactor Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
|
||||
|
||||
/obj/item/ammo_casing/update_icon()
|
||||
..()
|
||||
. = ..()
|
||||
icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
|
||||
desc = "[initial(desc)][BB ? "" : " This one is spent."]"
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
/obj/item/ammo_casing/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
bounce_away(FALSE, NONE)
|
||||
. = ..()
|
||||
return ..()
|
||||
|
||||
/obj/item/ammo_casing/proc/bounce_away(still_warm = FALSE, bounce_delay = 3)
|
||||
if(!heavy_metal)
|
||||
|
||||
@@ -21,7 +21,16 @@
|
||||
D.piercing = S.proj_piercing
|
||||
SG.syringes.Remove(S)
|
||||
qdel(S)
|
||||
..()
|
||||
else if(istype(loc, /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun))
|
||||
var/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/syringe_gun = loc
|
||||
var/obj/item/reagent_containers/syringe/loaded_syringe = syringe_gun.syringes[1]
|
||||
var/obj/projectile/bullet/dart/shot_dart = BB
|
||||
syringe_gun.reagents.trans_to(shot_dart, min(loaded_syringe.volume, syringe_gun.reagents.total_volume), transfered_by = user)
|
||||
shot_dart.name = loaded_syringe.name
|
||||
shot_dart.piercing = loaded_syringe.proj_piercing
|
||||
LAZYREMOVE(syringe_gun.syringes, loaded_syringe)
|
||||
qdel(loaded_syringe)
|
||||
return ..()
|
||||
|
||||
/obj/item/ammo_casing/chemgun
|
||||
name = "dart synthesiser"
|
||||
@@ -39,7 +48,7 @@
|
||||
CG.reagents.trans_to(BB, 15, transfered_by = user)
|
||||
BB.name = "chemical dart"
|
||||
CG.syringes_left--
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/item/ammo_casing/dnainjector
|
||||
name = "rigged syringe gun spring"
|
||||
@@ -59,4 +68,4 @@
|
||||
var/obj/projectile/bullet/dnainjector/D = BB
|
||||
S.forceMove(D)
|
||||
D.injector = S
|
||||
..()
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user