shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

procs

Browse Source
This commit is contained in:
SandPoot
2023-11-29 22:40:13 -03:00
parent c9b0dedf77
commit 40f1d7401d
704 changed files with 1766 additions and 1743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/cars/clowncar.dm
+6 -6
View File
@@ -38,7 +38,7 @@
var/mob/living/carbon/human/H = M
if(H.mind && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //Ensures only clowns can drive the car. (Including more at once)
add_control_flags(H, VEHICLE_CONTROL_DRIVE)
RegisterSignal(H, COMSIG_MOB_CLICKON, .proc/fire_cannon_at)
RegisterSignal(H, COMSIG_MOB_CLICKON, PROC_REF(fire_cannon_at))
M.log_message("has entered [src] as a possible driver", LOG_ATTACK)
return
add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED)
@@ -145,7 +145,7 @@
visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system."))
icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
addtimer(CALLBACK(src, .proc/reset_icon), 10 SECONDS)
addtimer(CALLBACK(src, PROC_REF(reset_icon)), 10 SECONDS)
if(4)
visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas."))
var/datum/reagents/funnychems = new/datum/reagents(300)
@@ -157,8 +157,8 @@
smoke.start()
if(5)
visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail."))
RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/cover_in_oil)
addtimer(CALLBACK(src, .proc/stop_dropping_oil), 3 SECONDS)
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(cover_in_oil))
addtimer(CALLBACK(src, PROC_REF(stop_dropping_oil)), 3 SECONDS)
if(6)
visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car lets out a comedic toot."))
playsound(src, 'sound/vehicles/clowncar_fart.ogg', 100)
@@ -189,7 +189,7 @@
if(cannonmode) //canon active, deactivate
flick("clowncar_fromfire", src)
icon_state = "clowncar"
addtimer(CALLBACK(src, .proc/deactivate_cannon), 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(deactivate_cannon)), 2 SECONDS)
playsound(src, 'sound/vehicles/clowncar_cannonmode2.ogg', 75)
visible_message(span_danger("The [src] starts going back into mobile mode."))
else
@@ -197,7 +197,7 @@
flick("clowncar_tofire", src)
icon_state = "clowncar_fire"
visible_message(span_danger("The [src] opens up and reveals a large cannon."))
addtimer(CALLBACK(src, .proc/activate_cannon), 2 SECONDS)
addtimer(CALLBACK(src, PROC_REF(activate_cannon)), 2 SECONDS)
playsound(src, 'sound/vehicles/clowncar_cannonmode1.ogg', 75)
cannonmode = CLOWN_CANNON_BUSY
code/modules/vehicles/mecha/_mecha.dm
+5 -5
View File
@@ -175,8 +175,8 @@
add_cabin()
if(enclosed)
add_airtank()
RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , .proc/disconnect_air)
RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_stepsound)
RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , PROC_REF(disconnect_air))
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_stepsound))
spark_system.set_up(2, 0, src)
spark_system.attach(src)
smoke_system.set_up(3, src)
@@ -1109,9 +1109,9 @@
/obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags)
RegisterSignal(M, COMSIG_MOB_DEATH, .proc/mob_exit)
RegisterSignal(M, COMSIG_MOB_CLICKON, .proc/on_mouseclick)
RegisterSignal(M, COMSIG_MOB_SAY, .proc/display_speech_bubble)
RegisterSignal(M, COMSIG_MOB_DEATH, PROC_REF(mob_exit))
RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick))
RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble))
return ..()
/obj/vehicle/sealed/mecha/after_add_occupant(mob/M)
code/modules/vehicles/mecha/combat/durand.dm
+4 -4
View File
@@ -16,8 +16,8 @@
/obj/vehicle/sealed/mecha/combat/durand/Initialize(mapload)
. = ..()
shield = new /obj/durand_shield(loc, src, layer, dir)
RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, .proc/relay)
RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, .proc/prehit)
RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(relay))
RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, PROC_REF(prehit))
/obj/vehicle/sealed/mecha/combat/durand/Destroy()
@@ -156,7 +156,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
chassis = _chassis
layer = _layer
setDir(_dir)
RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, .proc/activate)
RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(activate))
/obj/durand_shield/Destroy()
@@ -204,7 +204,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
playsound(src, 'sound/mecha/mech_shield_raise.ogg', 50, FALSE)
set_light(l_range = MINIMUM_USEFUL_LIGHT_RANGE , l_power = 5, l_color = "#00FFFF")
icon_state = "shield"
RegisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE, .proc/resetdir)
RegisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE, PROC_REF(resetdir))
else
flick("shield_drop", src)
playsound(src, 'sound/mecha/mech_shield_drop.ogg', 50, FALSE)
code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+2 -2
View File
@@ -100,10 +100,10 @@
if(!chassis)
return FALSE
chassis.use_power(energy_drain)
return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target))
return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), target))
/obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, mob/user, delay)
return do_after(user, delay, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target))
return do_after(user, delay, target, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), target))
/// do after checks for the mecha equipment do afters
/obj/item/mecha_parts/mecha_equipment/proc/do_after_checks(atom/target)
code/modules/vehicles/mecha/mecha_topic.dm
+1 -1
View File
@@ -408,7 +408,7 @@
if(href_list["repair_int_control_lost"])
to_chat(occupants, "[icon2html(src, occupants)]<span class='notice'>Recalibrating coordination system...</span>")
log_message("Recalibration of coordination system started.", LOG_MECHA)
addtimer(CALLBACK(src, .proc/stationary_repair, loc), 100, TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(stationary_repair), loc), 100, TIMER_UNIQUE)
///Repairs internal damage if the mech hasn't moved.
/obj/vehicle/sealed/mecha/proc/stationary_repair(location)
code/modules/vehicles/scooter.dm
+1 -1
View File
@@ -134,7 +134,7 @@
playsound(src, 'sound/vehicles/skateboard_roll.ogg', 50, TRUE)
if(prob (25))
sparks.start() //the most radical way to start plasma fires
addtimer(CALLBACK(src, .proc/grind), 2)
addtimer(CALLBACK(src, PROC_REF(grind)), 2)
return
else
grinding = FALSE
code/modules/vehicles/vehicle_actions.dm
+1 -1
View File
@@ -228,5 +228,5 @@
L.client.give_award(/datum/award/achievement/misc/tram_surfer, L)
V.grinding = TRUE
V.icon_state = "[V.board_icon]-grind"
addtimer(CALLBACK(V, /obj/vehicle/ridden/scooter/skateboard/.proc/grind), 2)
addtimer(CALLBACK(V, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard, grind)), 2)
next_ollie = world.time + 5
code/modules/vehicles/wheelchair.dm
+1 -1
View File
@@ -23,7 +23,7 @@
/obj/vehicle/ridden/wheelchair/ComponentInitialize() //Since it's technically a chair I want it to have chair properties
. = ..()
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null)
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate),CALLBACK(src), .proc/can_be_rotated),null)
/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag)
new /obj/item/stack/rods(drop_location(), 8)