Manual repair of some edge cases.

This commit is contained in:
Remie Richards
2016-06-11 23:11:54 +01:00
parent fda2c699fc
commit b3b60b187b
24 changed files with 47 additions and 48 deletions
+1 -1
View File
@@ -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)
dir = newdir
+1 -1
View File
@@ -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
+16 -16
View File
@@ -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"
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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(pid<DISP_END_BIN || pid>DISP_END_CHUTE)
icon_state = "con[icon_state]"
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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)
@@ -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
@@ -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
@@ -5,7 +5,7 @@
name = "oxygen generator"
desc = "Generates oxygen"
setDir(SOUTH)
dir = SOUTH
initialize_directions = SOUTH
var/on = 0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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)
dir = newdir
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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
@@ -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
@@ -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
+2 -3
View File
@@ -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()
+1 -1
View File
@@ -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
+1 -1
View File
@@ -3,7 +3,7 @@
id = "supply"
callTime = 600
setDir(8)
dir = WEST
travelDir = 90
width = 12
dwidth = 5