mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 16:12:19 +00:00
Additional August Fixes (#5104)
Fixes #5101 Fixes plants/food being able to be poured into reagent containers. Fixes server hanging during backpressure surge.
This commit is contained in:
@@ -181,7 +181,7 @@
|
||||
|
||||
origin_tech = list(TECH_MATERIAL = 6,TECH_ENGINEERING = 5,TECH_MAGNET = 4,TECH_POWER = 6)
|
||||
|
||||
/obj/item/custom_ka_upgrade/cells/cell04/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
|
||||
/obj/item/custom_ka_upgrade/cells/kinetic_charging/on_update(var/obj/item/weapon/gun/custom_ka/the_gun)
|
||||
stored_charge = min(stored_charge + round(stored_charge*0.2),cell_increase)
|
||||
|
||||
|
||||
|
||||
@@ -245,6 +245,8 @@
|
||||
/obj/item/weapon/gun/custom_ka/Initialize()
|
||||
. = ..()
|
||||
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
|
||||
if(installed_cell)
|
||||
installed_cell = new installed_cell(src)
|
||||
if(installed_barrel)
|
||||
@@ -255,8 +257,6 @@
|
||||
update_stats()
|
||||
queue_icon_update()
|
||||
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
|
||||
/obj/item/weapon/gun/custom_ka/Destroy()
|
||||
. = ..()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
@@ -269,8 +269,6 @@
|
||||
if(installed_upgrade_chip)
|
||||
installed_upgrade_chip.on_update(src)
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/weapon/gun/custom_ka/update_icon()
|
||||
. = ..()
|
||||
cut_overlays()
|
||||
@@ -488,11 +486,9 @@
|
||||
|
||||
/obj/item/custom_ka_upgrade/proc/on_update(var/obj/item/weapon/gun/custom_ka)
|
||||
//Do update related things here
|
||||
return
|
||||
|
||||
/obj/item/custom_ka_upgrade/proc/on_fire(var/obj/item/weapon/gun/custom_ka)
|
||||
//Do fire related things here
|
||||
return
|
||||
|
||||
/obj/item/custom_ka_upgrade/cells
|
||||
name = null //Abstract
|
||||
@@ -556,8 +552,6 @@
|
||||
"<span class='warning'>\The [user] scans \the [target] with \the [src].</span>",
|
||||
"<span class='alert'>You scan \the [target] with \the [src].</span>")
|
||||
|
||||
|
||||
|
||||
if(istype(target,/obj/item/weapon/gun/custom_ka))
|
||||
playsound(src, 'sound/machines/ping.ogg', 10, 1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user