mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
stop the pills (#18703)
* RedPills Processing Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING) * Fixes a minor bug.
This commit is contained in:
committed by
AnturK
parent
c480ad71ee
commit
0d6bbbb412
@@ -38,12 +38,12 @@
|
||||
fire_sound = shot.fire_sound
|
||||
fire_delay = shot.delay
|
||||
if(selfcharge)
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/item/weapon/gun/energy/Destroy()
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/gun/energy/process()
|
||||
@@ -161,12 +161,12 @@
|
||||
/obj/item/weapon/gun/energy/on_varedit(modified_var)
|
||||
if(modified_var == "selfcharge")
|
||||
if(selfcharge)
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
else
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/gun/energy/burn()
|
||||
if(power_supply)
|
||||
qdel(power_supply)
|
||||
.=..()
|
||||
.=..()
|
||||
|
||||
@@ -51,12 +51,12 @@
|
||||
charges = max_charges
|
||||
chambered = new ammo_type(src)
|
||||
if(can_charge)
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
|
||||
/obj/item/weapon/gun/magic/Destroy()
|
||||
if(can_charge)
|
||||
SSobj.processing.Remove(src)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
/obj/item/weapon/gun/medbeam/New()
|
||||
..()
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/weapon/gun/medbeam/dropped(mob/user)
|
||||
..()
|
||||
@@ -125,4 +125,4 @@
|
||||
|
||||
/obj/item/weapon/gun/medbeam/mech/New()
|
||||
..()
|
||||
SSobj.processing -= src //Mech mediguns do not process until installed, and are controlled by the holder obj
|
||||
STOP_PROCESSING(SSobj, src) //Mech mediguns do not process until installed, and are controlled by the holder obj
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
/obj/item/weapon/minigunpack/New()
|
||||
gun = new(src)
|
||||
SSobj.processing += src
|
||||
START_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/minigunpack/Destroy()
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/minigunpack/process()
|
||||
|
||||
Reference in New Issue
Block a user