cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

stop the pills (#18703)

Browse Source 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
This commit is contained in:
Kyle Spier-Swenson
2016-06-20 12:07:44 +02:00
committed by AnturK
parent c480ad71ee
commit 0d6bbbb412
90 changed files with 424 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/body_egg.dm
+2 -2
View File
@@ -18,13 +18,13 @@
/obj/item/organ/body_egg/Insert(var/mob/living/carbon/M, special = 0)
..()
owner.status_flags |= XENO_HOST
SSobj.processing |= src
START_PROCESSING(SSobj, src)
owner.med_hud_set_status()
spawn(0)
AddInfectionImages(owner)
/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
if(owner)
owner.status_flags &= ~(XENO_HOST)
owner.med_hud_set_status()
code/game/objects/items/candle.dm
+1 -1
View File
@@ -65,7 +65,7 @@
usr.visible_message(
"<span class='danger'>[usr] lights the [name].</span>")
SetLuminosity(CANDLE_LUMINOSITY)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
update_icon()
code/game/objects/items/devices/camera_bug.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/obj/item/device/camera_bug/New()
..()
SSobj.processing += src
START_PROCESSING(SSobj, src)
/obj/item/device/camera_bug/Destroy()
get_cameras()
code/game/objects/items/devices/flashlight.dm
+4 -4
View File
@@ -207,7 +207,7 @@ obj/item/device/flashlight/lamp/bananalamp
turn_off()
if(!fuel)
icon_state = "[initial(icon_state)]-empty"
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
/obj/item/device/flashlight/flare/proc/turn_off()
on = 0
@@ -241,7 +241,7 @@ obj/item/device/flashlight/lamp/bananalamp
user.visible_message("<span class='notice'>[user] lights \the [src].</span>", "<span class='notice'>You light \the [src]!</span>")
force = on_damage
damtype = "fire"
SSobj.processing += src
START_PROCESSING(SSobj, src)
/obj/item/device/flashlight/flare/is_hot()
return on * heat
@@ -285,10 +285,10 @@ obj/item/device/flashlight/lamp/bananalamp
/obj/item/device/flashlight/emp/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/device/flashlight/emp/Destroy()
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/device/flashlight/emp/process()
code/game/objects/items/devices/geiger_counter.dm
+2 -2
View File
@@ -18,10 +18,10 @@
/obj/item/device/geiger_counter/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/device/geiger_counter/Destroy()
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
..()
/obj/item/device/geiger_counter/process()
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -154,7 +154,7 @@
if(energy <= max_energy)
if(!recharging)
recharging = 1
SSobj.processing |= src
START_PROCESSING(SSobj, src)
if(energy <= 0)
user << "<span class='warning'>[src]'s battery is overused, it needs time to recharge!</span>"
recharge_locked = 1
code/game/objects/items/devices/multitool.dm
+2 -2
View File
@@ -37,10 +37,10 @@
/obj/item/device/multitool/ai_detect/New()
..()
SSobj.processing += src
START_PROCESSING(SSobj, src)
/obj/item/device/multitool/ai_detect/Destroy()
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/device/multitool/ai_detect/process()
code/game/objects/items/devices/powersink.dm
+4 -4
View File
@@ -34,20 +34,20 @@
if(DISCONNECTED)
attached = null
if(mode == OPERATING)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
anchored = 0
if(CLAMPED_OFF)
if(!attached)
return
if(mode == OPERATING)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
anchored = 1
if(OPERATING)
if(!attached)
return
SSobj.processing |= src
START_PROCESSING(SSobj, src)
anchored = 1
mode = value
@@ -140,6 +140,6 @@
playsound(src, 'sound/effects/screech.ogg', 100, 1, 1)
if(power_drained >= max_power)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
explosion(src.loc, 4,8,16,32)
qdel(src)
code/game/objects/items/devices/radio/intercom.dm
+2 -2
View File
@@ -13,10 +13,10 @@
/obj/item/device/radio/intercom/New()
..()
SSobj.processing += src
START_PROCESSING(SSobj, src)
/obj/item/device/radio/intercom/Destroy()
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/device/radio/intercom/attack_ai(mob/user)
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -25,7 +25,7 @@ MASS SPECTROMETER
icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
if(on)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/device/t_scanner/proc/flick_sonar(obj/pipe)
var/image/I = image('icons/effects/effects.dmi', pipe, "blip", pipe.layer+1)
@@ -38,7 +38,7 @@ MASS SPECTROMETER
/obj/item/device/t_scanner/process()
if(!on)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return null
scan()
code/game/objects/items/devices/traitordevices.dm
+2 -2
View File
@@ -194,13 +194,13 @@ effective or pretty fucking useless.
return
user << "<span class='notice'>You activate [src].</span>"
src.user = user
SSobj.processing |= src
START_PROCESSING(SSobj, src)
old_alpha = user.alpha
on = 1
/obj/item/device/shadowcloak/proc/Deactivate()
user << "<span class='notice'>You deactivate [src].</span>"
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
if(user)
user.alpha = old_alpha
on = 0
code/game/objects/items/nuke_tools.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/obj/item/nuke_core/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/nuke_core/attackby(obj/item/nuke_core_container/container, mob/user)
if(istype(container))
@@ -47,7 +47,7 @@
/obj/item/nuke_core_container/proc/seal()
if(istype(core))
SSobj.processing -= core
STOP_PROCESSING(SSobj, core)
icon_state = "core_container_sealed"
playsound(loc, 'sound/items/Deconstruct.ogg', 60, 1)
if(ismob(loc))
code/game/objects/items/robot/robot_upgrades.dm
+3 -3
View File
@@ -280,10 +280,10 @@
on = !on
if(on)
cyborg << "<span class='notice'>You activate the self-repair module.</span>"
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
cyborg << "<span class='notice'>You deactivate the self-repair module.</span>"
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
update_icon()
/obj/item/borg/upgrade/selfrepair/update_icon()
@@ -296,7 +296,7 @@
icon_state = "cyborg_upgrade5"
/obj/item/borg/upgrade/selfrepair/proc/deactivate()
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
on = FALSE
update_icon()
code/game/objects/items/weapons/chrono_eraser.dm
+1 -1
View File
@@ -178,7 +178,7 @@
update_icon()
desc = initial(desc) + "<br><span class='info'>It appears to contain [target.name].</span>"
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/effect/chrono_field/Destroy()
if(gun && gun.field_check(src))
code/game/objects/items/weapons/cigs_lighters.dm
+9 -9
View File
@@ -50,7 +50,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
name = "lit match"
desc = "A match. This one is lit."
attack_verb = list("burnt","singed")
SSobj.processing |= src
START_PROCESSING(SSobj, src)
update_icon()
return
@@ -64,7 +64,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
name = "burnt match"
desc = "A match. This one has seen better days."
attack_verb = null
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
/obj/item/weapon/match/dropped(mob/user)
matchburnout()
@@ -130,7 +130,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/Destroy()
if(reagents)
qdel(reagents)
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W, mob/user, params)
@@ -214,7 +214,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(flavor_text)
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
//can't think of any other way to update the overlays :<
if(ismob(loc))
@@ -385,7 +385,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/pipe/Destroy()
if(reagents)
qdel(reagents)
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/clothing/mask/cigarette/pipe/process()
@@ -402,7 +402,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
M.update_inv_wear_mask()
packeditem = 0
name = "empty [initial(name)]"
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return
open_flame()
if(reagents && reagents.total_volume) // check if it has any reagents at all
@@ -443,7 +443,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = 0
icon_state = icon_off
item_state = icon_off
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return
if(!lit && smoketime > 0)
user << "<span class='notice'>You empty [src] onto [location].</span>"
@@ -512,7 +512,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user.visible_message("<span class='warning'>After a few attempts, [user] manages to light [src] - they however burn their finger in the process.</span>", "<span class='warning'>You burn yourself while lighting the lighter!</span>")
user.AddLuminosity(1)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
lit = 0
update_icon()
@@ -524,7 +524,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
user.visible_message("[user] quietly shuts off [src].", "<span class='notice'>You quietly shut off [src].")
user.AddLuminosity(-1)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
else
return ..()
return
code/game/objects/items/weapons/flamethrower.dm
+2 -2
View File
@@ -34,7 +34,7 @@
/obj/item/weapon/flamethrower/process()
if(!lit)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return null
var/turf/location = loc
if(istype(location, /mob/))
@@ -149,7 +149,7 @@
return
lit = !lit
if(lit)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
if(!warned_admins)
message_admins("[key_name_admin(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) has lit a flamethrower.")
warned_admins = 1
code/game/objects/items/weapons/holy_weapons.dm
+2 -2
View File
@@ -351,10 +351,10 @@
/obj/item/weapon/nullrod/tribal_knife/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/weapon/nullrod/tribal_knife/Destroy()
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/weapon/nullrod/tribal_knife/process()
code/game/objects/items/weapons/melee/misc.dm
+1 -1
View File
@@ -148,7 +148,7 @@
/obj/item/weapon/melee/supermatter_sword/New()
..()
shard = new /obj/machinery/power/supermatter_shard(src)
SSobj.processing += src
START_PROCESSING(SSobj, src)
visible_message("<span class='warning'>\The [src] appears, balanced ever so perfectly on its hilt. This isn't ominous at all.</span>")
/obj/item/weapon/melee/supermatter_sword/process()
code/game/objects/items/weapons/singularityhammer.dm
+2 -2
View File
@@ -15,10 +15,10 @@
/obj/item/weapon/twohanded/singularityhammer/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/weapon/twohanded/singularityhammer/Destroy()
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/weapon/twohanded/singularityhammer/process()
code/game/objects/items/weapons/tanks/jetpack.dm
+4 -4
View File
@@ -120,7 +120,7 @@
/obj/item/weapon/tank/jetpack/suit/New()
..()
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
air_contents = null
/obj/item/weapon/tank/jetpack/suit/cycle(mob/user)
@@ -136,13 +136,13 @@
var/mob/living/carbon/human/H = loc.loc
tank = H.s_store
air_contents = tank.air_contents
SSobj.processing |= src
START_PROCESSING(SSobj, src)
..()
/obj/item/weapon/tank/jetpack/suit/turn_off()
tank = null
air_contents = null
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
..()
/obj/item/weapon/tank/jetpack/suit/process()
@@ -173,4 +173,4 @@
if(!istype(J) && istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
J = C.jetpack
return J
return J
code/game/objects/items/weapons/tanks/tanks.dm
+2 -2
View File
@@ -53,13 +53,13 @@
air_contents = new(volume) //liters
air_contents.temperature = T20C
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/weapon/tank/Destroy()
if(air_contents)
qdel(air_contents)
SSobj.processing -= src
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/weapon/tank/examine(mob/user)
code/game/objects/items/weapons/tanks/watertank.dm
+2 -2
View File
@@ -413,13 +413,13 @@
/obj/item/weapon/reagent_containers/chemtank/proc/turn_on()
on = 1
SSobj.processing |= src
START_PROCESSING(SSobj, src)
if(ismob(loc))
loc << "<span class='notice'>[src] turns on.</span>"
/obj/item/weapon/reagent_containers/chemtank/proc/turn_off()
on = 0
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
if(ismob(loc))
loc << "<span class='notice'>[src] turns off.</span>"
code/game/objects/items/weapons/tools.dm
+2 -2
View File
@@ -295,7 +295,7 @@
damtype = "brute"
update_icon()
if(!can_off_process)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return
//Welders left on now use up fuel, but lets not have them run out quite that fast
if(1)
@@ -382,7 +382,7 @@
damtype = "fire"
hitsound = 'sound/items/welder.ogg'
update_icon()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
user << "<span class='warning'>You need more fuel!</span>"
welding = 0