From b3b60b187bbf503f3d9e09e66b843b939f4b455d Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Sat, 11 Jun 2016 18:45:34 +0100 Subject: [PATCH] Manual repair of some edge cases. --- code/__HELPERS/icons.dm | 2 +- code/game/atoms.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 32 +++++++++---------- code/game/mecha/mech_bay.dm | 2 +- code/game/objects/items/weapons/RPD.dm | 4 +-- code/game/objects/structures/window.dm | 10 +++--- code/game/turfs/space/transit.dm | 4 +-- .../binary_devices/binary_devices.dm | 2 +- .../trinary_devices/trinary_devices.dm | 2 +- .../unary_devices/oxygen_generator.dm | 2 +- .../components/unary_devices/unary_devices.dm | 2 +- .../machinery/pipes/heat_exchange/junction.dm | 2 +- .../machinery/pipes/heat_exchange/manifold.dm | 2 +- .../machinery/pipes/heat_exchange/simple.dm | 2 +- .../atmospherics/machinery/pipes/manifold.dm | 2 +- .../atmospherics/machinery/pipes/simple.dm | 2 +- code/modules/client/client_procs.dm | 2 +- code/modules/mob/mob.dm | 2 +- code/modules/power/antimatter/shielding.dm | 2 +- .../particle_accelerator/particle_control.dm | 2 +- code/modules/recycling/disposal-structures.dm | 4 +-- code/modules/shuttle/emergency.dm | 5 ++- code/modules/shuttle/shuttle.dm | 2 +- code/modules/shuttle/supply.dm | 2 +- 24 files changed, 47 insertions(+), 48 deletions(-) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 323b45d6f0a..5c9e7367a67 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -985,4 +985,4 @@ var/global/list/humanoid_icon_cache = list() //Images have dir without being an atom, so they get their own definition. //Lame. /image/proc/setDir(newdir) - setDir(newdir) \ No newline at end of file + dir = newdir \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index a9c46ef64f1..6cf4fe21114 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -435,4 +435,4 @@ var/list/blood_splatter_icons = list() //Hook for running code when a dir change occurs /atom/proc/setDir(newdir) - setDir(newdir) + dir = newdir diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index f582cffbaa9..71c2d321c59 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -367,65 +367,65 @@ return 0 /obj/machinery/door/window/northleft - setDir(NORTH) + dir = NORTH /obj/machinery/door/window/eastleft - setDir(EAST) + dir = EAST /obj/machinery/door/window/westleft - setDir(WEST) + dir = WEST /obj/machinery/door/window/southleft - setDir(SOUTH) + dir = SOUTH /obj/machinery/door/window/northright - setDir(NORTH) + dir = NORTH icon_state = "right" base_state = "right" /obj/machinery/door/window/eastright - setDir(EAST) + dir = EAST icon_state = "right" base_state = "right" /obj/machinery/door/window/westright - setDir(WEST) + dir = WEST icon_state = "right" base_state = "right" /obj/machinery/door/window/southright - setDir(SOUTH) + dir = SOUTH icon_state = "right" base_state = "right" /obj/machinery/door/window/brigdoor/northleft - setDir(NORTH) + dir = NORTH /obj/machinery/door/window/brigdoor/eastleft - setDir(EAST) + dir = EAST /obj/machinery/door/window/brigdoor/westleft - setDir(WEST) + dir = WEST /obj/machinery/door/window/brigdoor/southleft - setDir(SOUTH) + dir = SOUTH /obj/machinery/door/window/brigdoor/northright - setDir(NORTH) + dir = NORTH icon_state = "rightsecure" base_state = "rightsecure" /obj/machinery/door/window/brigdoor/eastright - setDir(EAST) + dir = EAST icon_state = "rightsecure" base_state = "rightsecure" /obj/machinery/door/window/brigdoor/westright - setDir(WEST) + dir = WEST icon_state = "rightsecure" base_state = "rightsecure" /obj/machinery/door/window/brigdoor/southright - setDir(SOUTH) + dir = SOUTH icon_state = "rightsecure" base_state = "rightsecure" diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 6fb247edab9..19d9bc4cda0 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -14,7 +14,7 @@ name = "mech bay power port" density = 1 anchored = 1 - setDir(4) + dir = EAST icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_port" var/obj/mecha/recharging_mech diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 50fdd19a2d8..ab6c2cae1ec 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -32,7 +32,7 @@ RPD /datum/pipe_info/New(pid,direction,dt) src.id=pid src.icon_state=pipeID2State["[pid]"] - src.setDir(direction) + src.dir = direction src.dirtype=dt /datum/pipe_info/proc/Render(dispenser,label) @@ -70,7 +70,7 @@ var/global/list/disposalpipeID2State=list( /datum/pipe_info/disposal/New(var/pid,var/dt) src.id=pid src.icon_state=disposalpipeID2State[pid+1] - src.setDir(2) + src.dir = SOUTH src.dirtype=dt if(pidDISP_END_CHUTE) icon_state = "con[icon_state]" diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 3b080e00fb4..00efaf636cd 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -446,7 +446,7 @@ /obj/structure/window/fulltile icon = 'icons/obj/smooth_structures/window.dmi' icon_state = "window" - setDir(5) + dir = NORTHEAST maxhealth = 50 fulltile = 1 smooth = SMOOTH_TRUE @@ -455,7 +455,7 @@ /obj/structure/window/reinforced/fulltile icon = 'icons/obj/smooth_structures/reinforced_window.dmi' icon_state = "r_window" - setDir(5) + dir = NORTHEAST maxhealth = 100 fulltile = 1 smooth = SMOOTH_TRUE @@ -465,7 +465,7 @@ /obj/structure/window/reinforced/tinted/fulltile icon = 'icons/obj/smooth_structures/tinted_window.dmi' icon_state = "tinted_window" - setDir(5) + dir = NORTHEAST fulltile = 1 smooth = SMOOTH_TRUE canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile/) @@ -483,7 +483,7 @@ desc = "A reinforced, air-locked pod window." icon = 'icons/obj/smooth_structures/shuttle_window.dmi' icon_state = "shuttle_window" - setDir(5) + dir = NORTHEAST maxhealth = 100 wtype = "shuttle" fulltile = 1 @@ -538,5 +538,5 @@ smooth = SMOOTH_TRUE canSmoothWith = null fulltile = 1 - setDir(5) + dir = NORTHEAST maxhealth = 150 diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 191702c9b8c..13e75be6634 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -1,10 +1,10 @@ /turf/open/space/transit icon_state = "black" - setDir(SOUTH) + dir = SOUTH baseturf = /turf/open/space/transit /turf/open/space/transit/horizontal - setDir(WEST) + dir = WEST /turf/open/space/transit/Entered(atom/movable/AM, atom/OldLoc) if(!AM) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index ee213316cf0..e4858d432e6 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/components/binary icon = 'icons/obj/atmospherics/components/binary_devices.dmi' - setDir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 device_type = BINARY diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm index 84385c2b812..d2c37ec30e0 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/components/trinary icon = 'icons/obj/atmospherics/components/trinary_devices.dmi' - setDir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 device_type = TRINARY diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm index cdda524ac16..55215da0753 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm @@ -5,7 +5,7 @@ name = "oxygen generator" desc = "Generates oxygen" - setDir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/on = 0 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm index fc9111cb4e5..807980318e1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm @@ -1,6 +1,6 @@ /obj/machinery/atmospherics/components/unary icon = 'icons/obj/atmospherics/components/unary_devices.dmi' - setDir(SOUTH) + dir = SOUTH initialize_directions = SOUTH device_type = UNARY diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm index 60d9cbd4af9..0cba512ec63 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm @@ -8,7 +8,7 @@ minimum_temperature_difference = 300 thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT - setDir(SOUTH) + dir = SOUTH initialize_directions = NORTH initialize_directions_he = SOUTH diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm index 48165626c3a..b9e7780cbac 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm @@ -5,7 +5,7 @@ name = "pipe manifold" desc = "A manifold composed of regular pipes" - setDir(SOUTH) + dir = SOUTH initialize_directions_he = EAST|NORTH|WEST device_type = TRINARY diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm index 7d0425c15d3..9dcad6efa66 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm @@ -4,7 +4,7 @@ name = "pipe" desc = "A one meter section of heat-exchanging pipe" - setDir(SOUTH) + dir = SOUTH initialize_directions_he = SOUTH|NORTH device_type = BINARY diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index 2ca2652449e..bae84ae22ce 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -8,7 +8,7 @@ name = "pipe manifold" desc = "A manifold composed of regular pipes" - setDir(SOUTH) + dir = SOUTH initialize_directions = EAST|NORTH|WEST device_type = TRINARY diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm index c6b4b0978f0..03560c12bc6 100644 --- a/code/modules/atmospherics/machinery/pipes/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple.dm @@ -10,7 +10,7 @@ The regular pipe you see everywhere, including bent ones. name = "pipe" desc = "A one meter section of regular pipe" - setDir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH device_type = BINARY diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 871603469d5..a888c025b7e 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -368,4 +368,4 @@ var/next_external_rsc = 0 //Hook, override it to run code when dir changes //Like for /atoms, but clients are their own snowflake FUCK /client/proc/setDir(newdir) - setDir(newdir) \ No newline at end of file + dir = newdir \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 8e4095f078e..db9ea99dfc9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -765,7 +765,7 @@ var/next_mob_id = 0 //override to avoid rotating pixel_xy on mobs /mob/shuttleRotate(rotation) - setDir(angle2dir(rotation)+dir2angle(dir)) + setDir(angle2dir(rotation+dir2angle(dir))) //You can buckle on mobs if you're next to them since most are dense /mob/buckle_mob(mob/living/M, force = 0) diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 49ccecd2f97..abf6564be56 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -15,7 +15,7 @@ icon_state = "shield" anchored = 1 density = 1 - setDir(1) + dir = NORTH use_power = 0//Living things generally dont use power idle_power_usage = 0 active_power_usage = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 10d6c858192..cf7e27665fe 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -10,7 +10,7 @@ use_power = 0 idle_power_usage = 500 active_power_usage = 10000 - setDir(1) + dir = NORTH var/strength_upper_limit = 2 var/interface_control = 1 var/list/obj/structure/particle_accelerator/connected_parts diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index 02a79a3486e..5e116c89d7d 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -8,7 +8,7 @@ invisibility = INVISIBILITY_MAXIMUM var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point var/active = 0 // true if the holder is moving, otherwise inactive - setDir(0) + dir = 0 var/count = 1000 //*** can travel 1000 steps before going inactive (in case of loops) var/destinationTag = 0 // changes if contains a delivery container var/tomail = 0 //changes if contains wrapped package @@ -134,7 +134,7 @@ on_blueprints = TRUE level = 1 // underfloor only var/dpdir = 0 // bitmask of pipe directions - setDir(0 )// dir will contain dominant direction for junction pipes + dir = 0// dir will contain dominant direction for junction pipes var/health = 10 // health points 0-10 layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes var/base_icon_state // initial icon state on map diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index f4a790840da..ff9439ecfba 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -178,7 +178,7 @@ dwidth = 9 width = 22 height = 11 - setDir(4) + dir = EAST travelDir = -90 roundstart_move = "emergency_away" var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself @@ -446,8 +446,7 @@ dwidth = 2 width = 8 height = 8 - setDir(4) - + dir = EAST roundstart_move = "backup_away" /obj/docking_port/mobile/emergency/backup/New() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 253fdccfb26..aa539aa7e44 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -12,7 +12,7 @@ anchored = 1 var/id - setDir(NORTH )//this should point -away- from the dockingport door, ie towards the ship + dir = NORTH//this should point -away- from the dockingport door, ie towards the ship var/width = 0 //size of covered area, perpendicular to dir var/height = 0 //size of covered area, paralell to dir var/dwidth = 0 //position relative to covered area, perpendicular to dir diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 2e536e8b74f..0493e2138be 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -3,7 +3,7 @@ id = "supply" callTime = 600 - setDir(8) + dir = WEST travelDir = 90 width = 12 dwidth = 5