Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805

[MIRROR] Refactor on_reagent_change to pass through the change type
This commit is contained in:
deathride58
2017-11-24 23:47:13 +00:00
committed by GitHub
18 changed files with 41 additions and 40 deletions
@@ -504,7 +504,7 @@
return 1
return
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/on_reagent_change()
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/on_reagent_change(changetype)
..()
update_equip_info()
return
@@ -179,9 +179,6 @@
/obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info()
return "[..()] \[[src.reagents.total_volume]\]"
/obj/item/mecha_parts/mecha_equipment/extinguisher/on_reagent_change()
return
/obj/item/mecha_parts/mecha_equipment/extinguisher/can_attach(obj/mecha/working/M as obj)
if(..())
if(istype(M))
+1 -1
View File
@@ -417,7 +417,7 @@ MASS SPECTROMETER
..()
create_reagents(5)
/obj/item/device/mass_spectrometer/on_reagent_change()
/obj/item/device/mass_spectrometer/on_reagent_change(changetype)
if(reagents.total_volume)
icon_state = initial(icon_state) + "_s"
else