mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 14:47:50 +01:00
Nuke remaining .proc/s (#7981)
Co-authored-by: Selis <sirlionfur@hotmail.de>
This commit is contained in:
+3
-3
@@ -527,7 +527,7 @@
|
||||
blob.update_icon(1)
|
||||
|
||||
//Flip them to the protean panel
|
||||
addtimer(CALLBACK(src, .proc/nano_set_panel, C), 4)
|
||||
addtimer(CALLBACK(src, PROC_REF(nano_set_panel), C), 4)
|
||||
|
||||
//Return our blob in case someone wants it
|
||||
return blob
|
||||
@@ -628,7 +628,7 @@
|
||||
qdel(blob)
|
||||
|
||||
//Flip them to the protean panel
|
||||
addtimer(CALLBACK(src, .proc/nano_set_panel, C), 4)
|
||||
addtimer(CALLBACK(src, PROC_REF(nano_set_panel), C), 4)
|
||||
|
||||
//Return ourselves in case someone wants it
|
||||
return src
|
||||
@@ -777,4 +777,4 @@
|
||||
eye_layer.color = S.blob_color_2
|
||||
eye_layer.plane = PLANE_LIGHTING_ABOVE
|
||||
add_overlay(eye_layer)
|
||||
qdel(eye_layer)
|
||||
qdel(eye_layer)
|
||||
|
||||
+3
-3
@@ -50,7 +50,7 @@
|
||||
var/datum/species/protean/S = P.species
|
||||
S.OurRig = src
|
||||
if(P.back)
|
||||
addtimer(CALLBACK(src, .proc/AssimilateBag, P, 1, P.back), 3)
|
||||
addtimer(CALLBACK(src, PROC_REF(AssimilateBag), P, 1, P.back), 3)
|
||||
myprotean = P
|
||||
else
|
||||
to_chat(P, "<span class='notice'>You should have spawned with a backpack to assimilate into your RIG. Try clicking it with a backpack.</span>")
|
||||
@@ -273,7 +273,7 @@
|
||||
playsound(src, 'sound/machines/defib_success.ogg', 50, 0)
|
||||
new /obj/effect/gibspawner/robot(src.loc)
|
||||
src.atom_say("Contact received! Reassembly nanites calibrated. Estimated time to resucitation: 1 minute 30 seconds")
|
||||
addtimer(CALLBACK(src, .proc/make_alive, myprotean?:humanform), 900)
|
||||
addtimer(CALLBACK(src, PROC_REF(make_alive), myprotean?:humanform), 900)
|
||||
return
|
||||
if(istype(W,/obj/item/weapon/rig))
|
||||
if(!assimilated_rig)
|
||||
@@ -425,7 +425,7 @@
|
||||
/obj/item/weapon/cell/protean/New()
|
||||
charge = maxcharge
|
||||
update_icon()
|
||||
addtimer(CALLBACK(src, .proc/search_for_protean), 60)
|
||||
addtimer(CALLBACK(src, PROC_REF(search_for_protean)), 60)
|
||||
|
||||
/obj/item/weapon/cell/protean/proc/search_for_protean()
|
||||
if(istype(src.loc, /obj/item/weapon/rig/protean))
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
playsound(src, "sound/weapons/punchmiss.ogg", 50, 1)
|
||||
|
||||
// throw_at returns FALSE if it will not call it's callback - useful to prevent state jamming
|
||||
if(!throw_at(T, 10, pounce_speed, callback = CALLBACK(src, .proc/pouncefinish, foundpt, foundpm, T)))
|
||||
if(!throw_at(T, 10, pounce_speed, callback = CALLBACK(src, PROC_REF(pouncefinish), foundpt, foundpm, T)))
|
||||
if(status_flags & LEAPING)
|
||||
status_flags &= ~LEAPING
|
||||
flying = 0
|
||||
@@ -328,7 +328,7 @@
|
||||
var/atom/movable/AM = am
|
||||
if(AM == src || AM.anchored)
|
||||
continue
|
||||
addtimer(CALLBACK(src, .proc/speen_throw, am), 1)
|
||||
addtimer(CALLBACK(src, PROC_REF(speen_throw), am), 1)
|
||||
playsound(src, "sound/weapons/punchmiss.ogg", 50, 1)
|
||||
|
||||
/mob/living/simple_mob/proc/speen_throw(var/atom/movable/AM, var/gentle = 0, var/damage = 10)
|
||||
@@ -346,4 +346,4 @@
|
||||
M.adjustBruteLoss(damage)
|
||||
to_chat(M, "<span class='userdanger'>You're thrown back by [src]!</span>")
|
||||
playsound(src, get_sfx("punch"), 50, 1)
|
||||
AM.throw_at(throwtarget, maxthrow, 3, src)
|
||||
AM.throw_at(throwtarget, maxthrow, 3, src)
|
||||
|
||||
@@ -358,7 +358,7 @@
|
||||
/mob/living/simple_mob/vore/candy/marshmellowserpent/do_special_attack(atom/A)
|
||||
set_AI_busy(TRUE)
|
||||
do_windup_animation(A, 20)
|
||||
addtimer(CALLBACK(src, .proc/chargeend, A), 20)
|
||||
addtimer(CALLBACK(src, PROC_REF(chargeend), A), 20)
|
||||
|
||||
/mob/living/simple_mob/vore/candy/marshmellowserpent/proc/chargeend(atom/A)
|
||||
if(stat) //you are dead
|
||||
@@ -729,4 +729,4 @@
|
||||
B.emote_lists[DM_DIGEST] = list(
|
||||
"Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!")
|
||||
|
||||
v
|
||||
v
|
||||
|
||||
@@ -604,7 +604,7 @@
|
||||
step = 1
|
||||
|
||||
// The time between each step is the volume required by a step multiplied by the delay_modifier (in ticks/deciseconds).
|
||||
addtimer(CALLBACK(src, .proc/perform_reaction, r_id, step), recipes[r_id][step + 1] * delay_modifier)
|
||||
addtimer(CALLBACK(src, PROC_REF(perform_reaction), r_id, step), recipes[r_id][step + 1] * delay_modifier)
|
||||
|
||||
// This proc carries out the actual steps in each reaction.
|
||||
/obj/machinery/chemical_synthesizer/proc/perform_reaction(var/r_id, var/step as num)
|
||||
@@ -638,7 +638,7 @@
|
||||
var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = cartridges[label]
|
||||
if(quantity > C.reagents.total_volume)
|
||||
visible_message("<span class='notice'>The [src] flashes an 'insufficient reagents' warning.</span>")
|
||||
addtimer(CALLBACK(src, .proc/perform_reaction, r_id, step), 1 MINUTE)
|
||||
addtimer(CALLBACK(src, PROC_REF(perform_reaction), r_id, step), 1 MINUTE)
|
||||
return
|
||||
|
||||
// After all this mess of code, we reach the line where the magic happens.
|
||||
@@ -662,7 +662,7 @@
|
||||
var/delay = reagents.total_volume
|
||||
update_icon() // Update the icon first to remove underlays, then switch to the new icon_state.
|
||||
icon_state = "synth_finished"
|
||||
addtimer(CALLBACK(src, .proc/bottle_product, r_id), delay)
|
||||
addtimer(CALLBACK(src, PROC_REF(bottle_product), r_id), delay)
|
||||
|
||||
else
|
||||
follow_recipe(r_id, step)
|
||||
|
||||
Reference in New Issue
Block a user