Skip to content

Tweak some wall offsets that were wrong #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NataKilar merged 1 commit into from
Mar 14, 2023
Merged

Tweak some wall offsets that were wrong #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/doors/airlock_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
base_type = /obj/machinery/airlock_sensor/buildable
construct_state = /decl/machine_construction/wall_frame/panel_closed/simple
frame_type = /obj/item/frame/button/airlock_controller_config/airlock_sensor
directional_offset = "{'NORTH':{'y':-20}, 'SOUTH':{'y':24}, 'EAST':{'x':-22}, 'WEST':{'x':22}}"
directional_offset = "{'NORTH':{'y':-18}, 'SOUTH':{'y':24}, 'EAST':{'x':-22}, 'WEST':{'x':22}}"
var/alert = FALSE
var/master_cycling = FALSE
var/pressure
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/turret_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
anchored = 1
density = 0
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
directional_offset = "{'NORTH':{'y':-32}, 'SOUTH':{'y':32}, 'EAST':{'x':32}, 'WEST':{'x':-32}}"
directional_offset = "{'NORTH':{'y':-32}, 'SOUTH':{'y':32}, 'EAST':{'x':-32}, 'WEST':{'x':32}}"
var/enabled = 0
var/lethal = 0
var/locked = 1
Expand Down
18 changes: 1 addition & 17 deletions code/modules/modular_computers/networking/machinery/wall_relay.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,8 @@
density = 0
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
base_type = /obj/machinery/network/relay/wall_mounted
directional_offset = "{'NORTH':{'y':-21}, 'SOUTH':{'y':21}, 'EAST':{'x':-21}, 'WEST':{'x':21}}"

/obj/machinery/network/relay/wall_mounted/Initialize()
. = ..()
queue_icon_update()

/obj/machinery/network/relay/wall_mounted/on_update_icon()
. = ..()
// Set pixel offsets
pixel_x = 0
pixel_y = 0
var/turf/T = get_step(get_turf(src), turn(dir, 180))
if(istype(T) && T.density)
if(dir == NORTH)
default_pixel_y = -21
else if(dir == SOUTH)
default_pixel_y = 21
else if(dir == WEST)
default_pixel_x = 21
else if(dir == EAST)
default_pixel_x = -21
reset_offsets(0)