From d7ac8512f30e658889ae3ea5bd8cfed7fb6cd424 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 8 Sep 2019 19:09:09 -0700 Subject: [PATCH] let's change a proc name --- code/ATMOSPHERICS/atmospherics.dm | 2 +- .../components/binary_devices/circulator.dm | 4 ++-- .../components/binary_devices/pipeturbine.dm | 8 +++---- code/ATMOSPHERICS/components/valve.dm | 4 ++-- code/ATMOSPHERICS/mainspipe.dm | 10 ++++---- code/ATMOSPHERICS/pipes/simple.dm | 4 ++-- code/ATMOSPHERICS/pipes/vent.dm | 4 ++-- code/ZAS/Fire.dm | 2 +- code/__HELPERS/unsorted.dm | 4 ++-- code/_onclick/hud/alien_larva.dm | 2 +- code/_onclick/hud/human.dm | 2 +- code/_onclick/hud/other_mobs.dm | 2 +- code/_onclick/hud/robot.dm | 10 ++++---- code/_onclick/telekinesis.dm | 2 +- code/datums/observation/dir_set.dm | 2 +- code/datums/observation/helpers.dm | 2 +- code/datums/riding.dm | 2 +- code/game/atoms.dm | 2 +- code/game/atoms_movable_vr.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 12 +++++----- .../gamemodes/technomancer/spells/track.dm | 2 +- code/game/jobs/job_controller.dm | 4 ++-- code/game/machinery/Sleeper.dm | 2 +- code/game/machinery/adv_med.dm | 2 +- code/game/machinery/camera/camera.dm | 8 +++---- code/game/machinery/doors/airlock.dm | 4 ++-- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/frame.dm | 12 +++++----- code/game/machinery/machinery.dm | 6 ++--- code/game/machinery/pipe/construction.dm | 24 +++++++++---------- code/game/machinery/portable_turret.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/mecha/mecha.dm | 8 +++---- code/game/mecha/medical/medical.dm | 2 +- code/game/mecha/micro/micro.dm | 2 +- code/game/mecha/working/hoverpod.dm | 2 +- code/game/objects/buckling.dm | 4 ++-- code/game/objects/effects/chem/chemsmoke.dm | 2 +- .../objects/effects/decals/Cleanable/fuel.dm | 2 +- code/game/objects/effects/effect_system.dm | 4 ++-- code/game/objects/effects/step_triggers.dm | 2 +- .../temporary_visuals/miscellaneous.dm | 2 +- .../temporary_visuals/temproary_visual.dm | 8 +++---- .../temporary_visuials/miscellaneous.dm | 2 +- .../temporary_visuials/temproary_visual.dm | 8 +++---- .../objects/items/devices/chameleonproj.dm | 2 +- .../objects/items/devices/laserpointer.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 2 +- code/game/objects/items/robot/robot_parts.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- code/game/objects/items/weapons/traps.dm | 2 +- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/fitness.dm | 2 +- code/game/objects/structures/gravemarker.dm | 4 ++-- code/game/objects/structures/janicart.dm | 4 ++-- code/game/objects/structures/morgue.dm | 2 +- code/game/objects/structures/musician.dm | 2 +- code/game/objects/structures/railing.dm | 6 ++--- .../stool_bed_chair_nest/alien_nests.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 10 ++++---- .../stool_bed_chair_nest/wheelchair.dm | 14 +++++------ code/game/objects/structures/transit_tubes.dm | 10 ++++---- .../objects/structures/windoor_assembly.dm | 10 ++++---- code/game/objects/structures/window.dm | 8 +++---- .../game/objects/structures/window_spawner.dm | 2 +- code/game/turfs/flooring/flooring_decals.dm | 2 +- code/game/turfs/simulated/floor_types.dm | 4 ++-- code/game/turfs/turf_flick_animations.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/buildmode.dm | 22 ++++++++--------- code/modules/admin/view_variables/topic.dm | 4 ++-- code/modules/assembly/infrared.dm | 10 ++++---- code/modules/awaymissions/gateway.dm | 6 ++--- code/modules/blob2/blobs/base_blob.dm | 6 ++--- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/masks/monitor.dm | 2 +- .../clothing/spacesuits/rig/modules/ninja.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- .../hydroponics/spreading/spreading.dm | 2 +- .../spreading/spreading_response.dm | 2 +- code/modules/mining/drilling/drill.dm | 2 +- code/modules/mob/animations.dm | 2 +- .../living/carbon/human/human_attackhand.dm | 2 +- .../mob/living/carbon/human/human_powers.dm | 6 ++--- .../mob/living/carbon/human/unarmed_attack.dm | 2 +- .../mob/living/simple_animal/animals/bear.dm | 2 +- .../mob/living/simple_animal/animals/cat.dm | 2 +- .../mob/living/simple_animal/animals/corgi.dm | 16 ++++++------- .../living/simple_animal/animals/fox_vr.dm | 4 ++-- .../mob/living/simple_animal/animals/worm.dm | 4 ++-- .../mob/living/simple_animal/simple_hud.dm | 2 +- code/modules/mob/mob.dm | 10 ++++---- code/modules/mob/mob_grab.dm | 12 +++++----- code/modules/mob/mob_grab_specials.dm | 4 ++-- code/modules/mob/mob_movement.dm | 4 ++-- code/modules/mob/new_player/new_player.dm | 2 +- code/modules/multiz/pipes.dm | 4 ++-- code/modules/multiz/zshadow.dm | 4 ++-- code/modules/nano/nanomanager.dm | 4 ++-- .../nifsoft/software/13_soulcatcher.dm | 6 ++--- code/modules/organs/organ_icon.dm | 2 +- code/modules/overmap/ships/engines/thermal.dm | 2 +- code/modules/power/apc.dm | 4 ++-- code/modules/power/generator.dm | 4 ++-- code/modules/power/lightswitch_vr.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- .../power/singularity/field_generator.dm | 2 +- .../particle_accelerator/particle.dm | 2 +- .../particle_accelerator.dm | 8 +++---- .../particle_accelerator/particle_control.dm | 2 +- .../particle_accelerator/particle_emitter.dm | 2 +- code/modules/power/smes.dm | 2 +- code/modules/power/solar.dm | 2 +- code/modules/power/tesla/energy_ball.dm | 4 ++-- code/modules/power/tracker.dm | 2 +- code/modules/projectiles/ammunition.dm | 4 ++-- .../targeting/targeting_overlay.dm | 2 +- code/modules/random_map/drop/droppod.dm | 2 +- code/modules/recycling/conveyor2.dm | 2 +- .../recycling/disposal-construction.dm | 10 ++++---- code/modules/recycling/disposal.dm | 12 +++++----- .../security levels/keycard authentication.dm | 2 +- code/modules/shieldgen/directional_shield.dm | 6 ++--- code/modules/shieldgen/emergency_shield.dm | 2 +- code/modules/shieldgen/sheldwallgen.dm | 2 +- code/modules/shieldgen/shield_capacitor.dm | 2 +- code/modules/tables/flipping.dm | 2 +- code/modules/turbolift/turbolift_console.dm | 2 +- code/modules/turbolift/turbolift_map.dm | 12 +++++----- code/modules/vehicles/train.dm | 2 +- code/modules/vehicles/vehicle.dm | 12 +++++----- .../tools/suspension_generator.dm | 4 ++-- code/modules/xenoarcheaology/tools/tools.dm | 2 +- 135 files changed, 291 insertions(+), 291 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 9792c0c5179..84e06d4d2ec 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -39,7 +39,7 @@ Pipelines + Other Objects -> Pipe network if(!icon_manager) icon_manager = new() if(!isnull(newdir)) - set_dir(newdir) + setDir(newdir) if(!pipe_color) pipe_color = color color = null diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 3c73894414f..caf57db3019 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -132,7 +132,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]." @@ -144,5 +144,5 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, -90)) + src.setDir(turn(src.dir, -90)) desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]." \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index d26422c3092..fce87079c20 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -125,7 +125,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, -90)) + src.setDir(turn(src.dir, -90)) verb/rotate_anticlockwise() @@ -136,7 +136,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) //Goddamn copypaste from binary base class because atmospherics machinery API is not damn flexible get_neighbor_nodes_for_init() @@ -276,7 +276,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, -90)) + src.setDir(turn(src.dir, -90)) verb/rotate_anticlock() set category = "Object" @@ -286,4 +286,4 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 26cb4489e60..2ce2fc3d0d8 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -123,9 +123,9 @@ /obj/machinery/atmospherics/valve/proc/normalize_dir() if(dir==3) - set_dir(1) + setDir(1) else if(dir==12) - set_dir(4) + setDir(4) /obj/machinery/atmospherics/valve/attack_ai(mob/user as mob) return diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index baba515fae6..6d3d4c894e7 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -139,9 +139,9 @@ obj/machinery/atmospherics/mains_pipe/simple proc/normalize_dir() if(dir==3) - set_dir(1) + setDir(1) else if(dir==12) - set_dir(4) + setDir(4) update_icon() if(nodes[1] && nodes[2]) @@ -150,7 +150,7 @@ obj/machinery/atmospherics/mains_pipe/simple //var/node1_direction = get_dir(src, node1) //var/node2_direction = get_dir(src, node2) - //set_dir(node1_direction|node2_direction) + //setDir(node1_direction|node2_direction) else if(!nodes[1]&&!nodes[2]) @@ -599,9 +599,9 @@ obj/machinery/atmospherics/mains_pipe/valve proc/normalize_dir() if(dir==3) - set_dir(1) + setDir(1) else if(dir==12) - set_dir(4) + setDir(4) proc/open() if(open) return 0 diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index aaf8b278544..27bb57bb908 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -78,9 +78,9 @@ /obj/machinery/atmospherics/pipe/simple/proc/normalize_dir() if(dir==3) - set_dir(1) + setDir(1) else if(dir==12) - set_dir(4) + setDir(4) /obj/machinery/atmospherics/pipe/simple/Destroy() if(node1) diff --git a/code/ATMOSPHERICS/pipes/vent.dm b/code/ATMOSPHERICS/pipes/vent.dm index 4a1dc5696dc..58aaa51ccdd 100644 --- a/code/ATMOSPHERICS/pipes/vent.dm +++ b/code/ATMOSPHERICS/pipes/vent.dm @@ -52,7 +52,7 @@ if(node1) icon_state = "intact" - set_dir(get_dir(src, node1)) + setDir(get_dir(src, node1)) else icon_state = "exposed" @@ -80,6 +80,6 @@ /obj/machinery/atmospherics/pipe/vent/hide(var/i) //to make the little pipe section invisible, the icon changes. if(node1) icon_state = "[i == 1 && istype(loc, /turf/simulated) ? "h" : "" ]intact" - set_dir(get_dir(src, node1)) + setDir(get_dir(src, node1)) else icon_state = "exposed" diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index bb4ec95a844..075c108e3fe 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -187,7 +187,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0) qdel(src) return - set_dir(pick(cardinal)) + setDir(pick(cardinal)) var/datum/gas_mixture/air_contents = loc.return_air() color = fire_color(air_contents.temperature) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index cd91366ca6d..eb05e4be366 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -812,7 +812,7 @@ proc/GaussRandRound(var/sigma,var/roundto) var/old_decals = T.decals ? T.decals.Copy() : null X = B.ChangeTurf(T.type) - X.set_dir(old_dir1) + X.setDir(old_dir1) X.icon_state = old_icon_state1 X.icon = old_icon1 X.copy_overlays(T, TRUE) @@ -938,7 +938,7 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0) var/turf/X = B X.ChangeTurf(T.type) - X.set_dir(old_dir1) + X.setDir(old_dir1) X.icon_state = old_icon_state1 X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi X.overlays = old_overlays diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index 2ec9da3b278..534a1a750ad 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -7,7 +7,7 @@ using = new /obj/screen() using.name = "mov_intent" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = 'icons/mob/screen1_alien.dmi' using.icon_state = (mymob.m_intent == "run" ? "running" : "walking") using.screen_loc = ui_acti diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index c0007cbcf90..c88995e63f6 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -37,7 +37,7 @@ slot_info["[inv_box.slot_id]"] = inv_box.screen_loc if(slot_data["dir"]) - inv_box.set_dir(slot_data["dir"]) + inv_box.setDir(slot_data["dir"]) if(slot_data["toggle"]) src.other += inv_box diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm index f1b9165a264..3e68fe3597b 100644 --- a/code/_onclick/hud/other_mobs.dm +++ b/code/_onclick/hud/other_mobs.dm @@ -32,7 +32,7 @@ using = new /obj/screen() using.name = "act_intent" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.icon_state = "intent_"+mymob.a_intent using.screen_loc = ui_zonesel diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index dc414df11f3..df3fffa19fe 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -24,7 +24,7 @@ var/obj/screen/robot_inventory //Radio using = new /obj/screen() using.name = "radio" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.color = ui_color using.alpha = ui_alpha @@ -37,7 +37,7 @@ var/obj/screen/robot_inventory using = new /obj/screen() using.name = "module1" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.color = ui_color using.alpha = ui_alpha @@ -49,7 +49,7 @@ var/obj/screen/robot_inventory using = new /obj/screen() using.name = "module2" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.color = ui_color using.alpha = ui_alpha @@ -61,7 +61,7 @@ var/obj/screen/robot_inventory using = new /obj/screen() using.name = "module3" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.color = ui_color using.alpha = ui_alpha @@ -76,7 +76,7 @@ var/obj/screen/robot_inventory //Intent using = new /obj/screen() using.name = "act_intent" - using.set_dir(SOUTHWEST) + using.setDir(SOUTHWEST) using.icon = ui_style using.alpha = ui_alpha using.icon_state = mymob.a_intent diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 229e717e454..7b36272fbe5 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -154,7 +154,7 @@ var/const/tk_maxrange = 15 O.anchored = 1 O.density = 0 O.layer = FLY_LAYER - O.set_dir(pick(GLOB.cardinal)) + O.setDir(pick(GLOB.cardinal)) O.icon = 'icons/effects/effects.dmi' O.icon_state = "nothing" flick("empdisable",O) diff --git a/code/datums/observation/dir_set.dm b/code/datums/observation/dir_set.dm index 6240f558d1b..8d4b19d24ea 100644 --- a/code/datums/observation/dir_set.dm +++ b/code/datums/observation/dir_set.dm @@ -1,7 +1,7 @@ // Observer Pattern Implementation: Direction Set // Registration type: /atom // -// Raised when: An /atom changes dir using the set_dir() proc. +// Raised when: An /atom changes dir using the setDir() proc. // // Arguments that the called proc should expect: // /atom/dir_changer: The instance that changed direction diff --git a/code/datums/observation/helpers.dm b/code/datums/observation/helpers.dm index 91160267009..51788408a02 100644 --- a/code/datums/observation/helpers.dm +++ b/code/datums/observation/helpers.dm @@ -7,7 +7,7 @@ forceMove(T) /atom/proc/recursive_dir_set(var/atom/a, var/old_dir, var/new_dir) - set_dir(new_dir) + setDir(new_dir) /proc/register_all_movement(var/event_source, var/listener) GLOB.moved_event.register(event_source, listener, /atom/movable/proc/recursive_move) diff --git a/code/datums/riding.dm b/code/datums/riding.dm index 746cc6dcf75..6139aeb8f3f 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -43,7 +43,7 @@ var/mob/living/buckled_mob = m var/list/offsets = get_offsets(passindex) var/rider_dir = get_rider_dir(passindex) - buckled_mob.set_dir(rider_dir) + buckled_mob.setDir(rider_dir) dir_loop: for(var/offsetdir in offsets) if(offsetdir == ridden_dir) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 335ff24ecca..8ac17ef0dba 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -230,7 +230,7 @@ return //called to set the atom's dir and used to add behaviour to dir-changes -/atom/proc/set_dir(new_dir) +/atom/proc/setDir(new_dir) . = new_dir != dir dir = new_dir diff --git a/code/game/atoms_movable_vr.dm b/code/game/atoms_movable_vr.dm index 0cc6d144be9..13c52e8d737 100644 --- a/code/game/atoms_movable_vr.dm +++ b/code/game/atoms_movable_vr.dm @@ -1,7 +1,7 @@ /atom/movable/proc/Bump_vr(var/atom/A, yes) return -/atom/movable/set_dir(newdir) +/atom/movable/setDir(newdir) . = ..(newdir) if(riding_datum) riding_datum.handle_vehicle_offsets() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index d65eb0e6d03..bdfbe6bc881 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -31,7 +31,7 @@ if(!the_disk) icon_state = "pinonnull" return - set_dir(get_dir(src,the_disk)) + setDir(get_dir(src,the_disk)) switch(get_dist(src,the_disk)) if(0) icon_state = "pinondirect" @@ -83,7 +83,7 @@ if(!location) icon_state = "pinonnull" return - set_dir(get_dir(src,location)) + setDir(get_dir(src,location)) switch(get_dist(src,location)) if(0) icon_state = "pinondirect" @@ -102,7 +102,7 @@ if(!target) icon_state = "pinonnull" return - set_dir(get_dir(src,target)) + setDir(get_dir(src,target)) switch(get_dist(src,target)) if(0) icon_state = "pinondirect" @@ -219,7 +219,7 @@ // if(loc.z != the_disk.z) //If you are on a different z-level from the disk // icon_state = "pinonnull" // else - set_dir(get_dir(src, the_disk)) + setDir(get_dir(src, the_disk)) switch(get_dist(src, the_disk)) if(0) icon_state = "pinondirect" @@ -252,7 +252,7 @@ if(loc.z != home.z) //If you are on a different z-level from the shuttle icon_state = "pinonnull" else - set_dir(get_dir(src, home)) + setDir(get_dir(src, home)) switch(get_dist(src, home)) if(0) icon_state = "pinondirect" @@ -298,7 +298,7 @@ if(loc.z != our_shuttle.z) //If you are on a different z-level from the shuttle icon_state = "pinonnull" else - set_dir(get_dir(src, our_shuttle)) + setDir(get_dir(src, our_shuttle)) switch(get_dist(src, our_shuttle)) if(0) icon_state = "pinondirect" diff --git a/code/game/gamemodes/technomancer/spells/track.dm b/code/game/gamemodes/technomancer/spells/track.dm index 230e282ee17..a62e117c0e3 100644 --- a/code/game/gamemodes/technomancer/spells/track.dm +++ b/code/game/gamemodes/technomancer/spells/track.dm @@ -62,7 +62,7 @@ var/list/technomancer_belongings = list() icon_state = "track_unknown" else - set_dir(get_dir(src,get_turf(tracked))) + setDir(get_dir(src,get_turf(tracked))) switch(get_dist(src,get_turf(tracked))) if(0) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index a9113346289..0f11c1bb299 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -359,7 +359,7 @@ var/global/datum/controller/occupations/job_master // Moving wheelchair if they have one if(H.buckled && istype(H.buckled, /obj/structure/bed/chair/wheelchair)) H.buckled.forceMove(H.loc) - H.buckled.set_dir(H.dir) + H.buckled.setDir(H.dir) if(job) @@ -489,7 +489,7 @@ var/global/datum/controller/occupations/job_master var/obj/structure/bed/chair/wheelchair/W = new /obj/structure/bed/chair/wheelchair(H.loc) W.buckle_mob(H) H.update_canmove() - W.set_dir(H.dir) + W.setDir(H.dir) W.add_fingerprint(H) if(R) W.color = R.color diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index a8e5f7ceada..25eca31e250 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -23,7 +23,7 @@ if(sleepernew) sleeper = sleepernew sleepernew.console = src - set_dir(get_dir(src, sleepernew)) + setDir(get_dir(src, sleepernew)) return return diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 2fb2d48a824..9c208cb0bfb 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -233,7 +233,7 @@ if(bodyscannernew) scanner = bodyscannernew bodyscannernew.console = src - set_dir(get_dir(src, bodyscannernew)) + setDir(get_dir(src, bodyscannernew)) return return diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index b05f54d4524..98e044f4ea9 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -360,13 +360,13 @@ //If someone knows a better way to do this, let me know. -Giacom switch(i) if(NORTH) - src.set_dir(SOUTH) + src.setDir(SOUTH) if(SOUTH) - src.set_dir(NORTH) + src.setDir(NORTH) if(WEST) - src.set_dir(EAST) + src.setDir(EAST) if(EAST) - src.set_dir(WEST) + src.setDir(WEST) break //Return a working camera that can see a given mob diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 83e10e900a5..44ca5a3363d 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -944,7 +944,7 @@ About the new airlock wires panel: var/obj/structure/door_assembly/da = new assembly_type(src.loc) if (istype(da, /obj/structure/door_assembly/multi_tile)) - da.set_dir(src.dir) + da.setDir(src.dir) da.anchored = 1 if(mineral) @@ -1195,7 +1195,7 @@ About the new airlock wires panel: name = "[istext(assembly.glass) ? "[assembly.glass] airlock" : assembly.base_name]" //get the dir from the assembly - set_dir(assembly.dir) + setDir(assembly.dir) //wires var/turf/T = get_turf(newloc) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b8659458741..00d93e23ac7 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -230,7 +230,7 @@ wa.secure = "secure_" if (src.base_state == "right" || src.base_state == "rightsecure") wa.facing = "r" - wa.set_dir(src.dir) + wa.setDir(src.dir) wa.anchored = 1 wa.created_name = name wa.state = "02" diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm index 2c16d3771e5..d33901f670a 100644 --- a/code/game/machinery/frame.dm +++ b/code/game/machinery/frame.dm @@ -236,7 +236,7 @@ state = FRAME_PLACED if(dir) - set_dir(dir) + setDir(dir) if(loc) src.loc = loc @@ -374,7 +374,7 @@ var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y - B.set_dir(dir) + B.setDir(dir) circuit.construct(B) circuit.loc = null B.circuit = circuit @@ -388,7 +388,7 @@ var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y - B.set_dir(dir) + B.setDir(dir) circuit.construct(B) circuit.loc = null B.circuit = circuit @@ -401,7 +401,7 @@ var/obj/machinery/B = new circuit.build_path(src.loc) B.pixel_x = pixel_x B.pixel_y = pixel_y - B.set_dir(dir) + B.setDir(dir) circuit.construct(B) circuit.loc = null B.circuit = circuit @@ -581,7 +581,7 @@ to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") return 0 - set_dir(turn(dir, 90)) + setDir(turn(dir, 90)) to_chat(usr, "You rotate the [src] to face [dir2text(dir)]!") @@ -600,7 +600,7 @@ to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") return 0 - set_dir(turn(dir, 270)) + setDir(turn(dir, 270)) to_chat(usr, "You rotate the [src] to face [dir2text(dir)]!") diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a5b7477101a..fa890ca89f6 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -120,7 +120,7 @@ Class Procs: /obj/machinery/New(l, d=0) ..(l) if(d) - set_dir(d) + setDir(d) if(circuit) circuit = new circuit(src) @@ -164,7 +164,7 @@ Class Procs: pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" pulse2.anchored = 1 - pulse2.set_dir(pick(cardinal)) + pulse2.setDir(pick(cardinal)) spawn(10) qdel(pulse2) @@ -433,7 +433,7 @@ Class Procs: else A.state = FRAME_WIRED - A.set_dir(dir) + A.setDir(dir) A.pixel_x = pixel_x A.pixel_y = pixel_y A.update_desc() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 02775c2a1a6..09b272cbe7f 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -43,7 +43,7 @@ Buildable meters make_from_existing(make_from) else pipe_type = _pipe_type - set_dir(_dir) + setDir(_dir) update() pixel_x += rand(-5, 5) @@ -51,7 +51,7 @@ Buildable meters return ..() /obj/item/pipe/proc/make_from_existing(obj/machinery/atmospherics/make_from) - set_dir(make_from.dir) + setDir(make_from.dir) pipename = make_from.name if(make_from.req_access) src.req_access = make_from.req_access @@ -104,11 +104,11 @@ Buildable meters do_a_flip() /obj/item/pipe/proc/do_a_flip() - set_dir(turn(dir, -180)) + setDir(turn(dir, -180)) fixdir() /obj/item/pipe/trinary/flippable/do_a_flip() - // set_dir(turn(dir, flipped ? 45 : -45)) + // setDir(turn(dir, flipped ? 45 : -45)) // TG has a magic icon set with the flipped versions in the diagonals. // We may switch to this later, but for now gotta do some magic. mirrored = !mirrored @@ -123,21 +123,21 @@ Buildable meters if ( usr.stat || usr.restrained() || !usr.canmove ) return - set_dir(turn(src.dir, -90)) // Rotate clockwise + setDir(turn(src.dir, -90)) // Rotate clockwise fixdir() // If you want to disable pipe dir changing when pulled, uncomment this // /obj/item/pipe/Move() // var/old_dir = dir // . = ..() -// set_dir(old_dir) //pipes changing direction when moved is just annoying and buggy +// setDir(old_dir) //pipes changing direction when moved is just annoying and buggy // Don't let pulling a pipe straighten it out. /obj/item/pipe/binary/bendable/Move() var/old_bent = !IS_CARDINAL(dir) . = ..() if(old_bent && IS_CARDINAL(dir)) - set_dir(turn(src.dir, -45)) + setDir(turn(src.dir, -45)) //Helper to clean up dir /obj/item/pipe/proc/fixdir() @@ -145,16 +145,16 @@ Buildable meters /obj/item/pipe/binary/fixdir() if(dir == SOUTH) - set_dir(NORTH) + setDir(NORTH) else if(dir == WEST) - set_dir(EAST) + setDir(EAST) /obj/item/pipe/trinary/flippable/fixdir() if(dir in cornerdirs) - set_dir(turn(dir, 45)) + setDir(turn(dir, 45)) /obj/item/pipe/attack_self(mob/user) - set_dir(turn(dir,-90)) + setDir(turn(dir,-90)) fixdir() //called when a turf is attacked with a pipe item @@ -208,7 +208,7 @@ Buildable meters qdel(src) /obj/item/pipe/proc/build_pipe(obj/machinery/atmospherics/A) - A.set_dir(dir) + A.setDir(dir) A.init_dir() if(pipename) A.name = pipename diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 2a2bc67cb5b..49f5a5ad1c5 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -678,7 +678,7 @@ var/list/turret_icons last_target = target spawn() popUp() //pop the turret up if it's not already up. - set_dir(get_dir(src, target)) //even if you can't shoot, follow the target + setDir(get_dir(src, target)) //even if you can't shoot, follow the target spawn() shootAt(target) return 1 diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 5c362e616e4..1b4cb8245d4 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1289,7 +1289,7 @@ if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST)) move_result = step_rand(chassis) else if(chassis.dir!=direction) - chassis.set_dir(direction) + chassis.setDir(direction) move_result = 1 else move_result = step(chassis,direction) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 6adad5bcef1..f23e97fb618 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -431,7 +431,7 @@ return /obj/mecha/proc/mechturn(direction) - set_dir(direction) + setDir(direction) playsound(src,'sound/mecha/mechturn.ogg',40,1) return 1 @@ -936,7 +936,7 @@ src.Entered(mmi_as_oc) src.Move(src.loc) src.icon_state = src.reset_icon() - set_dir(dir_in) + setDir(dir_in) src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) src.occupant << sound('sound/mecha/nominal.ogg',volume=50) @@ -1174,7 +1174,7 @@ src.verbs += /obj/mecha/verb/eject src.log_append_to_last("[H] moved in as pilot.") src.icon_state = src.reset_icon() - set_dir(dir_in) + setDir(dir_in) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) src.occupant << sound('sound/mecha/nominal.ogg',volume=50) @@ -1262,7 +1262,7 @@ src.occupant.canmove = 0 src.occupant = null src.icon_state = src.reset_icon()+"-open" - src.set_dir(dir_in) + src.setDir(dir_in) src.verbs -= /obj/mecha/verb/eject return diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm index 53f007b6a6b..9825928c74b 100644 --- a/code/game/mecha/medical/medical.dm +++ b/code/game/mecha/medical/medical.dm @@ -15,7 +15,7 @@ /obj/mecha/medical/mechturn(direction) - set_dir(direction) + setDir(direction) playsound(src,'sound/mecha/mechmove01.ogg',40,1) return 1 diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index 6da9b830c6f..065593a8e94 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -122,7 +122,7 @@ // override move/turn procs so they play more appropriate sounds. Placeholder sounds for now, but mechmove04 at least sounds like tracks for the poleat. /obj/mecha/micro/mechturn(direction) - set_dir(direction) + setDir(direction) playsound(src,'sound/mecha/mechmove03.ogg',40,1) return 1 diff --git a/code/game/mecha/working/hoverpod.dm b/code/game/mecha/working/hoverpod.dm index 8a79b5a8ac9..b4641d34f4d 100644 --- a/code/game/mecha/working/hoverpod.dm +++ b/code/game/mecha/working/hoverpod.dm @@ -63,7 +63,7 @@ //these three procs overriden to play different sounds /obj/mecha/working/hoverpod/mechturn(direction) - set_dir(direction) + setDir(direction) //playsound(src,'sound/machines/hiss.ogg',40,1) return 1 diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 9ed15f38a77..052439fe128 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -69,7 +69,7 @@ M.buckled = src M.facing_dir = null - M.set_dir(buckle_dir ? buckle_dir : dir) + M.setDir(buckle_dir ? buckle_dir : dir) M.update_canmove() M.update_floating( M.Check_Dense_Object() ) // buckled_mob = M @@ -193,7 +193,7 @@ L.inertia_dir = last_move return FALSE else - L.set_dir(dir) + L.setDir(dir) return TRUE /atom/movable/Move(atom/newloc, direct = 0) diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 436ebabcc92..1fc9e007f8e 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -162,7 +162,7 @@ chemholder.reagents.trans_to_obj(smoke, chemholder.reagents.total_volume / dist, copy = 1) //copy reagents to the smoke so mob/breathe() can handle inhaling the reagents smoke.icon = I smoke.plane = ABOVE_PLANE - smoke.set_dir(pick(cardinal)) + smoke.setDir(pick(cardinal)) smoke.pixel_x = -32 + rand(-8, 8) smoke.pixel_y = -32 + rand(-8, 8) walk_to(smoke, T) diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index b69226815e2..85a28944a01 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -51,7 +51,7 @@ anchored = 0 /obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0) - set_dir(d) //Setting this direction means you won't get torched by your own flamethrower. + setDir(d) //Setting this direction means you won't get torched by your own flamethrower. if(istype(newLoc, /turf/simulated)) var/turf/simulated/T = newLoc T.hotspot_expose((T20C*2) + 380,500) //Ignite the fuel. diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 74ffa13530d..69ba420cbc6 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -333,7 +333,7 @@ steam.start() -- spawns the effect if(isturf(T)) var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition) src.oldposition = T - I.set_dir(src.holder.dir) + I.setDir(src.holder.dir) flick("ion_fade", I) I.icon_state = "blank" spawn( 20 ) @@ -380,7 +380,7 @@ steam.start() -- spawns the effect var/obj/effect/effect/steam/I = new /obj/effect/effect/steam(src.oldposition) src.number++ src.oldposition = get_turf(holder) - I.set_dir(src.holder.dir) + I.setDir(src.holder.dir) spawn(10) qdel(I) src.number-- diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 461fd85db15..db84eda0b1b 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -71,7 +71,7 @@ var/predir = AM.dir step(AM, direction) if(!facedir) - AM.set_dir(predir) + AM.setDir(predir) diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 8a9220e87f2..2d9a6a192b8 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -8,7 +8,7 @@ if(mimiced_atom) name = mimiced_atom.name appearance = mimiced_atom.appearance - set_dir(mimiced_atom.dir) + setDir(mimiced_atom.dir) mouse_opacity = 0 if(customappearance) appearance = customappearance diff --git a/code/game/objects/effects/temporary_visuals/temproary_visual.dm b/code/game/objects/effects/temporary_visuals/temproary_visual.dm index c5038f1b28e..3b50f01ca1c 100644 --- a/code/game/objects/effects/temporary_visuals/temproary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temproary_visual.dm @@ -11,7 +11,7 @@ /obj/effect/temp_visual/Initialize() . = ..() if(randomdir) - set_dir(pick(cardinal)) + setDir(pick(cardinal)) spawn(duration) qdel(src) @@ -29,8 +29,8 @@ /obj/effect/temp_visual/dir_setting randomdir = FALSE -/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir) - if(set_dir) - setDir(set_dir) +/obj/effect/temp_visual/dir_setting/Initialize(mapload, setDir) + if(setDir) + setDir(setDir) . = ..() */ //More tg stuff that might be useful later diff --git a/code/game/objects/effects/temporary_visuials/miscellaneous.dm b/code/game/objects/effects/temporary_visuials/miscellaneous.dm index 27258bf2b65..6086239ddf1 100644 --- a/code/game/objects/effects/temporary_visuials/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuials/miscellaneous.dm @@ -8,7 +8,7 @@ if(mimiced_atom) name = mimiced_atom.name appearance = mimiced_atom.appearance - set_dir(mimiced_atom.dir) + setDir(mimiced_atom.dir) mouse_opacity = 0 if(customappearance) appearance = customappearance diff --git a/code/game/objects/effects/temporary_visuials/temproary_visual.dm b/code/game/objects/effects/temporary_visuials/temproary_visual.dm index 0ecaf5e312c..72e4634904e 100644 --- a/code/game/objects/effects/temporary_visuials/temproary_visual.dm +++ b/code/game/objects/effects/temporary_visuials/temproary_visual.dm @@ -11,7 +11,7 @@ /obj/effect/temp_visual/Initialize() . = ..() if(randomdir) - set_dir(pick(global.cardinal)) + setDir(pick(global.cardinal)) spawn(duration) qdel(src) @@ -29,8 +29,8 @@ /obj/effect/temp_visual/dir_setting randomdir = FALSE -/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir) - if(set_dir) - setDir(set_dir) +/obj/effect/temp_visual/dir_setting/Initialize(mapload, setDir) + if(setDir) + setDir(setDir) . = ..() */ //More tg stuff that might be useful later diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 379a002cae0..7b251046a85 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -98,7 +98,7 @@ icon = new_icon icon_state = new_iconstate overlays = new_overlays - set_dir(O.dir) + setDir(O.dir) M.loc = src master = C master.active_dummy = src diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 751022c2ae2..c683656edfb 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -177,7 +177,7 @@ spawn(10) C.lay_down() else - C.set_dir(get_dir(C,targloc)) + C.setDir(get_dir(C,targloc)) C.visible_message("[C] watches the light.", "Your attention is drawn to the mysterious glowing dot.") diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 9962b99cf28..5fe1b2f0cf4 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -141,7 +141,7 @@ A.pixel_x = pixel_x A.pixel_y = pixel_y A.circuit = M - A.set_dir(dir) + A.setDir(dir) A.anchored = 1 A.state = 2 A.update_icon() diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index ff7b8271148..eaf3c3de34e 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -10,7 +10,7 @@ var/model_info dir = SOUTH -/obj/item/robot_parts/set_dir() +/obj/item/robot_parts/setDir() return /obj/item/robot_parts/New(var/newloc, var/model) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 575591501e6..6d5f8a9d0f9 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -115,7 +115,7 @@ if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice)) bmark.icon_state = "scorch" - bmark.set_dir(pick(NORTH,SOUTH,EAST,WEST)) // random scorch design + bmark.setDir(pick(NORTH,SOUTH,EAST,WEST)) // random scorch design else diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c5be2552044..8647e578783 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -147,7 +147,7 @@ O = new recipe.result_type(user.loc, recipe.use_material) else O = new recipe.result_type(user.loc) - O.set_dir(user.dir) + O.setDir(user.dir) O.add_fingerprint(user) if (istype(O, /obj/item/stack)) diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 0ea94e8dec8..914c3e49657 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -38,7 +38,7 @@ spawn(det_time) detonate() return - user.set_dir(get_dir(user, target)) + user.setDir(get_dir(user, target)) user.drop_item() var/t = (isturf(target) ? target : target.loc) walk_towards(src, t, 3) diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 27927b81802..8824264824d 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -95,7 +95,7 @@ return 0 //trap the victim in place - set_dir(L.dir) + setDir(L.dir) can_buckle = 1 buckle_mob(L) L << "The steel jaws of \the [src] bite into you, trapping you in place!" diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 1cd43b7910f..cf28060be5c 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -15,7 +15,7 @@ if(W.is_wrench()) var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc) playsound(src, W.usesound, 50, 1) - C.set_dir(dir) + C.setDir(dir) part.loc = loc part.master = null part = null diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm index 158bf5533b0..75fac6219c6 100644 --- a/code/game/objects/structures/fitness.dm +++ b/code/game/objects/structures/fitness.dm @@ -53,7 +53,7 @@ else being_used = 1 playsound(src.loc, 'sound/effects/weightlifter.ogg', 50, 1) - user.set_dir(SOUTH) + user.setDir(SOUTH) flick("[icon_state]_[weight]", src) if(do_after(user, 20 + (weight * 10))) playsound(src.loc, 'sound/effects/weightdrop.ogg', 25, 1) diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm index 7ef0d49a517..1ff302fdd08 100644 --- a/code/game/objects/structures/gravemarker.dm +++ b/code/game/objects/structures/gravemarker.dm @@ -123,7 +123,7 @@ if(anchored) return if(config.ghost_interaction) - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return else if(istype(usr,/mob/living/simple_animal/mouse)) @@ -133,5 +133,5 @@ if(usr.stat || usr.restrained()) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return \ No newline at end of file diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 1e46aa1c712..cafd4478293 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -259,7 +259,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) return M -/obj/structure/bed/chair/janicart/set_dir() +/obj/structure/bed/chair/janicart/setDir() ..() update_layer() if(has_buckled_mobs()) @@ -276,7 +276,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) if(has_buckled_mobs()) for(var/A in buckled_mobs) var/mob/living/L = A - L.set_dir(dir) + L.setDir(dir) switch(dir) if(SOUTH) L.pixel_x = 0 diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c14a3d10e4a..ae8e67c3917 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -112,7 +112,7 @@ for(var/atom/movable/A as mob|obj in src) A.forceMove(src.connected.loc) src.connected.icon_state = "morguet" - src.connected.set_dir(src.dir) + src.connected.setDir(src.dir) else qdel(src.connected) src.connected = null diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index ea5d48db588..489a9b8b917 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -330,7 +330,7 @@ else if (istype(usr,/mob/observer/ghost) && !config.ghost_interaction) return else - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return /obj/structure/device/piano/attack_hand(mob/user) diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index b100237dacd..640236d6f65 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -141,7 +141,7 @@ to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") return 0 - set_dir(turn(dir, 90)) + setDir(turn(dir, 90)) update_icon() return @@ -160,7 +160,7 @@ to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") return 0 - set_dir(turn(dir, -90)) + setDir(turn(dir, -90)) update_icon() return @@ -185,7 +185,7 @@ return 0 src.loc = get_step(src, src.dir) - set_dir(turn(dir, 180)) + setDir(turn(dir, 180)) update_icon() return diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 270583011df..b897be30861 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -62,7 +62,7 @@ "You hear squelching...") M.buckled = src M.loc = src.loc - M.set_dir(src.dir) + M.setDir(src.dir) M.update_canmove() M.pixel_y = 6 M.old_y = 6 diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 8429c69bfe4..eccffd55e12 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -25,7 +25,7 @@ user.drop_item() var/obj/structure/bed/chair/e_chair/E = new (src.loc, material.name) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - E.set_dir(dir) + E.setDir(dir) E.part = SK SK.loc = E SK.master = E @@ -60,13 +60,13 @@ else reset_plane_and_layer() -/obj/structure/bed/chair/set_dir() +/obj/structure/bed/chair/setDir() ..() update_layer() if(has_buckled_mobs()) for(var/A in buckled_mobs) var/mob/living/L = A - L.set_dir(dir) + L.setDir(dir) /obj/structure/bed/chair/verb/rotate() set name = "Rotate Chair" @@ -74,7 +74,7 @@ set src in oview(1) if(config.ghost_interaction) - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return else if(istype(usr,/mob/living/simple_animal/mouse)) @@ -84,7 +84,7 @@ if(usr.stat || usr.restrained()) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return /obj/structure/bed/chair/shuttle diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index e53bbf67c1f..a916b010d92 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -14,7 +14,7 @@ /obj/structure/bed/chair/wheelchair/update_icon() return -/obj/structure/bed/chair/wheelchair/set_dir() +/obj/structure/bed/chair/wheelchair/setDir() ..() overlays = null var/image/O = image(icon = 'icons/obj/furniture.dmi', icon_state = "w_overlay", layer = FLY_LAYER, dir = src.dir) @@ -22,7 +22,7 @@ if(has_buckled_mobs()) for(var/A in buckled_mobs) var/mob/living/L = A - L.set_dir(dir) + L.setDir(dir) /obj/structure/bed/chair/wheelchair/attackby(obj/item/weapon/W as obj, mob/user as mob) if(W.is_wrench() || W.is_wirecutter() || istype(W,/obj/item/stack)) @@ -87,7 +87,7 @@ if(has_buckled_mobs()) // Make sure it stays beneath the occupant var/mob/living/L = buckled_mobs[1] Move(L.loc) - set_dir(direction) + setDir(direction) if(pulling) // Driver if(pulling.loc == src.loc) // We moved onto the wheelchair? Revert! pulling.forceMove(T) @@ -96,7 +96,7 @@ if(get_dist(src, pulling) > 1) // We are too far away? Losing control. pulling = null user.pulledby = null - pulling.set_dir(get_dir(pulling, src)) // When everything is right, face the wheelchair + pulling.setDir(get_dir(pulling, src)) // When everything is right, face the wheelchair if(bloodiness) create_track() driving = 0 @@ -145,7 +145,7 @@ user.pulledby = src if(user.pulling) user.stop_pulling() - user.set_dir(get_dir(user, src)) + user.setDir(get_dir(user, src)) user << "You grip \the [name]'s handles." else usr << "You let go of \the [name]'s handles." @@ -194,14 +194,14 @@ var/obj/effect/decal/cleanable/blood/tracks/B = new(loc) var/newdir = get_dir(get_step(loc, dir), loc) if(newdir == dir) - B.set_dir(newdir) + B.setDir(newdir) else newdir = newdir | dir if(newdir == 3) newdir = 1 else if(newdir == 12) newdir = 4 - B.set_dir(newdir) + B.setDir(newdir) bloodiness-- /obj/structure/bed/chair/wheelchair/buckle_mob(mob/M as mob, mob/user as mob) diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm index c260103a567..4cc309ddb33 100644 --- a/code/game/objects/structures/transit_tubes.dm +++ b/code/game/objects/structures/transit_tubes.dm @@ -170,7 +170,7 @@ obj/structure/ex_act(severity) nexttube = tube break if(!nexttube) - pod.set_dir(turn(pod.dir, 180)) + pod.setDir(turn(pod.dir, 180)) if(icon_state == "closed" && pod) pod.follow_tube() @@ -320,13 +320,13 @@ obj/structure/ex_act(severity) break if(current_tube == null) - set_dir(next_dir) + setDir(next_dir) Move(get_step(loc, dir)) // Allow collisions when leaving the tubes. break last_delay = current_tube.enter_delay(src, next_dir) sleep(last_delay) - set_dir(next_dir) + setDir(next_dir) loc = next_loc // When moving from one tube to another, skip collision and such. density = current_tube.density @@ -400,14 +400,14 @@ obj/structure/ex_act(severity) station.open_animation() else if(direction in station.directions()) - set_dir(direction) + setDir(direction) station.launch_pod() return for(var/obj/structure/transit_tube/tube in loc) if(dir in tube.directions()) if(tube.has_exit(direction)) - set_dir(direction) + setDir(direction) return diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 47f08399f01..5d47fd3e9de 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -39,9 +39,9 @@ obj/structure/windoor_assembly/New(Loc, start_dir=NORTH, constructed=0) anchored = 0 switch(start_dir) if(NORTH, SOUTH, EAST, WEST) - set_dir(start_dir) + setDir(start_dir) else //If the user is facing northeast. northwest, southeast, southwest or north, default to north - set_dir(NORTH) + setDir(NORTH) update_state() update_nearby_tiles(need_rebuild=1) @@ -213,7 +213,7 @@ obj/structure/windoor_assembly/Destroy() else windoor.icon_state = "rightsecureopen" windoor.base_state = "rightsecure" - windoor.set_dir(src.dir) + windoor.setDir(src.dir) windoor.density = 0 if(created_name) windoor.name = created_name @@ -235,7 +235,7 @@ obj/structure/windoor_assembly/Destroy() else windoor.icon_state = "rightopen" windoor.base_state = "right" - windoor.set_dir(src.dir) + windoor.setDir(src.dir) windoor.density = 0 if(created_name) windoor.name = created_name @@ -284,7 +284,7 @@ obj/structure/windoor_assembly/Destroy() if(src.state != "01") update_nearby_tiles(need_rebuild=1) //Compel updates before - src.set_dir(turn(src.dir, 270)) + src.setDir(turn(src.dir, 270)) if(src.state != "01") update_nearby_tiles(need_rebuild=1) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7fb5a718677..39763177c02 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -350,7 +350,7 @@ return 0 update_nearby_tiles(need_rebuild=1) //Compel updates before - set_dir(turn(dir, 90)) + setDir(turn(dir, 90)) updateSilicate() update_nearby_tiles(need_rebuild=1) return @@ -372,7 +372,7 @@ return 0 update_nearby_tiles(need_rebuild=1) //Compel updates before - set_dir(turn(dir, 270)) + setDir(turn(dir, 270)) updateSilicate() update_nearby_tiles(need_rebuild=1) return @@ -381,7 +381,7 @@ . = ..() if (start_dir) - set_dir(start_dir) + setDir(start_dir) //player-constructed windows if (constructed) @@ -411,7 +411,7 @@ var/ini_dir = dir update_nearby_tiles(need_rebuild=1) ..() - set_dir(ini_dir) + setDir(ini_dir) update_nearby_tiles(need_rebuild=1) //checks if this window is full-tile one diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index 52a8458077e..504c0ec7cc3 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -50,7 +50,7 @@ qdel(W) if(!found_connection) var/obj/structure/window/new_win = new win_path(src.loc) - new_win.set_dir(dir) + new_win.setDir(dir) handle_window_spawn(new_win) else neighbours |= other diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index d212f81b7f8..b65058e1018 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -21,7 +21,7 @@ var/list/floor_decals = list() // This is a separate proc from initialize() to facilitiate its caching and other stuff. Look into it someday. /obj/effect/floor_decal/proc/add_to_turf_decals() if(supplied_dir) - set_dir(supplied_dir) // TODO - Why can't this line be done in initialize/New()? + setDir(supplied_dir) // TODO - Why can't this line be done in initialize/New()? var/turf/T = get_turf(src) if(istype(T, /turf/simulated/floor) || istype(T, /turf/unsimulated/floor) || istype(T, /turf/simulated/shuttle/floor)) var/cache_key = "[alpha]-[color]-[dir]-[icon_state]-[T.layer]" diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 1eea97c546f..bca1287b981 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -32,7 +32,7 @@ //Set the destination to be like us T.Destroy() var/turf/simulated/shuttle/new_dest = T.ChangeTurf(my_turf.type,,1) - new_dest.set_dir(my_turf.dir) + new_dest.setDir(my_turf.dir) new_dest.icon_state = my_turf.icon_state new_dest.icon = my_turf.icon new_dest.copy_overlays(my_turf, TRUE) @@ -60,7 +60,7 @@ //Change our source to whatever it was before if(turf_type) new_source = my_turf.ChangeTurf(turf_type,,1) - new_source.set_dir(dir) + new_source.setDir(dir) new_source.icon_state = icon_state new_source.icon = icon new_source.copy_overlays(src, TRUE) diff --git a/code/game/turfs/turf_flick_animations.dm b/code/game/turfs/turf_flick_animations.dm index 43f1e90f598..0925c53f35d 100644 --- a/code/game/turfs/turf_flick_animations.dm +++ b/code/game/turfs/turf_flick_animations.dm @@ -7,7 +7,7 @@ target = location var/atom/movable/overlay/animation = new /atom/movable/overlay(location) if(direction) - animation.set_dir(direction) + animation.setDir(direction) animation.icon = a_icon animation.layer = target:layer+1 if(a_icon_state) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ae803539c6e..bed4ae997c6 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1648,7 +1648,7 @@ else var/atom/O = new path(target) if(O) - O.set_dir(obj_dir) + O.setDir(obj_dir) if(obj_name) O.name = obj_name if(istype(O,/mob)) diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 4552e206732..d93b461c60b 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -55,15 +55,15 @@ Click() switch(dir) if(NORTH) - set_dir(EAST) + setDir(EAST) if(EAST) - set_dir(SOUTH) + setDir(SOUTH) if(SOUTH) - set_dir(WEST) + setDir(WEST) if(WEST) - set_dir(NORTHWEST) + setDir(NORTHWEST) if(NORTHWEST) - set_dir(NORTH) + setDir(NORTH) return 1 /obj/effect/bmode/buildhelp @@ -309,19 +309,19 @@ switch(holder.builddir.dir) if(NORTH) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) - WIN.set_dir(NORTH) + WIN.setDir(NORTH) if(SOUTH) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) - WIN.set_dir(SOUTH) + WIN.setDir(SOUTH) if(EAST) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) - WIN.set_dir(EAST) + WIN.setDir(EAST) if(WEST) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) - WIN.set_dir(WEST) + WIN.setDir(WEST) if(NORTHWEST) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) - WIN.set_dir(NORTHWEST) + WIN.setDir(NORTHWEST) if(2) // Adv. Build if(pa.Find("left") && !pa.Find("ctrl")) if(ispath(holder.buildmode.objholder,/turf)) @@ -329,7 +329,7 @@ T.ChangeTurf(holder.buildmode.objholder) else var/obj/A = new holder.buildmode.objholder (get_turf(object)) - A.set_dir(holder.builddir.dir) + A.setDir(holder.builddir.dir) else if(pa.Find("right")) if(isobj(object)) qdel(object) diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 16550f67127..5425e1e2556 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -247,8 +247,8 @@ return switch(href_list["rotatedir"]) - if("right") A.set_dir(turn(A.dir, -45)) - if("left") A.set_dir(turn(A.dir, 45)) + if("right") A.setDir(turn(A.dir, -45)) + if("left") A.setDir(turn(A.dir, 45)) href_list["datumrefresh"] = href_list["rotatedatum"] else if(href_list["makemonkey"]) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 22034315723..bfc954aef22 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -56,7 +56,7 @@ var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam((holder ? holder.loc : loc) ) I.master = src I.density = 1 - I.set_dir(dir) + I.setDir(dir) step(I, I.dir) if(I) I.density = 0 @@ -81,14 +81,14 @@ /obj/item/device/assembly/infra/Move() var/t = dir ..() - set_dir(t) + setDir(t) qdel(first) return /obj/item/device/assembly/infra/holder_movement() if(!holder) return 0 -// set_dir(holder.dir) +// setDir(holder.dir) qdel(first) return 1 @@ -147,7 +147,7 @@ set category = "Object" set src in usr - set_dir(turn(dir, 90)) + setDir(turn(dir, 90)) return @@ -203,7 +203,7 @@ var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(loc) I.master = master I.density = 1 - I.set_dir(dir) + I.setDir(dir) //world << "created new beam \ref[I] at [I.x] [I.y] [I.z]" step(I, I.dir) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 011dd410ea3..67431dd7877 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -130,13 +130,13 @@ obj/machinery/gateway/centerstation/process() playsound(src, 'sound/effects/phasein.ogg', 100, 1) if(awaygate.calibrated) M.forceMove(get_step(awaygate.loc, SOUTH)) - M.set_dir(SOUTH) + M.setDir(SOUTH) return else var/obj/effect/landmark/dest = pick(awaydestinations) if(dest) M.forceMove(dest.loc) - M.set_dir(SOUTH) + M.setDir(SOUTH) return /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob) @@ -241,7 +241,7 @@ obj/machinery/gateway/centerstation/process() M << "The station gate has detected your exile implant and is blocking your entry." return M.forceMove(get_step(stationgate.loc, SOUTH)) - M.set_dir(SOUTH) + M.setDir(SOUTH) M << 'sound/effects/phasein.ogg' playsound(src, 'sound/effects/phasein.ogg', 100, 1) diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index e70587c5a3a..667d47cccf4 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -25,7 +25,7 @@ var/list/blobs = list() update_icon() if(!integrity) integrity = max_integrity - set_dir(pick(cardinal)) + setDir(pick(cardinal)) blobs += src consume_tile() @@ -199,7 +199,7 @@ var/list/blobs = list() /obj/structure/blob/proc/blob_attack_animation(atom/A = null, controller) //visually attacks an atom var/obj/effect/temporary_effect/blob_attack/O = new /obj/effect/temporary_effect/blob_attack(src.loc) - O.set_dir(dir) + O.setDir(dir) if(controller) var/mob/observer/blob/BO = controller O.color = BO.blob_type.color @@ -218,7 +218,7 @@ var/list/blobs = list() if(controller) B.overmind = controller B.update_icon() - B.set_dir(dir) + B.setDir(dir) qdel(src) return B diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f6a38c2eee6..54ace5e6697 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -182,7 +182,7 @@ desc = O.desc icon = O.icon icon_state = O.icon_state - set_dir(O.dir) + setDir(O.dir) //////////////////////////////////////////////////////////////////////////////////////// //Gloves diff --git a/code/modules/clothing/masks/monitor.dm b/code/modules/clothing/masks/monitor.dm index 9b0c94ca039..8c24d152c10 100644 --- a/code/modules/clothing/masks/monitor.dm +++ b/code/modules/clothing/masks/monitor.dm @@ -13,7 +13,7 @@ var/monitor_state_index = "blank" var/global/list/monitor_states = list() -/obj/item/clothing/mask/monitor/set_dir() +/obj/item/clothing/mask/monitor/setDir() dir = SOUTH return diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index b5d58c8da6c..eab929818b7 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -161,7 +161,7 @@ if(holder && holder.wearer) if(..(target) && target) - set_dir(get_dir(src,target)) // Face the target + setDir(get_dir(src,target)) // Face the target holder.wearer.Beam(target,"n_beam",,10) return 1 return 0 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index ca95cc54220..c6ff610089e 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -295,7 +295,7 @@ proc/check_panel(mob/M) collapse() continue if(get_dist(src,my_target) > 1) - src.set_dir(get_dir(src,my_target)) + src.setDir(get_dir(src,my_target)) step_towards(src,my_target) updateimage() else diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index b2e3e28287f..c1aca18c1ee 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -131,7 +131,7 @@ // Plants will sometimes be spawned in the turf adjacent to the one they need to end up in, for the sake of correct dir/etc being set. /obj/effect/plant/proc/finish_spreading() - set_dir(calc_dir()) + setDir(calc_dir()) update_icon() plant_controller.add_plant(src) //Some plants eat through plating. diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index 8a8ceabfebb..644e5512fac 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -94,7 +94,7 @@ src.visible_message("Tendrils lash out from \the [src] and drag \the [victim] in!") victim.forceMove(src.loc) buckle_mob(victim) - victim.set_dir(pick(cardinal)) + victim.setDir(pick(cardinal)) victim << "Tendrils [pick("wind", "tangle", "tighten")] around you!" victim.Weaken(0.5) seed.do_thorns(victim,src) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index e8d8fe22545..1ee1dafe855 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -361,5 +361,5 @@ to_chat(usr, "It is anchored in place!") return 0 - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return 1 \ No newline at end of file diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index c5bded9765d..e96d46381f5 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -285,6 +285,6 @@ note dizziness decrements automatically in the mob's Life() proc. D = SOUTH if(WEST) D = NORTH - set_dir(D) + setDir(D) spintime -= speed return diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 512f488a86d..db1d9080ad5 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -232,7 +232,7 @@ attack_message = "[H] attempted to strike [src], but missed!" else attack_message = "[H] attempted to strike [src], but [TT.he] rolled out of the way!" - src.set_dir(pick(cardinal)) + src.setDir(pick(cardinal)) miss_type = 1 if(!miss_type && block) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 02cc18f7b52..08153875268 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -151,7 +151,7 @@ var/turf/T = get_turf(src) var/mob/living/carbon/alien/diona/S = new(T) - S.set_dir(dir) + S.setDir(dir) transfer_languages(src, S) if(mind) @@ -166,13 +166,13 @@ nymphs++ D.forceMove(T) transfer_languages(src, D, WHITELISTED|RESTRICTED) - D.set_dir(pick(NORTH, SOUTH, EAST, WEST)) + D.setDir(pick(NORTH, SOUTH, EAST, WEST)) if(nymphs < number_of_resulting_nymphs) for(var/i in nymphs to (number_of_resulting_nymphs - 1)) var/mob/M = new /mob/living/carbon/alien/diona(T) transfer_languages(src, M, WHITELISTED|RESTRICTED) - M.set_dir(pick(NORTH, SOUTH, EAST, WEST)) + M.setDir(pick(NORTH, SOUTH, EAST, WEST)) for(var/obj/item/W in src) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 6ec4ce29545..08dd537bcef 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -72,7 +72,7 @@ var/global/list/sparring_attack_cache = list() else target.visible_message("[target] slams into [T]!") if(prob(50)) - target.set_dir(reverse_dir[target.dir]) + target.setDir(reverse_dir[target.dir]) target.apply_effect(attack_damage * 0.4, WEAKEN, armour) if(BP_GROIN) target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your[pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]") // I see no easy way to fix this for non-organic or neuter characters. diff --git a/code/modules/mob/living/simple_animal/animals/bear.dm b/code/modules/mob/living/simple_animal/animals/bear.dm index cc154533da6..ecdc57933da 100644 --- a/code/modules/mob/living/simple_animal/animals/bear.dm +++ b/code/modules/mob/living/simple_animal/animals/bear.dm @@ -78,7 +78,7 @@ stance_step = max(0, stance_step) //If we have not seen a mob in a while, the stance_step will be negative, we need to reset it to 0 as soon as we see a mob again. stance_step++ found_mob = 1 - src.set_dir(get_dir(src,target_mob)) //Keep staring at the mob + src.setDir(get_dir(src,target_mob)) //Keep staring at the mob if(stance_step in list(1,4,7)) //every 3 ticks var/action = pick( list( "growls at [target_mob]", "stares angrily at [target_mob]", "prepares to attack [target_mob]", "closely watches [target_mob]" ) ) diff --git a/code/modules/mob/living/simple_animal/animals/cat.dm b/code/modules/mob/living/simple_animal/animals/cat.dm index 8877ea89598..43ebac36595 100644 --- a/code/modules/mob/living/simple_animal/animals/cat.dm +++ b/code/modules/mob/living/simple_animal/animals/cat.dm @@ -143,7 +143,7 @@ . = 1 //already friends, but show success anyways if(.) - set_dir(get_dir(src, friend)) + setDir(get_dir(src, friend)) visible_emote(pick("nuzzles [friend].", "brushes against [friend].", "rubs against [friend].", diff --git a/code/modules/mob/living/simple_animal/animals/corgi.dm b/code/modules/mob/living/simple_animal/animals/corgi.dm index 33bda8b2e0a..f451c54d491 100644 --- a/code/modules/mob/living/simple_animal/animals/corgi.dm +++ b/code/modules/mob/living/simple_animal/animals/corgi.dm @@ -74,15 +74,15 @@ if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds if (movement_target.loc.x < src.x) - set_dir(WEST) + setDir(WEST) else if (movement_target.loc.x > src.x) - set_dir(EAST) + setDir(EAST) else if (movement_target.loc.y < src.y) - set_dir(SOUTH) + setDir(SOUTH) else if (movement_target.loc.y > src.y) - set_dir(NORTH) + setDir(NORTH) else - set_dir(SOUTH) + setDir(SOUTH) if(isturf(movement_target.loc) ) UnarmedAttack(movement_target) @@ -93,7 +93,7 @@ visible_emote(pick("dances around","chases their tail")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) - set_dir(i) + setDir(i) sleep(1) /obj/item/weapon/reagent_containers/food/snacks/meat/corgi @@ -108,7 +108,7 @@ M.show_message("[user] baps [name] on the nose with the rolled up [O]") spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) - set_dir(i) + setDir(i) sleep(1) else ..() @@ -204,7 +204,7 @@ visible_emote(pick("dances around","chases her tail")) spawn(0) for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) - set_dir(i) + setDir(i) sleep(1) //Technically this should be like, its own file or something or a subset of dog but whatever. Not a coder. diff --git a/code/modules/mob/living/simple_animal/animals/fox_vr.dm b/code/modules/mob/living/simple_animal/animals/fox_vr.dm index 84a9a1ca267..3f2c9876c58 100644 --- a/code/modules/mob/living/simple_animal/animals/fox_vr.dm +++ b/code/modules/mob/living/simple_animal/animals/fox_vr.dm @@ -155,7 +155,7 @@ set src in view(1) if(friend && usr == friend) - set_dir(get_dir(src, friend)) + setDir(get_dir(src, friend)) say("Yap!") return @@ -165,7 +165,7 @@ friend = usr - set_dir(get_dir(src, friend)) + setDir(get_dir(src, friend)) say("Yap!") /obj/item/weapon/reagent_containers/food/snacks/meat/fox diff --git a/code/modules/mob/living/simple_animal/animals/worm.dm b/code/modules/mob/living/simple_animal/animals/worm.dm index 76588eb9462..342d78ab9ab 100644 --- a/code/modules/mob/living/simple_animal/animals/worm.dm +++ b/code/modules/mob/living/simple_animal/animals/worm.dm @@ -74,7 +74,7 @@ if(stat == CONSCIOUS || stat == UNCONSCIOUS) icon_state = "spacewormhead[previous?1:0]" if(previous) - set_dir(get_dir(previous,src)) + setDir(get_dir(previous,src)) else icon_state = "spacewormheaddead" @@ -128,7 +128,7 @@ icon_state = "spaceworm[get_dir(src,previous) | get_dir(src,next)]" //see 3 lines below else //tail icon_state = "spacewormtail" - set_dir(get_dir(src,next)) //next will always be present since it's not a head and if it's dead, it goes in the other if branch + setDir(get_dir(src,next)) //next will always be present since it's not a head and if it's dead, it goes in the other if branch else icon_state = "spacewormdead" diff --git a/code/modules/mob/living/simple_animal/simple_hud.dm b/code/modules/mob/living/simple_animal/simple_hud.dm index 5da7e8a6963..b9634522634 100644 --- a/code/modules/mob/living/simple_animal/simple_hud.dm +++ b/code/modules/mob/living/simple_animal/simple_hud.dm @@ -38,7 +38,7 @@ slot_info["[inv_box.slot_id]"] = inv_box.screen_loc if(slot_data["dir"]) - inv_box.set_dir(slot_data["dir"]) + inv_box.setDir(slot_data["dir"]) if(slot_data["toggle"]) other += inv_box diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 104e95f55e6..2ead6dee215 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -776,9 +776,9 @@ /mob/proc/facedir(var/ndir) if(!canface() || (client && (client.moving || (world.time < client.move_delay)))) return 0 - set_dir(ndir) + setDir(ndir) if(buckled && buckled.buckle_movable) - buckled.set_dir(ndir) + buckled.setDir(ndir) if(client) client.move_delay += movement_delay() return 1 @@ -1058,15 +1058,15 @@ mob/proc/yank_out_object() if(newdir == facing_dir) facing_dir = null else if(newdir) - set_dir(newdir) + setDir(newdir) facing_dir = newdir else if(facing_dir) facing_dir = null else - set_dir(dir) + setDir(dir) facing_dir = dir -/mob/set_dir() +/mob/setDir() if(facing_dir) if(!canface() || lying || buckled || restrained()) facing_dir = null diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index d3c672edfa1..cabe1eba43c 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -191,7 +191,7 @@ if(affecting.lying && state != GRAB_KILL) animate(affecting, pixel_x = initial(affecting.pixel_x), pixel_y = initial(affecting.pixel_y), 5, 1, LINEAR_EASING) if(force_down) - affecting.set_dir(SOUTH) //face up + affecting.setDir(SOUTH) //face up return var/shift = 0 var/adir = get_dir(assailant, affecting) @@ -201,18 +201,18 @@ shift = 8 if(dancing) //look at partner shift = 10 - assailant.set_dir(get_dir(assailant, affecting)) + assailant.setDir(get_dir(assailant, affecting)) if(GRAB_AGGRESSIVE) shift = 12 if(GRAB_NECK, GRAB_UPGRADING) shift = -10 adir = assailant.dir - affecting.set_dir(assailant.dir) + affecting.setDir(assailant.dir) affecting.loc = assailant.loc if(GRAB_KILL) shift = 0 adir = 1 - affecting.set_dir(SOUTH) //face up + affecting.setDir(SOUTH) //face up affecting.loc = assailant.loc switch(adir) @@ -265,7 +265,7 @@ assailant.visible_message("[assailant] has reinforced [TU.his] grip on [affecting] (now neck)!") state = GRAB_NECK icon_state = "grabbed+1" - assailant.set_dir(get_dir(assailant, affecting)) + assailant.setDir(get_dir(assailant, affecting)) add_attack_logs(assailant,affecting,"Neck grabbed") hud.icon_state = "kill" hud.name = "kill" @@ -279,7 +279,7 @@ add_attack_logs(assailant,affecting,"Strangled") affecting.setClickCooldown(10) affecting.AdjustLosebreath(1) - affecting.set_dir(WEST) + affecting.setDir(WEST) adjust_position() //This is used to make sure the victim hasn't managed to yackety sax away before using the grab. diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm index c00a810202f..43151a8995c 100644 --- a/code/modules/mob/mob_grab_specials.dm +++ b/code/modules/mob/mob_grab_specials.dm @@ -146,8 +146,8 @@ target.Weaken(3) target.lying = 1 step_to(attacker, target) - attacker.set_dir(EAST) //face the victim - target.set_dir(SOUTH) //face up + attacker.setDir(EAST) //face the victim + target.setDir(SOUTH) //face up /obj/item/weapon/grab/proc/devour(mob/target, mob/user) var/can_eat diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 16928c0b7c6..dea0e3adeba 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -161,7 +161,7 @@ . = ..() if(direct != olddir) dir = olddir - set_dir(direct) + setDir(direct) src.move_speed = world.time - src.l_move_time src.l_move_time = world.time @@ -367,7 +367,7 @@ for (var/obj/item/weapon/grab/G in mob) if (G.state == GRAB_NECK) - mob.set_dir(reverse_dir[direct]) + mob.setDir(reverse_dir[direct]) G.adjust_position() for (var/obj/item/weapon/grab/G in mob.grabbed_by) G.adjust_position() diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 60bced4c9ae..f9473d612ad 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -392,7 +392,7 @@ // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair)) character.buckled.loc = character.loc - character.buckled.set_dir(character.dir) + character.buckled.setDir(character.dir) ticker.mode.latespawn(character) diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm index 6db566d1ae8..b0d6ea8b6ba 100644 --- a/code/modules/multiz/pipes.dm +++ b/code/modules/multiz/pipes.dm @@ -88,9 +88,9 @@ obj/machinery/atmospherics/pipe/zpipe/proc/burst() obj/machinery/atmospherics/pipe/zpipe/proc/normalize_dir() if(dir == (NORTH|SOUTH)) - set_dir(NORTH) + setDir(NORTH) else if(dir == (EAST|WEST)) - set_dir(EAST) + setDir(EAST) obj/machinery/atmospherics/pipe/zpipe/Destroy() if(node1) diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm index 19ce85ea82b..1930acbaba4 100644 --- a/code/modules/multiz/zshadow.dm +++ b/code/modules/multiz/zshadow.dm @@ -107,10 +107,10 @@ if(shadow) shadow.sync_icon(src) -/mob/set_dir(new_dir) +/mob/setDir(new_dir) . = ..() if(shadow) - shadow.set_dir(new_dir) + shadow.setDir(new_dir) // Transfer messages about what we are doing to upstairs /mob/visible_message(var/message, var/self_message, var/blind_message) diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index 6c46955ae7d..4c8d4aa1eea 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -17,7 +17,7 @@ GLOBAL_DATUM_INIT(nanomanager, /datum/nanomanager, new) // NanoManager, the mana * @return /nanomanager new nanomanager object */ /datum/nanomanager/New() - var/list/nano_asset_dirs = list(\ + var/list/nano_assetDirs = list(\ "nano/css/",\ "nano/images/",\ "nano/js/",\ @@ -25,7 +25,7 @@ GLOBAL_DATUM_INIT(nanomanager, /datum/nanomanager, new) // NanoManager, the mana ) var/list/filenames = null - for (var/path in nano_asset_dirs) + for (var/path in nano_assetDirs) filenames = flist(path) for(var/filename in filenames) if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index defe0d75dea..1e313507927 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -350,9 +350,9 @@ else return ..(A) -/mob/living/carbon/brain/caught_soul/set_dir(var/direction) +/mob/living/carbon/brain/caught_soul/setDir(var/direction) if(eyeobj) - return eyeobj.set_dir(direction) + return eyeobj.setDir(direction) else return ..(direction) @@ -436,7 +436,7 @@ for(var/i = 0; i < max(sprint, initial); i += 20) var/turf/stepn = get_turf(get_step(src, direct)) if(stepn) - set_dir(direct) + setDir(direct) if(can_see(parent_human, stepn)) forceMove(stepn) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 371c64e0ab5..e98a19a301d 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -1,6 +1,6 @@ var/global/list/limb_icon_cache = list() -/obj/item/organ/external/set_dir() +/obj/item/organ/external/setDir() return /obj/item/organ/external/proc/compile_icon() diff --git a/code/modules/overmap/ships/engines/thermal.dm b/code/modules/overmap/ships/engines/thermal.dm index 9c4af11cc63..44b5a087447 100644 --- a/code/modules/overmap/ships/engines/thermal.dm +++ b/code/modules/overmap/ships/engines/thermal.dm @@ -89,7 +89,7 @@ anchored = 1 New(var/turf/nloc, var/ndir, var/temp) - set_dir(ndir) + setDir(ndir) ..(nloc) if(nloc) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index fcd737d82b9..454305fa342 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -163,7 +163,7 @@ // offset 24 pixels in direction of dir // this allows the APC to be embedded in a wall, yet still inside an area if (building) - set_dir(ndir) + setDir(ndir) pixel_x = (src.dir & 3)? 0 : (src.dir == 4 ? 24 : -24) pixel_y = (src.dir & 3)? (src.dir ==1 ? 24 : -24) : 0 @@ -206,7 +206,7 @@ // create a terminal object at the same position as original turf loc // wires will attach to this terminal = new/obj/machinery/power/terminal(src.loc) - terminal.set_dir(dir) + terminal.setDir(dir) terminal.master = src /obj/machinery/power/apc/proc/init() diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 991239e4fd9..d8fe512a1ad 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -223,7 +223,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) /obj/machinery/power/generator/verb/rotate_anticlock() set category = "Object" @@ -233,7 +233,7 @@ if (usr.stat || usr.restrained() || anchored) return - src.set_dir(turn(src.dir, -90)) + src.setDir(turn(src.dir, -90)) /obj/machinery/power/generator/power_spike() // if(!effective_gen >= max_power / 2 && powernet) // Don't make a spike if we're not making a whole lot of power. diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm index db1881c4b33..1e74c22af28 100644 --- a/code/modules/power/lightswitch_vr.dm +++ b/code/modules/power/lightswitch_vr.dm @@ -61,7 +61,7 @@ /obj/structure/construction/Initialize(var/mapload, var/ndir, var/building = FALSE) . = ..() if(ndir) - set_dir(ndir) + setDir(ndir) if(x_offset) pixel_x = (dir & 3) ? 0 : (dir == EAST ? -x_offset : x_offset) if(y_offset) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7c29cce356d..ab324b946ab 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -38,7 +38,7 @@ if (src.anchored || usr:stat) usr << "It is fastened to the floor!" return 0 - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return 1 /obj/machinery/power/emitter/Initialize() diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index b82aa9619de..817541fd8e9 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -290,7 +290,7 @@ field_generator power level display fields += CF G.fields += CF CF.loc = T - CF.set_dir(field_dir) + CF.setDir(field_dir) var/listcheck = 0 for(var/obj/machinery/field_generator/FG in connected_gens) if (isnull(FG)) diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index e873dcc7af4..042ab769679 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -40,7 +40,7 @@ /obj/effect/accelerated_particle/New(loc, dir = 2) src.loc = loc - src.set_dir(dir) + src.setDir(dir) spawn(0) move(1) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index eeeb4fcdc65..2b48692bafc 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -97,7 +97,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if (src.anchored || usr:stat) usr << "It is fastened to the floor!" return 0 - src.set_dir(turn(src.dir, 270)) + src.setDir(turn(src.dir, 270)) return 1 /obj/structure/particle_accelerator/verb/rotateccw() @@ -108,7 +108,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if (src.anchored || usr:stat) usr << "It is fastened to the floor!" return 0 - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return 1 /obj/structure/particle_accelerator/examine(mob/user) @@ -277,7 +277,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if (src.anchored || usr:stat) usr << "It is fastened to the floor!" return 0 - src.set_dir(turn(src.dir, 270)) + src.setDir(turn(src.dir, 270)) return 1 /obj/machinery/particle_accelerator/verb/rotateccw() @@ -288,7 +288,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if (src.anchored || usr:stat) usr << "It is fastened to the floor!" return 0 - src.set_dir(turn(src.dir, 90)) + src.setDir(turn(src.dir, 90)) return 1 /obj/machinery/particle_accelerator/update_icon() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 1a1ff779199..61308b7b517 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -159,7 +159,7 @@ /obj/machinery/particle_accelerator/control_box/proc/part_scan() for(var/obj/structure/particle_accelerator/fuel_chamber/F in orange(1,src)) - src.set_dir(F.dir) + src.setDir(F.dir) connected_parts = list() var/tally = 0 var/ldir = turn(dir,-90) diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index d1b21636824..37f9cd1ba1d 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -44,6 +44,6 @@ if(3) A = new/obj/effect/accelerated_particle/powerful(T, dir) if(A) - A.set_dir(src.dir) + A.setDir(src.dir) return 1 return 0 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 6bf7060037c..5ac0d429218 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -230,7 +230,7 @@ to_chat(user, "You start adding cable to the [src].") if(do_after(user, 50)) terminal = new /obj/machinery/power/terminal(tempLoc) - terminal.set_dir(tempDir) + terminal.setDir(tempDir) terminal.master = src terminal.connect_to_network() return 0 diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 87fc22e81c2..6367821b088 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -99,7 +99,7 @@ var/list/solars_list = list() overlays += image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER) else overlays += image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER) - src.set_dir(angle2dir(adir)) + src.setDir(angle2dir(adir)) return //calculates the fraction of the sunlight that the panel recieves diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 0e61e7a5de1..01636c2ccf9 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -62,7 +62,7 @@ playsound(src.loc, 'sound/effects/lightningbolt.ogg', 100, 1, extrarange = 30) - set_dir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE)) + setDir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE)) for (var/ball in orbiting_balls) var/range = rand(1, Clamp(orbiting_balls.len, 3, 7)) @@ -86,7 +86,7 @@ var/turf/T = get_step(src, move_dir) if(can_move(T)) forceMove(T) - set_dir(move_dir) + setDir(move_dir) for(var/mob/living/carbon/C in loc) dust_mobs(C) sleep(1) // So movement is smooth diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 5d925b08720..a2661bc17ef 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -52,7 +52,7 @@ sun_angle = angle //set icon dir to show sun illumination - set_dir(turn(NORTH, -angle - 22.5)) // 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST + setDir(turn(NORTH, -angle - 22.5)) // 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 8223dff54df..fe1958d8b67 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -26,7 +26,7 @@ /obj/item/ammo_casing/proc/expend() . = BB BB = null - set_dir(pick(cardinal)) //spin spent casings + setDir(pick(cardinal)) //spin spent casings update_icon() /obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -154,7 +154,7 @@ playsound(user.loc, "casing_sound", 50, 1) for(var/obj/item/ammo_casing/C in stored_ammo) C.loc = user.loc - C.set_dir(pick(cardinal)) + C.setDir(pick(cardinal)) stored_ammo.Cut() update_icon() else diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm index bc433c65c77..02b8d87b90e 100644 --- a/code/modules/projectiles/targeting/targeting_overlay.dm +++ b/code/modules/projectiles/targeting/targeting_overlay.dm @@ -139,7 +139,7 @@ obj/aiming_overlay/proc/update_aiming_deferred() if(!owner.incapacitated() && owner.client) spawn(0) - owner.set_dir(get_dir(get_turf(owner), get_turf(src))) + owner.setDir(get_dir(get_turf(owner), get_turf(src))) /obj/aiming_overlay/proc/aim_at(var/mob/target, var/obj/thing) diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm index da346d2eb71..171c897c24f 100644 --- a/code/modules/random_map/drop/droppod.dm +++ b/code/modules/random_map/drop/droppod.dm @@ -118,7 +118,7 @@ // Also spawn doors and loot. if(value == SD_DOOR_TILE) var/obj/structure/S = new door_type(T, auto_open_doors) - S.set_dir(spawn_dir) + S.setDir(spawn_dir) else if(value == SD_SUPPLY_TILE) get_spawned_drop(T) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 6fa6fd198f3..176307e982f 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -26,7 +26,7 @@ /obj/machinery/conveyor/Initialize(mapload, newdir, on = 0) . = ..() if(newdir) - set_dir(newdir) + setDir(newdir) if(dir & (dir-1)) // Diagonal. Forwards is *away* from dir, curving to the right. forwards = turn(dir, 135) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index be2c3239e94..851ea7f13fe 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -115,7 +115,7 @@ to_chat(usr, "You must unfasten the pipe before rotating it.") return - set_dir(turn(dir, -90)) + setDir(turn(dir, -90)) update() verb/flip() @@ -129,7 +129,7 @@ to_chat(usr, "You must unfasten the pipe before flipping it.") return - set_dir(turn(dir, 180)) + setDir(turn(dir, 180)) switch(ptype) if(2) ptype = 3 @@ -282,7 +282,7 @@ var/obj/structure/disposalpipe/P = new pipetype(src.loc) src.transfer_fingerprints_to(P) P.base_icon_state = base_state - P.set_dir(dir) + P.setDir(dir) P.dpdir = dpdir P.updateicon() @@ -303,7 +303,7 @@ var/obj/structure/disposaloutlet/P = new /obj/structure/disposaloutlet(src.loc) src.transfer_fingerprints_to(P) - P.set_dir(dir) + P.setDir(dir) var/obj/structure/disposalpipe/trunk/Trunk = CP Trunk.linked = P @@ -311,7 +311,7 @@ var/obj/machinery/disposal/deliveryChute/P = new /obj/machinery/disposal/deliveryChute(src.loc) src.transfer_fingerprints_to(P) - P.set_dir(dir) + P.setDir(dir) qdel(src) return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 356e229bd67..e0f11deecb7 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -546,7 +546,7 @@ forceMove(D.trunk) active = 1 - set_dir(DOWN) + setDir(DOWN) spawn(1) move() // spawn off the movement process @@ -709,7 +709,7 @@ // proc/transfer(var/obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir) - H.set_dir(nextdir) + H.setDir(nextdir) var/turf/T = H.nextloc() var/obj/structure/disposalpipe/P = H.findpipe(T) @@ -817,7 +817,7 @@ for(var/D in cardinal) if(D & dpdir) var/obj/structure/disposalpipe/broken/P = new(src.loc) - P.set_dir(D) + P.setDir(D) src.invisibility = 101 // make invisible (since we won't delete the pipe immediately) var/obj/structure/disposalholder/H = locate() in src @@ -931,7 +931,7 @@ C.ptype = 14 C.subtype = src.subtype src.transfer_fingerprints_to(C) - C.set_dir(dir) + C.setDir(dir) C.density = 0 C.anchored = 1 C.update() @@ -1004,7 +1004,7 @@ transfer(var/obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir) - H.set_dir(nextdir) + H.setDir(nextdir) var/turf/T var/obj/structure/disposalpipe/P @@ -1261,7 +1261,7 @@ transfer(var/obj/structure/disposalholder/H) var/nextdir = nextdir(H.dir, H.destinationTag) - H.set_dir(nextdir) + H.setDir(nextdir) var/turf/T = H.nextloc() var/obj/structure/disposalpipe/P = H.findpipe(T) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 0b876c81ee6..07241c41405 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -52,7 +52,7 @@ A.need_circuit = 0 A.pixel_x = pixel_x A.pixel_y = pixel_y - A.set_dir(dir) + A.setDir(dir) A.circuit = M A.anchored = 1 for (var/obj/C in src) diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index 4846f872851..8cedc75fbdc 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -182,7 +182,7 @@ destroy_shields() else - set_dir(user.dir) // Needed for linear shields. + setDir(user.dir) // Needed for linear shields. create_shields() visible_message("\The [user] [!active ? "de":""]activates \the [src].") @@ -378,9 +378,9 @@ destroy_shields() else if(istype(user.loc, /obj/mecha)) - set_dir(user.loc.dir) + setDir(user.loc.dir) else - set_dir(user.dir) + setDir(user.dir) create_shields() visible_message("\The [user] [!active ? "de":""]activates \the [src].") diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index 819f4d4b5bb..be5782c8ebd 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -29,7 +29,7 @@ /obj/machinery/shield/Initialize(mapload) . = ..() - set_dir(pick(1,2,3,4)) + setDir(pick(1,2,3,4)) update_nearby_tiles(need_rebuild=1) /obj/machinery/shield/Destroy() diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index 37c55e59114..a975980b783 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -154,7 +154,7 @@ T2 = T var/obj/machinery/shieldwall/CF = new/obj/machinery/shieldwall/(src, G) //(ref to this gen, ref to connected gen) CF.loc = T - CF.set_dir(field_dir) + CF.setDir(field_dir) /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user) diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index ae517059846..010b26ac5ba 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -149,5 +149,5 @@ if (src.anchored) usr << "It is fastened to the floor!" return - src.set_dir(turn(src.dir, 270)) + src.setDir(turn(src.dir, 270)) return diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index b85c8a1b44c..de94201af04 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -82,7 +82,7 @@ spawn(0) A.throw_at(pick(targets),1,1) - set_dir(direction) + setDir(direction) if(dir != NORTH) plane = MOB_PLANE layer = ABOVE_MOB_LAYER diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index cb9e93f4fb2..8154553b9ad 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -8,7 +8,7 @@ var/datum/turbolift/lift -/obj/structure/lift/set_dir(var/newdir) +/obj/structure/lift/setDir(var/newdir) . = ..() pixel_x = 0 pixel_y = 0 diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 9dd25bdc51c..96839150d33 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -190,7 +190,7 @@ var/turf/placing = locate(ext_panel_x, ext_panel_y, cz) var/obj/structure/lift/button/panel_ext = new(placing, lift) panel_ext.floor = cfloor - panel_ext.set_dir(udir) + panel_ext.setDir(udir) cfloor.ext_panel = panel_ext // Place lights @@ -199,11 +199,11 @@ var/obj/machinery/light/light1 = new(placing1, light) var/obj/machinery/light/light2 = new(placing2, light) if(udir == NORTH || udir == SOUTH) - light1.set_dir(WEST) - light2.set_dir(EAST) + light1.setDir(WEST) + light2.setDir(EAST) else - light1.set_dir(SOUTH) - light2.set_dir(NORTH) + light1.setDir(SOUTH) + light2.setDir(NORTH) // Update area. if(az > areas_to_use.len) @@ -221,7 +221,7 @@ // Place lift panel. var/turf/T = locate(int_panel_x, int_panel_y, uz) lift.control_panel_interior = new(T, lift) - lift.control_panel_interior.set_dir(udir) + lift.control_panel_interior.setDir(udir) lift.current_floor = lift.floors[1] lift.open_doors() diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index c66bfee0c46..825b465d43c 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -171,7 +171,7 @@ //latch with src as the follower lead = T T.tow = src - set_dir(lead.dir) + setDir(lead.dir) if(user) user << "You hitch [src] to [T]." diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 78907f754ba..e2a0eb8283e 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -68,7 +68,7 @@ riding_datum.restore_position(buckled_mob) riding_datum.handle_vehicle_offsets() // So the person in back goes to the front. -/obj/vehicle/set_dir(newdir) +/obj/vehicle/setDir(newdir) ..(newdir) if(riding_datum) riding_datum.handle_vehicle_offsets() @@ -97,7 +97,7 @@ anchored = init_anc return 0 - set_dir(get_dir(old_loc, loc)) + setDir(get_dir(old_loc, loc)) anchored = init_anc if(mechanical && on && powered) @@ -107,7 +107,7 @@ //See load_object() proc in cargo_trains.dm for an example if(load && !istype(load, /datum/vehicle_dummy_load)) load.forceMove(loc) - load.set_dir(dir) + load.setDir(dir) return 1 else @@ -190,7 +190,7 @@ pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" pulse2.anchored = 1 - pulse2.set_dir(pick(cardinal)) + pulse2.setDir(pick(cardinal)) spawn(10) qdel(pulse2) @@ -337,7 +337,7 @@ crate.close() C.forceMove(loc) - C.set_dir(dir) + C.setDir(dir) C.anchored = 1 load = C @@ -387,7 +387,7 @@ return 0 load.forceMove(dest) - load.set_dir(get_dir(loc, dest)) + load.setDir(get_dir(loc, dest)) load.anchored = 0 //we can only load non-anchored items, so it makes sense to set this to false load.pixel_x = initial(load.pixel_x) load.pixel_y = initial(load.pixel_y) diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 94459fb3bef..7a20bef00c6 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -228,7 +228,7 @@ if(anchored) to_chat(usr, "You cannot rotate [src], it has been firmly fixed to the floor.") else - set_dir(turn(dir, 90)) + setDir(turn(dir, 90)) /obj/machinery/suspension_gen/verb/rotate_cw() set src in view(1) @@ -238,7 +238,7 @@ if(anchored) to_chat(usr, "You cannot rotate [src], it has been firmly fixed to the floor.") else - set_dir(turn(dir, -90)) + setDir(turn(dir, -90)) /obj/effect/suspension_field name = "energy field" diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index 448ac528152..d419ffab85b 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -237,7 +237,7 @@ /obj/item/device/beacon_locator/process() if(target_radio) - set_dir(get_dir(src,target_radio)) + setDir(get_dir(src,target_radio)) switch(get_dist(src,target_radio)) if(0 to 3) icon_state = "pinondirect"