cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

64x64 Sprites (#11214)

Browse Source 
* Move DMI files over to 64x64

* Lighting overlay + world.icon_size.

* Change 32 to world icon size

* Adds pixel shift multiplier

* Fix accidentaly 16 -> world_icon_size/4 conversion to proper world_icon_size/2 conversion

* Fixes lighting properly

* Fix spacepods bounds

* Redo all icons with BYONDTools bug fixed

* Update ALL the map files dear god

* Double crayon font size

* Update all screen locs

* Fix contextual clicks

Couldn't use PIXEL MULTIPLIER here for the most part due to the fact most of these are ranges and doubling them would leave empty spaces

* Fixes maptext size and the final touch ups on antag screen locs

* Runs optipng on the DMI files in last commit.

Because my optipng version was outdated (blame the optipng package I had installed) it failed to run on the erge commit. This fixed that.

* Reduces parallax size a bit for 64x64 map sizes

* Fix lobby screens

* Fix DME
This commit is contained in:
clusterfack
2016-08-04 19:07:02 -05:00
committed by PJB3005
parent 66d143ca3d
commit 6edf0208ac
929 changed files with 12916 additions and 12907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/ATMOSPHERICS/atmospherics.dm
View File

@@ -124,8 +124,8 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/setPipingLayer(new_layer = PIPING_LAYER_DEFAULT)
piping_layer = new_layer
pixel_x = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
pixel_x = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
layer = initial(layer) + ((piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE)
// Find a connecting /obj/machinery/atmospherics in specified direction.

4
code/ATMOSPHERICS/hvac/spaceheater.dm
View File

@@ -334,8 +334,8 @@
light_range_on = 0
nocell = 2
density = 0
pixel_x = -16
pixel_y = 16
pixel_x = -WORLD_ICON_SIZE/2
pixel_y = WORLD_ICON_SIZE/2
/obj/machinery/space_heater/campfire/stove/fireplace/attackby(obj/item/I, mob/user)
var/shoesfound = 0

8
code/ATMOSPHERICS/pipe/construction.dm
View File

@@ -204,8 +204,8 @@ var/list/bent_dirs = list(NORTH|SOUTH, WEST|EAST)
/obj/item/pipe/proc/setPipingLayer(new_layer = PIPING_LAYER_DEFAULT)
piping_layer = new_layer
if(pipe_type != PIPE_LAYER_MANIFOLD && pipe_type != PIPE_LAYER_ADAPTER)
pixel_x = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
pixel_x = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
layer = initial(layer) + ((piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE)
//update the name and icon of the pipe item depending on the type
@@ -559,8 +559,8 @@ var/list/heat_pipes = list(PIPE_HE_STRAIGHT, PIPE_HE_BENT, PIPE_JUNCTION)
/obj/item/pipe_meter/proc/setAttachLayer(var/new_layer = PIPING_LAYER_DEFAULT)
layer_to_make = new_layer
src.pixel_x = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
src.pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
src.pixel_x = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
src.pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
/obj/item/pipe_gsensor
name = "gas sensor"

4
code/ATMOSPHERICS/pipe/pipe_planner.dm
View File

@@ -37,10 +37,10 @@
temp_dis = y_pos
temp_mod = PIPING_LAYER_P_Y
if(temp_dis - 16 == 0)
if(temp_dis - WORLD_ICON_SIZE/2 == 0)
return 0
found_id = Floor(abs(temp_dis - 16), abs(temp_mod)) / (temp_mod * sign(temp_dis - 16))
found_id = Floor(abs(temp_dis - WORLD_ICON_SIZE/2), abs(temp_mod)) / (temp_mod * sign(temp_dis - WORLD_ICON_SIZE/2))
return found_id

8
code/ATMOSPHERICS/pipes.dm
View File

@@ -1013,8 +1013,8 @@
var/layer_diff = pipelayer - PIPING_LAYER_DEFAULT
var/image/con = image(icon(src.icon,"manifoldl_con",src.dir))
con.pixel_x = layer_diff * PIPING_LAYER_P_X
con.pixel_y = layer_diff * PIPING_LAYER_P_Y
con.pixel_x = layer_diff * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
con.pixel_y = layer_diff * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
overlays += con
@@ -1197,8 +1197,8 @@
var/layer_diff = piping_layer - PIPING_LAYER_DEFAULT
var/image/con = image(icon(src.icon,"layer_con",turn(src.dir,180)))
con.pixel_x = layer_diff * PIPING_LAYER_P_X
con.pixel_y = layer_diff * PIPING_LAYER_P_Y
con.pixel_x = layer_diff * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
con.pixel_y = layer_diff * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
overlays += con
if(!mid_node && !layer_node)

BIN
code/TriDimension/multiz.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
code/TriDimension/multiz_pipe.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

12
code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm
View File

@@ -275,24 +275,24 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
size = 3
icon = 'icons/effects/96x96.dmi'
icon_state = "emfield_s3"
pixel_x = -32
pixel_y = -32
pixel_x = -32 * PIXEL_MULTIPLIER
pixel_y = -32 * PIXEL_MULTIPLIER
//
changed = 3
if(5)
size = 5
icon = 'icons/effects/160x160.dmi'
icon_state = "emfield_s5"
pixel_x = -64
pixel_y = -64
pixel_x = -64 * PIXEL_MULTIPLIER
pixel_y = -64 * PIXEL_MULTIPLIER
//
changed = 5
if(7)
size = 7
icon = 'icons/effects/224x224.dmi'
icon_state = "emfield_s7"
pixel_x = -96
pixel_y = -96
pixel_x = -96 * PIXEL_MULTIPLIER
pixel_y = -96 * PIXEL_MULTIPLIER
//
changed = 7

4
code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm
View File

@@ -35,8 +35,8 @@
icon_state = "port0"
//20% easier to read than apc code
pixel_x = (dir & 3)? 0 : (dir == 4 ? 32 : -32)
pixel_y = (dir & 3)? (dir ==1 ? 32 : -32) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE)
pixel_y = (dir & 3)? (dir ==1 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE) : 0
/obj/machinery/rust_fuel_assembly_port/attackby(obj/item/W, mob/user)

4
code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm
View File

@@ -36,8 +36,8 @@
icon_state = "fuel_compressor1"
//20% easier to read than apc code
pixel_x = (dir & 3)? 0 : (dir == 4 ? 32 : -32)
pixel_y = (dir & 3)? (dir ==1 ? 32 : -32) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE)
pixel_y = (dir & 3)? (dir ==1 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE) : 0
/obj/machinery/rust_fuel_compressor/attackby(obj/item/W, mob/user)

BIN
code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
code/WorkInProgress/Cael_Aislinn/Rust/rust_old.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 558 B

BIN
code/WorkInProgress/Cael_Aislinn/ShieldGen/shielding.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
code/WorkInProgress/Cael_Aislinn/Supermatter/Shard.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
code/WorkInProgress/Cael_Aislinn/covershield.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
code/WorkInProgress/Cael_Aislinn/meteor_turret.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
code/WorkInProgress/Cael_Aislinn/unknown.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 950 B

After

Width:  |  Height:  |  Size: 1.3 KiB

4
code/WorkInProgress/Chinsky/ashtray.dm
View File

@@ -11,8 +11,8 @@
/obj/item/ashtray/New()
..()
src.pixel_y = rand(-5, 5)
src.pixel_x = rand(-6, 6)
src.pixel_y = rand(-5, 5) * PIXEL_MULTIPLIER
src.pixel_x = rand(-6, 6) * PIXEL_MULTIPLIER
return
/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)

BIN
code/WorkInProgress/Susan/biocraps.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
code/WorkInProgress/Susan/desert.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

8
code/WorkInProgress/explosion_particles.dm
View File

@@ -43,8 +43,8 @@
opacity = 1
anchored = 1
mouse_opacity = 0
pixel_x = -32
pixel_y = -32
pixel_x = -WORLD_ICON_SIZE
pixel_y = -WORLD_ICON_SIZE
/obj/effect/explosion/New()
..()
@@ -76,8 +76,8 @@
opacity = 0
anchored = 1
mouse_opacity = 0
pixel_x = -32
pixel_y = -32
pixel_x = -WORLD_ICON_SIZE
pixel_y = -WORLD_ICON_SIZE
/obj/effect/small_explosion/New(turf/loc,var/ex_iconstate = "explosion_small", var/pX = 0, var/pY = 0)
..()

4
code/WorkInProgress/pomf/spacepods/spacepods.dm
View File

@@ -35,8 +35,8 @@
pod_overlays = new/list(2)
pod_overlays[DAMAGE] = image(icon, icon_state="pod_damage")
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
bound_width = 64
bound_height = 64
bound_width = 2*WORLD_ICON_SIZE
bound_height = 2*WORLD_ICON_SIZE
dir = EAST
battery = new /obj/item/weapon/cell/high()
add_cabin()

6
code/__HELPERS/icons.dm
View File

@@ -62,10 +62,10 @@ proc
letter = lowertext(letter)
var/image/text_image = new(loc = A)
text_image.maptext = "<font size = 4><b>[letter]</b></font>"
text_image.maptext = "<font size = 8><b>[letter]</b></font>"
text_image.color = AverageColor(atom_icon)
text_image.pixel_x = 6
text_image.pixel_y = 5
text_image.pixel_x = 6*PIXEL_MULTIPLIER
text_image.pixel_y = 5*PIXEL_MULTIPLIER
del(atom_icon)
return text_image

20
code/__HELPERS/unsorted.dm
View File

@@ -11,8 +11,8 @@
if(!start || !end) return 0
var/dy
var/dx
dy=(32*end.y+end.pixel_y)-(32*start.y+start.pixel_y)
dx=(32*end.x+end.pixel_x)-(32*start.x+start.pixel_x)
dy=(WORLD_ICON_SIZE*end.y+end.pixel_y)-(WORLD_ICON_SIZE*start.y+start.pixel_y)
dx=(WORLD_ICON_SIZE*end.x+end.pixel_x)-(WORLD_ICON_SIZE*start.x+start.pixel_x)
if(!dy)
return (dx>=0)?90:270
.=arctan(dx/dy)
@@ -701,7 +701,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
progbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = target, "icon_state" = "prog_bar_0")
progbar.plane = HUD_PLANE
progbar.layer = HUD_ABOVE_ITEM_LAYER
progbar.pixel_z = 32
progbar.pixel_z = WORLD_ICON_SIZE
//if(!barbar)
//barbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = user, "icon_state" = "none")
//barbar.pixel_y = 36
@@ -745,7 +745,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
if(user && user.client && user.client.prefs.progress_bars && target)
if(!progbar)
progbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = target, "icon_state" = "prog_bar_0")
progbar.pixel_z = 32
progbar.pixel_z = WORLD_ICON_SIZE
progbar.plane = HUD_PLANE
progbar.layer = HUD_ABOVE_ITEM_LAYER
progbar.appearance_flags = RESET_COLOR
@@ -757,7 +757,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
if(user && user.client && user.client.prefs.progress_bars && target)
if(!progbar)
progbar = image("icon" = 'icons/effects/doafter_icon.dmi', "loc" = target, "icon_state" = "prog_bar_0")
progbar.pixel_z = 32
progbar.pixel_z = WORLD_ICON_SIZE
progbar.plane = HUD_PLANE
progbar.layer = HUD_ABOVE_ITEM_LAYER
progbar.appearance_flags = RESET_COLOR
@@ -1205,16 +1205,16 @@ var/list/WALLITEMS = list(
//Some stuff doesn't use dir properly, so we need to check pixel instead
switch(dir)
if(SOUTH)
if(O.pixel_y > 10)
if(O.pixel_y > 10*PIXEL_MULTIPLIER)
return 1
if(NORTH)
if(O.pixel_y < -10)
if(O.pixel_y < -10*PIXEL_MULTIPLIER)
return 1
if(WEST)
if(O.pixel_x > 10)
if(O.pixel_x > 10*PIXEL_MULTIPLIER)
return 1
if(EAST)
if(O.pixel_x < -10)
if(O.pixel_x < -10*PIXEL_MULTIPLIER)
return 1
@@ -1222,7 +1222,7 @@ var/list/WALLITEMS = list(
for(var/obj/O in get_step(loc, dir))
for(var/item in WALLITEMS)
if(istype(O, text2path(item)))
if(abs(O.pixel_x) <= 10 && abs(O.pixel_y) <=10)
if(abs(O.pixel_x) <= 10*PIXEL_MULTIPLIER && abs(O.pixel_y) <=10*PIXEL_MULTIPLIER)
return 1
return 0

288
code/_onclick/hud/_defines.dm
View File

@@ -17,118 +17,118 @@
#define ui_entire_screen "WEST,SOUTH TO EAST,NORTH"
//Upper left action buttons, displayed when you pick up an item that has this enabled.
#define ui_action_slot1 "WEST:6,NORTH-1:26"
#define ui_action_slot2 "WEST+1:8,NORTH-1:26"
#define ui_action_slot3 "WEST+2:10,NORTH-1:26"
#define ui_action_slot4 "WEST+3:12,NORTH-1:26"
#define ui_action_slot5 "WEST+4:14,NORTH-1:26"
#define ui_action_slot1 "WEST:[6*PIXEL_MULTIPLIER],NORTH-1:[26*PIXEL_MULTIPLIER]"
#define ui_action_slot2 "WEST+1:[8*PIXEL_MULTIPLIER],NORTH-1:[26*PIXEL_MULTIPLIER]"
#define ui_action_slot3 "WEST+2:[10*PIXEL_MULTIPLIER],NORTH-1:[26*PIXEL_MULTIPLIER]"
#define ui_action_slot4 "WEST+3:[12*PIXEL_MULTIPLIER],NORTH-1:[26*PIXEL_MULTIPLIER]"
#define ui_action_slot5 "WEST+4:[14*PIXEL_MULTIPLIER],NORTH-1:[26*PIXEL_MULTIPLIER]"
//Lower left, persistant menu
#define ui_inventory "WEST:6,SOUTH:5"
#define ui_inventory "WEST:[6*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
//Lower center, persistant menu
#define ui_sstore1 "WEST+2:10,SOUTH:5"
#define ui_id "WEST+3:12,SOUTH:5"
#define ui_belt "WEST+4:14,SOUTH:5"
#define ui_back "CENTER-2:14,SOUTH:5"
#define ui_rhand "CENTER-1:16,SOUTH:5"
#define ui_lhand "CENTER:16,SOUTH:5"
#define ui_equip "CENTER-1:16,SOUTH+1:5"
#define ui_swaphand1 "CENTER-1:16,SOUTH+1:5"
#define ui_swaphand2 "CENTER:16,SOUTH+1:5"
#define ui_storage1 "CENTER+1:18,SOUTH:5"
#define ui_storage2 "CENTER+2:20,SOUTH:5"
#define ui_sstore1 "WEST+2:[10*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_id "WEST+3:[12*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_belt "WEST+4:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_back "CENTER-2:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_rhand "CENTER-1:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_lhand "CENTER:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_equip "CENTER-1:[16*PIXEL_MULTIPLIER],SOUTH+1:[5*PIXEL_MULTIPLIER]"
#define ui_swaphand1 "CENTER-1:[16*PIXEL_MULTIPLIER],SOUTH+1:[5*PIXEL_MULTIPLIER]"
#define ui_swaphand2 "CENTER:[16*PIXEL_MULTIPLIER],SOUTH+1:[5*PIXEL_MULTIPLIER]"
#define ui_storage1 "CENTER+1:[18*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_storage2 "CENTER+2:[20*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_alien_head "WEST+3:12,SOUTH:5" //aliens
#define ui_alien_oclothing "WEST+4:14,SOUTH:5" //aliens
#define ui_alien_head "WEST+3:[12*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //aliens
#define ui_alien_oclothing "WEST+4:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //aliens
#define ui_borg_sight "CENTER-3:16,SOUTH:5" //borgs
#define ui_inv1 "CENTER-2:16,SOUTH:5" //borgs
#define ui_inv2 "CENTER-1:16,SOUTH:5" //borgs
#define ui_inv3 "CENTER:16,SOUTH:5" //borgs
#define ui_borg_module "CENTER+1:16,SOUTH:5" //borgs
#define ui_borg_store "CENTER+2:16,SOUTH:5" //borgs
#define ui_mommi_store "CENTER+1:16,SOUTH:5"
#define ui_mommi_module "CENTER:16,SOUTH:5"
#define ui_mommi_sight "CENTER-2:16,SOUTH:5"
#define ui_mommi_hats "CENTER-3:16,SOUTH:5"
#define ui_borg_sight "CENTER-3:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_inv1 "CENTER-2:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_inv2 "CENTER-1:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_inv3 "CENTER:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_borg_module "CENTER+1:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_borg_store "CENTER+2:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //borgs
#define ui_mommi_store "CENTER+1:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_mommi_module "CENTER:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_mommi_sight "CENTER-2:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_mommi_hats "CENTER-3:[16*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_monkey_uniform "WEST+2:14,SOUTH:5"//monkey
#define ui_monkey_hat "WEST+3:14,SOUTH:5" //monkey
#define ui_monkey_glasses "WEST+1:14,SOUTH:5" //monkey
#define ui_monkey_mask "WEST+4:14,SOUTH:5" //monkey
#define ui_monkey_back "WEST+5:14,SOUTH:5" //monkey
#define ui_monkey_uniform "WEST+2:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"//monkey
#define ui_monkey_hat "WEST+3:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //monkey
#define ui_monkey_glasses "WEST+1:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //monkey
#define ui_monkey_mask "WEST+4:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //monkey
#define ui_monkey_back "WEST+5:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //monkey
//Lower right, persistant menu
#define ui_dropbutton "EAST-4:22,SOUTH:5"
#define ui_drop_throw "EAST-1:28,SOUTH+1:7"
#define ui_pull_resist "EAST-2:26,SOUTH+1:7"
#define ui_kick_bite "EAST-3:24,SOUTH+1:7"
#define ui_acti "EAST-2:26,SOUTH:5"
#define ui_movi "EAST-3:24,SOUTH:5"
#define ui_zonesel "EAST-1:28,SOUTH:5"
#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
#define ui_dropbutton "EAST-4:[22*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_drop_throw "EAST-1:[28*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_pull_resist "EAST-2:[26*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_kick_bite "EAST-3:[24*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_acti "EAST-2:[26*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_movi "EAST-3:[24*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_zonesel "EAST-1:56,SOUTH:10" //Used as compile time value, converted to 64p
#define ui_acti_alt "EAST-1:[28*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]" //alternative intent switcher for when the interface is hidden (F12)
#define ui_borg_pull "EAST-3:24,SOUTH+1:7"
//#define ui_borg_module "13:26,2:7"
#define ui_borg_panel "EAST-1:28,SOUTH+1:7"
#define ui_borg_pull "EAST-3:[24*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
//#define ui_borg_module "13:[26*PIXEL_MULTIPLIER],2:[7*PIXEL_MULTIPLIER]"
#define ui_borg_panel "EAST-1:[28*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
//Gun buttons
#define ui_gun1 "EAST-2:26,SOUTH+2:7"
#define ui_gun2 "EAST-1:28, SOUTH+3:7"
#define ui_gun3 "EAST-2:26,SOUTH+3:7"
#define ui_gun_select "EAST-1:28,SOUTH+2:7"
#define ui_gun1 "EAST-2:52,SOUTH+2:14" //Used as compile time value, converted to 64p
#define ui_gun2 "EAST-1:56, SOUTH+3:14" //Used as compile time value, converted to 64p
#define ui_gun3 "EAST-2:52,SOUTH+3:14" //Used as compile time value, converted to 64p
#define ui_gun_select "EAST-1:56,SOUTH+2:14" //Used as compile time value, converted to 64p
//Upper-middle right (damage indicators)
#define ui_toxin "EAST-1:28,NORTH-2:27"
#define ui_fire "EAST-1:28,NORTH-3:25"
#define ui_oxygen "EAST-1:28,NORTH-4:23"
#define ui_pressure "EAST-1:28,NORTH-5:21"
#define ui_toxin "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-2:[27*PIXEL_MULTIPLIER]"
#define ui_fire "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-3:[25*PIXEL_MULTIPLIER]"
#define ui_oxygen "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-4:[23*PIXEL_MULTIPLIER]"
#define ui_pressure "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-5:[21*PIXEL_MULTIPLIER]"
#define ui_alien_toxin "EAST-1:28,NORTH-2:25"
#define ui_alien_fire "EAST-1:28,NORTH-3:25"
#define ui_alien_oxygen "EAST-1:28,NORTH-4:25"
#define ui_alien_toxin "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-2:[25*PIXEL_MULTIPLIER]"
#define ui_alien_fire "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-3:[25*PIXEL_MULTIPLIER]"
#define ui_alien_oxygen "EAST-1:[28*PIXEL_MULTIPLIER],NORTH-4:[25*PIXEL_MULTIPLIER]"
//Middle right (status indicators)
#define ui_nutrition "EAST-1:28,CENTER-2:11"
#define ui_temp "EAST-1:28,CENTER-1:13"
#define ui_health "EAST-1:28,CENTER:15"
#define ui_internal "EAST-1:28,CENTER+1:17"
#define ui_nutrition "EAST-1:[28*PIXEL_MULTIPLIER],CENTER-2:[11*PIXEL_MULTIPLIER]"
#define ui_temp "EAST-1:[28*PIXEL_MULTIPLIER],CENTER-1:[13*PIXEL_MULTIPLIER]"
#define ui_health "EAST-1:[28*PIXEL_MULTIPLIER],CENTER:[15*PIXEL_MULTIPLIER]"
#define ui_internal "EAST-1:[28*PIXEL_MULTIPLIER],CENTER+1:[17*PIXEL_MULTIPLIER]"
//borgs
#define ui_borg_health "EAST-1:28,CENTER-1:13" //borgs have the health display where humans have the pressure damage indicator.
#define ui_alien_health "EAST-1:28,CENTER-1:13" //aliens have the health display where humans have the pressure damage indicator.
#define ui_borg_health "EAST-1:[28*PIXEL_MULTIPLIER],CENTER-1:[13*PIXEL_MULTIPLIER]" //borgs have the health display where humans have the pressure damage indicator.
#define ui_alien_health "EAST-1:[28*PIXEL_MULTIPLIER],CENTER-1:[13*PIXEL_MULTIPLIER]" //aliens have the health display where humans have the pressure damage indicator.
#define ui_construct_health "EAST:00,CENTER:15" //same height as humans, hugging the right border
#define ui_construct_purge "EAST:00,CENTER-1:15"
#define ui_construct_fire "EAST-1:16,CENTER+1:13" //above health, slightly to the left
#define ui_construct_pull "EAST-1:28,SOUTH+1:10" //above the zone_sel icon
#define ui_construct_health "EAST,CENTER:[15*PIXEL_MULTIPLIER]" //same height as humans, hugging the right border
#define ui_construct_purge "EAST,CENTER-1:[15*PIXEL_MULTIPLIER]"
#define ui_construct_fire "EAST-1:[16*PIXEL_MULTIPLIER],CENTER+1:[13*PIXEL_MULTIPLIER]" //above health, slightly to the left
#define ui_construct_pull "EAST-1:[28*PIXEL_MULTIPLIER],SOUTH+1:[10*PIXEL_MULTIPLIER]" //above the zone_sel icon
#define ui_spell_master "EAST-1:16,NORTH-1:16"
#define ui_genetic_master "EAST-1:16,NORTH-3:16"
#define ui_spell_master "EAST-1:32,NORTH-1:32" //Used as compile time value, converted to 64p
#define ui_genetic_master "EAST-1:32,NORTH-3:32" //Used as compile time value, converted to 64p
//Pop-up inventory
#define ui_shoes "WEST+1:8,SOUTH:5"
#define ui_shoes "WEST+1:[8*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_iclothing "WEST:6,SOUTH+1:7"
#define ui_oclothing "WEST+1:8,SOUTH+1:7"
#define ui_gloves "WEST+2:10,SOUTH+1:7"
#define ui_iclothing "WEST:[6*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_oclothing "WEST+1:[8*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_gloves "WEST+2:[10*PIXEL_MULTIPLIER],SOUTH+1:[7*PIXEL_MULTIPLIER]"
#define ui_glasses "WEST:6,SOUTH+2:9"
#define ui_mask "WEST+1:8,SOUTH+2:9"
#define ui_ears "WEST+2:10,SOUTH+2:9"
#define ui_glasses "WEST:[6*PIXEL_MULTIPLIER],SOUTH+2:[9*PIXEL_MULTIPLIER]"
#define ui_mask "WEST+1:[8*PIXEL_MULTIPLIER],SOUTH+2:[9*PIXEL_MULTIPLIER]"
#define ui_ears "WEST+2:[10*PIXEL_MULTIPLIER],SOUTH+2:[9*PIXEL_MULTIPLIER]"
#define ui_head "WEST+1:8,SOUTH+3:11"
#define ui_head "WEST+1:[8*PIXEL_MULTIPLIER],SOUTH+3:[11*PIXEL_MULTIPLIER]"
//Intent small buttons
#define ui_help_small "EAST+3:8,SOUTH:1"
#define ui_disarm_small "EAST+3:15,SOUTH:18"
#define ui_grab_small "EAST+3:32,SOUTH:18"
#define ui_harm_small "EAST+3:39,SOUTH:1"
#define ui_help_small "EAST+3:[8*PIXEL_MULTIPLIER],SOUTH:[1*PIXEL_MULTIPLIER]"
#define ui_disarm_small "EAST+3:15,SOUTH:[18*PIXEL_MULTIPLIER]"
#define ui_grab_small "EAST+3:[32*PIXEL_MULTIPLIER],SOUTH:[18*PIXEL_MULTIPLIER]"
#define ui_harm_small "EAST+3:[39*PIXEL_MULTIPLIER],SOUTH:[1*PIXEL_MULTIPLIER]"
//#define ui_swapbutton "6:-16,1:5" //Unused
//#define ui_headset "SOUTH,8"
#define ui_hand "CENTER-1:14,SOUTH:5"
#define ui_hand "CENTER-1:[14*PIXEL_MULTIPLIER],SOUTH:[5*PIXEL_MULTIPLIER]"
#define ui_hstore1 "CENTER-2,CENTER-2"
//#define ui_resist "EAST+1,SOUTH-1"
#define ui_sleep "EAST+1, NORTH-13"
@@ -140,70 +140,70 @@
// AI (Ported straight from /tg/)
#define ui_ai_core "SOUTH:6,WEST:16"
#define ui_ai_camera_list "SOUTH:6,WEST+1:16"
#define ui_ai_track_with_camera "SOUTH:6,WEST+2:16"
#define ui_ai_camera_light "SOUTH:6,WEST+3:16"
//#define ui_ai_crew_monitor "SOUTH:6,WEST+4:16"
#define ui_ai_crew_manifest "SOUTH:6,WEST+4:16"
#define ui_ai_alerts "SOUTH:6,WEST+5:16"
#define ui_ai_announcement "SOUTH:6,WEST+6:16"
#define ui_ai_shuttle "SOUTH:6,WEST+7:16"
#define ui_ai_state_laws "SOUTH:6,WEST+8:16"
#define ui_ai_pda_send "SOUTH:6,WEST+9:16"
#define ui_ai_pda_log "SOUTH:6,WEST+10:16"
#define ui_ai_take_picture "SOUTH:6,WEST+11:16"
#define ui_ai_view_images "SOUTH:6,WEST+12:16"
#define ui_ai_config_radio "SOUTH:6,WEST+13:16"
#define ui_ai_core "SOUTH:[6*PIXEL_MULTIPLIER],WEST:[16*PIXEL_MULTIPLIER]"
#define ui_ai_camera_list "SOUTH:[6*PIXEL_MULTIPLIER],WEST+1:[16*PIXEL_MULTIPLIER]"
#define ui_ai_track_with_camera "SOUTH:[6*PIXEL_MULTIPLIER],WEST+2:[16*PIXEL_MULTIPLIER]"
#define ui_ai_camera_light "SOUTH:[6*PIXEL_MULTIPLIER],WEST+3:[16*PIXEL_MULTIPLIER]"
//#define ui_ai_crew_monitor "SOUTH:[6*PIXEL_MULTIPLIER],WEST+4:16"
#define ui_ai_crew_manifest "SOUTH:[6*PIXEL_MULTIPLIER],WEST+4:[16*PIXEL_MULTIPLIER]"
#define ui_ai_alerts "SOUTH:[6*PIXEL_MULTIPLIER],WEST+5:[16*PIXEL_MULTIPLIER]"
#define ui_ai_announcement "SOUTH:[6*PIXEL_MULTIPLIER],WEST+6:[16*PIXEL_MULTIPLIER]"
#define ui_ai_shuttle "SOUTH:[6*PIXEL_MULTIPLIER],WEST+7:[16*PIXEL_MULTIPLIER]"
#define ui_ai_state_laws "SOUTH:[6*PIXEL_MULTIPLIER],WEST+8:[16*PIXEL_MULTIPLIER]"
#define ui_ai_pda_send "SOUTH:[6*PIXEL_MULTIPLIER],WEST+9:[16*PIXEL_MULTIPLIER]"
#define ui_ai_pda_log "SOUTH:[6*PIXEL_MULTIPLIER],WEST+10:[16*PIXEL_MULTIPLIER]"
#define ui_ai_take_picture "SOUTH:[6*PIXEL_MULTIPLIER],WEST+11:[16*PIXEL_MULTIPLIER]"
#define ui_ai_view_images "SOUTH:[6*PIXEL_MULTIPLIER],WEST+12:[16*PIXEL_MULTIPLIER]"
#define ui_ai_config_radio "SOUTH:[6*PIXEL_MULTIPLIER],WEST+13:[16*PIXEL_MULTIPLIER]"
//Adminbus HUD
#define ui_adminbus_bg "1:0,1:0"
#define ui_adminbus_delete "11:31,1:6"
#define ui_adminbus_delmobs "1:6,5:14"
#define ui_adminbus_spclowns "1:8,6:14"
#define ui_adminbus_spcarps "1:8,7:10"
#define ui_adminbus_spbears "1:8,8:6"
#define ui_adminbus_sptrees "1:8,9:2"
#define ui_adminbus_spspiders "1:8,9:30"
#define ui_adminbus_spalien "1:5,10:26"
#define ui_adminbus_loadsids "5:0,2:9"
#define ui_adminbus_loadsmone "5:0,3:5"
#define ui_adminbus_massrepair "6:3,2:9"
#define ui_adminbus_massrejuv "6:3,3:5"
#define ui_adminbus_hook "10:0,3:7"
#define ui_adminbus_juke "11:11,3:7"
#define ui_adminbus_tele "12:22,3:7"
#define ui_adminbus_bumpers_1 "9:21,2:14"
#define ui_adminbus_bumpers_2 "10:5,2:14"
#define ui_adminbus_bumpers_3 "10:21,2:14"
#define ui_adminbus_door_0 "11:11,2:14"
#define ui_adminbus_door_1 "11:27,2:14"
#define ui_adminbus_roadlights_0 "12:17,2:14"
#define ui_adminbus_roadlights_1 "13:1,2:14"
#define ui_adminbus_roadlights_2 "13:17,2:14"
#define ui_adminbus_free "13:9,14:20"
#define ui_adminbus_home "14:6,14:20"
#define ui_adminbus_antag "15:3,14:20"
#define ui_adminbus_dellasers "6:13,13:26"
#define ui_adminbus_givelasers "6:29,13:26"
#define ui_adminbus_delbombs "9:18,13:26"
#define ui_adminbus_givebombs "10:2,13:26"
#define ui_adminbus_tdred "1:18,13:26"
#define ui_adminbus_tdarena "2:4,13:26"
#define ui_adminbus_tdgreen "3:6,13:26"
#define ui_adminbus_tdobs "2:4,14:28"
#define ui_adminbus_bg "1,1"
#define ui_adminbus_delete "11:[31*PIXEL_MULTIPLIER],1:[6*PIXEL_MULTIPLIER]"
#define ui_adminbus_delmobs "1:[6*PIXEL_MULTIPLIER],5:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_spclowns "1:[8*PIXEL_MULTIPLIER],6:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_spcarps "1:[8*PIXEL_MULTIPLIER],7:[10*PIXEL_MULTIPLIER]"
#define ui_adminbus_spbears "1:[8*PIXEL_MULTIPLIER],8:[6*PIXEL_MULTIPLIER]"
#define ui_adminbus_sptrees "1:[8*PIXEL_MULTIPLIER],9:[2*PIXEL_MULTIPLIER]"
#define ui_adminbus_spspiders "1:[8*PIXEL_MULTIPLIER],9:[30*PIXEL_MULTIPLIER]"
#define ui_adminbus_spalien "1:[5*PIXEL_MULTIPLIER],10:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_loadsids "5,2:[9*PIXEL_MULTIPLIER]"
#define ui_adminbus_loadsmone "5,3:[5*PIXEL_MULTIPLIER]"
#define ui_adminbus_massrepair "6:[3*PIXEL_MULTIPLIER],2:[9*PIXEL_MULTIPLIER]"
#define ui_adminbus_massrejuv "6:[3*PIXEL_MULTIPLIER],3:[5*PIXEL_MULTIPLIER]"
#define ui_adminbus_hook "10,3:[7*PIXEL_MULTIPLIER]"
#define ui_adminbus_juke "11:[11*PIXEL_MULTIPLIER],3:[7*PIXEL_MULTIPLIER]"
#define ui_adminbus_tele "12:[22*PIXEL_MULTIPLIER],3:[7*PIXEL_MULTIPLIER]"
#define ui_adminbus_bumpers_1 "9:[21*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_bumpers_2 "10:[5*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_bumpers_3 "10:[21*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_door_0 "11:[11*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_door_1 "11:273*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_roadlights_0 "12:[17*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_roadlights_1 "13:[1*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_roadlights_2 "13:[17*PIXEL_MULTIPLIER],2:[14*PIXEL_MULTIPLIER]"
#define ui_adminbus_free "13:[9*PIXEL_MULTIPLIER],14:[20*PIXEL_MULTIPLIER]"
#define ui_adminbus_home "14:[6*PIXEL_MULTIPLIER],14:[20*PIXEL_MULTIPLIER]"
#define ui_adminbus_antag "15:[3*PIXEL_MULTIPLIER],14:[20*PIXEL_MULTIPLIER]"
#define ui_adminbus_dellasers "6:[13*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_givelasers "6:[29*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_delbombs "9:[18*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_givebombs "10:[2*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_tdred "1:[18*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_tdarena "2:[4*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_tdgreen "3:[6*PIXEL_MULTIPLIER],13:[26*PIXEL_MULTIPLIER]"
#define ui_adminbus_tdobs "2:[4*PIXEL_MULTIPLIER],14:[28*PIXEL_MULTIPLIER]"
//Blob HUD
#define ui_blob_bgLEFT "WEST:0,CENTER-7:0"
#define ui_blob_bgRIGHT "EAST-14:0,CENTER-7:0"
#define ui_blob_powerbar "WEST:0,CENTER-3:0"
#define ui_blob_healthbar "EAST:14,CENTER-3:0"
#define ui_blob_spawnblob "WEST:18,CENTER-3:5"
#define ui_blob_spawnstrong "WEST:18,CENTER-2:9"
#define ui_blob_spawnresource "WEST:18,CENTER-1:13"
#define ui_blob_spawnfactory "WEST:18,CENTER:17"
#define ui_blob_spawnnode "WEST:18,CENTER+1:21"
#define ui_blob_spawncore "WEST:18,CENTER+2:25"
#define ui_blob_ping "EAST-1:24,CENTER+3:21"
#define ui_blob_rally "EAST-1:24,CENTER+4:25"
#define ui_blob_taunt "EAST-1:24,CENTER+5:29"
#define ui_blob_bgLEFT "WEST,CENTER-7"
#define ui_blob_bgRIGHT "EAST-14,CENTER-7"
#define ui_blob_powerbar "WEST,CENTER-3"
#define ui_blob_healthbar "EAST:[14*PIXEL_MULTIPLIER],CENTER-3"
#define ui_blob_spawnblob "WEST:[18*PIXEL_MULTIPLIER],CENTER-3:[5*PIXEL_MULTIPLIER]"
#define ui_blob_spawnstrong "WEST:[18*PIXEL_MULTIPLIER],CENTER-2:[9*PIXEL_MULTIPLIER]"
#define ui_blob_spawnresource "WEST:[18*PIXEL_MULTIPLIER],CENTER-1:[13*PIXEL_MULTIPLIER]"
#define ui_blob_spawnfactory "WEST:[18*PIXEL_MULTIPLIER],CENTER:[17*PIXEL_MULTIPLIER]"
#define ui_blob_spawnnode "WEST:[18*PIXEL_MULTIPLIER],CENTER+1:[21*PIXEL_MULTIPLIER]"
#define ui_blob_spawncore "WEST:[18*PIXEL_MULTIPLIER],CENTER+2:[25*PIXEL_MULTIPLIER]"
#define ui_blob_ping "EAST-1:[24*PIXEL_MULTIPLIER],CENTER+3:[21*PIXEL_MULTIPLIER]"
#define ui_blob_rally "EAST-1:[24*PIXEL_MULTIPLIER],CENTER+4:[25*PIXEL_MULTIPLIER]"
#define ui_blob_taunt "EAST-1:[24*PIXEL_MULTIPLIER],CENTER+5:[29*PIXEL_MULTIPLIER]"

2
code/_onclick/hud/adminbus.dm
View File

@@ -252,7 +252,7 @@
var/obj/screen/adminbus/S = getFromPool(/obj/screen/adminbus)
S.icon = 'icons/adminbus/32x32.dmi'
S.icon_state = ""
S.screen_loc = "[12-round(i/2)]:[16*((i-1)%2)],14:16"
S.screen_loc = "[12-round(i/2)]:[WORLD_ICON_SIZE/2*((i-1)%2)],14:[WORLD_ICON_SIZE/2]"
mymob.gui_icons.rearviews[i] = S
for(var/i=1;i<=16;i++)

2
code/_onclick/hud/alien.dm
View File

@@ -197,4 +197,4 @@
vampire_blood_display = getFromPool(/obj/screen)
vampire_blood_display.name = "Alien Plasma"
vampire_blood_display.icon_state = "dark128"
vampire_blood_display.screen_loc = "14:28,9:15"
vampire_blood_display.screen_loc = "14:[28*PIXEL_MULTIPLIER],9:[15*PIXEL_MULTIPLIER]"

8
code/_onclick/hud/blob.dm
View File

@@ -23,7 +23,7 @@
mymob.gui_icons.blob_coverLEFT.layer = HUD_ABOVE_ITEM_LAYER
mymob.gui_icons.blob_coverLEFT.screen_loc = ui_blob_bgLEFT
mymob.gui_icons.blob_coverLEFT.maptext_x = 1
mymob.gui_icons.blob_coverLEFT.maptext_y = 126
mymob.gui_icons.blob_coverLEFT.maptext_y = 126*PIXEL_MULTIPLIER
mymob.gui_icons.blob_coverRIGHT = getFromPool(/obj/screen/specialblob)
mymob.gui_icons.blob_coverRIGHT.icon = 'icons/mob/screen1_blob_fullscreen.dmi'
@@ -31,8 +31,8 @@
mymob.gui_icons.blob_coverRIGHT.name = "Health"
mymob.gui_icons.blob_coverRIGHT.layer = HUD_ABOVE_ITEM_LAYER
mymob.gui_icons.blob_coverRIGHT.screen_loc = ui_blob_bgRIGHT
mymob.gui_icons.blob_coverRIGHT.maptext_x = 464
mymob.gui_icons.blob_coverRIGHT.maptext_y = 126
mymob.gui_icons.blob_coverRIGHT.maptext_x = 464*PIXEL_MULTIPLIER
mymob.gui_icons.blob_coverRIGHT.maptext_y = 126*PIXEL_MULTIPLIER
mymob.gui_icons.blob_powerbar = getFromPool(/obj/screen/specialblob)
mymob.gui_icons.blob_powerbar.icon = 'icons/mob/screen1_blob_bars.dmi'
@@ -134,7 +134,7 @@
S.icon = 'icons/mob/screen1_blob.dmi'
S.icon_state = ""
var/total_offset = -16 + (i * 20)
S.screen_loc = "[1 + round(total_offset/32)]:[total_offset%32],NORTH:0"
S.screen_loc = "[1 + round(total_offset/WORLD_ICON_SIZE)]:[total_offset%WORLD_ICON_SIZE],NORTH"
mymob.gui_icons.specialblobs[i] = S
for(var/i=1;i<=24;i++)

8
code/_onclick/hud/hud.dm
View File

@@ -292,7 +292,7 @@ var/global/obj/screen/clicker/catcher = new()
R.closer.master = R
R.closer.transform *= 0.8
var/display_rows = round((override.len) / 8) +1 //+1 because round() returns floor of number
L.schematics_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
L.schematics_background.screen_loc = "CENTER-4:[WORLD_ICON_SIZE/2],SOUTH+1:[7*PIXEL_MULTIPLIER] to CENTER+3:[WORLD_ICON_SIZE/2],SOUTH+[display_rows]:[7*PIXEL_MULTIPLIER]"
L.client.screen += L.schematics_background
var/x = -4 //Start at CENTER-4,SOUTH+1
@@ -310,16 +310,16 @@ var/global/obj/screen/clicker/catcher = new()
//Module is not currently active
L.client.screen += A
if(x < 0)
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
A.screen_loc = "CENTER[x]:[WORLD_ICON_SIZE/2],SOUTH+[y]:[7*PIXEL_MULTIPLIER]"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
A.screen_loc = "CENTER+[x]:[WORLD_ICON_SIZE/2],SOUTH+[y]:[7*PIXEL_MULTIPLIER]"
A.layer = HUD_ITEM_LAYER
x++
if(x == 4)
x = -4
y++
R.closer.screen_loc = "CENTER[x < 0 ? "" : "+"][x]:16,SOUTH+[y]:7"
R.closer.screen_loc = "CENTER[x < 0 ? "" : "+"][x]:[WORLD_ICON_SIZE/2],SOUTH+[y]:[7*PIXEL_MULTIPLIER]"
L.client.screen += R.closer
else

14
code/_onclick/hud/movable_screen_objects.dm
View File

@@ -39,9 +39,9 @@
if(snap2grid) //Discard Pixel Values
screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
else //Normalise Pixel Values (So the object drops at the center of the mouse, not 16 pixels off)
var/pix_X = text2num(screen_loc_X[2]) - 16
var/pix_Y = text2num(screen_loc_Y[2]) - 16
else //Normalise Pixel Values (So the object drops at the center of the mouse, not WORLD_ICON_SIZE/2 pixels off)
var/pix_X = text2num(screen_loc_X[2]) - WORLD_ICON_SIZE/2
var/pix_Y = text2num(screen_loc_Y[2]) - WORLD_ICON_SIZE/2
screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
/obj/screen/movable/proc/get_view_size()
@@ -115,8 +115,8 @@
var/obj/screen/movable/M = new()
M.name = "Movable UI Object"
M.icon_state = "block"
M.maptext = "Movable"
M.maptext_width = 64
M.maptext = "<font size = 4>Movable"
M.maptext_width = WORLD_ICON_SIZE*2
var/screen_l = input(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Movable UI Object") as text
if(!screen_l)
@@ -134,8 +134,8 @@
var/obj/screen/movable/snap/S = new()
S.name = "Snap UI Object"
S.icon_state = "block"
S.maptext = "Snap"
S.maptext_width = 64
S.maptext = "<font size = 4>Snap"
S.maptext_width = WORLD_ICON_SIZE*2
var/screen_l = input(usr,"Where on the screen? (Formatted as 'X,Y' e.g: '1,1' for bottom left)","Spawn Snap UI Object") as text
if(!screen_l)

4
code/_onclick/hud/other_mobs.dm
View File

@@ -171,7 +171,7 @@
vampire_blood_display = getFromPool(/obj/screen)
vampire_blood_display.name = "Vampire Blood"
vampire_blood_display.icon_state = "dark128"
vampire_blood_display.screen_loc = "EAST-1:28,CENTER+2:15"
vampire_blood_display.screen_loc = "EAST-1:[28*PIXEL_MULTIPLIER],CENTER+2:[15*PIXEL_MULTIPLIER]"
mymob.client.screen += list(vampire_blood_display)
@@ -179,6 +179,6 @@
vampire_blood_display = getFromPool(/obj/screen)
vampire_blood_display.name = "Changeling Chems"
vampire_blood_display.icon_state = "dark128"
vampire_blood_display.screen_loc = "EAST-1:28,CENTER+2:15"
vampire_blood_display.screen_loc = "EAST-1:[28*PIXEL_MULTIPLIER],CENTER+2:[15*PIXEL_MULTIPLIER]"
mymob.client.screen += list(vampire_blood_display)

56
code/_onclick/hud/parallax.dm
View File

@@ -1,8 +1,9 @@
/*
* This file handles all parallax-related business once the parallax itself is initialized with the rest of the HUD
*/
#define PARALLAX_IMAGE_WIDTH 15
#define PARALLAX_IMAGE_WIDTH 8
#define PARALLAX_IMAGE_TILES (PARALLAX_IMAGE_WIDTH**2)
#define GRID_WIDTH 3
var/list/parallax_on_clients = list()
@@ -133,22 +134,19 @@ var/list/parallax_on_clients = list()
C.previous_turf = posobj
var/maxoffset = 480 //480 = (15 tiles * 32 icon_size * 3 grid size / 2) - (15 tiles * 32 icon size / 2) for centering
var/minoffset = -960 //960 = (15 tiles * 32 icon_size * 3 grid size / 2) + (15 tiles * 32 icon size / 2) for centering
for(var/obj/screen/parallax/bgobj in C.parallax_movable)
var/accumulated_offset_x = bgobj.base_offset_x - round(offsetx * bgobj.parallax_speed * C.prefs.parallax_speed)
var/accumulated_offset_y = bgobj.base_offset_y - round(offsety * bgobj.parallax_speed * C.prefs.parallax_speed)
if(accumulated_offset_x > maxoffset)
accumulated_offset_x -= 1440 //3x3 grid, 15 tiles * 32 icon_size * 3 grid size
if(accumulated_offset_x < minoffset)
accumulated_offset_x += 1440
if(accumulated_offset_x > PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE)
accumulated_offset_x -= PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*GRID_WIDTH //3x3 grid, 15 tiles * 64 icon_size * 3 grid size
if(accumulated_offset_x < -(PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*2))
accumulated_offset_x += PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*GRID_WIDTH
if(accumulated_offset_y > maxoffset)
accumulated_offset_y -= 1440
if(accumulated_offset_y < minoffset)
accumulated_offset_y += 1440
if(accumulated_offset_y > PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE)
accumulated_offset_y -= PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*GRID_WIDTH
if(accumulated_offset_y < -(PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*2))
accumulated_offset_y += PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE*GRID_WIDTH
bgobj.screen_loc = "CENTER:[accumulated_offset_x],CENTER:[accumulated_offset_y]"
@@ -166,14 +164,14 @@ var/list/parallax_on_clients = list()
var/list/pixel_y = list()
var/index = 1
for(var/i = 0 to (PARALLAX_IMAGE_TILES-1))
for(var/j = 1 to 9)
for(var/j = 1 to GRID_WIDTH**2)
plane1 += rand(1,26)
plane2 += rand(1,26)
plane3 += rand(1,26)
pixel_x += world.icon_size * (i%PARALLAX_IMAGE_WIDTH)
pixel_y += world.icon_size * round(i/PARALLAX_IMAGE_WIDTH)
pixel_x += WORLD_ICON_SIZE * (i%PARALLAX_IMAGE_WIDTH)
pixel_y += WORLD_ICON_SIZE * round(i/PARALLAX_IMAGE_WIDTH)
for(var/i in 0 to 8)
for(var/i in 0 to ((GRID_WIDTH**2)-1))
var/obj/screen/parallax/parallax_layer = getFromPool(/obj/screen/parallax)
var/list/L = list()
@@ -190,7 +188,7 @@ var/list/parallax_on_clients = list()
parallax_icon[index] = parallax_layer
index++
for(var/i in 0 to 8)
for(var/i in 0 to ((GRID_WIDTH**2)-1))
var/obj/screen/parallax/parallax_layer = getFromPool(/obj/screen/parallax)
var/list/L = list()
@@ -207,7 +205,7 @@ var/list/parallax_on_clients = list()
parallax_icon[index] = parallax_layer
index++
for(var/i in 0 to 8)
for(var/i in 0 to ((GRID_WIDTH**2)-1))
var/obj/screen/parallax/parallax_layer = getFromPool(/obj/screen/parallax)
var/list/L = list()
for(var/j in 1 to PARALLAX_IMAGE_TILES)
@@ -233,19 +231,21 @@ var/list/parallax_on_clients = list()
4 5 6
7 8 9
*/
base_offset_x = -PARALLAX_IMAGE_WIDTH*world.icon_size/2
base_offset_y = -PARALLAX_IMAGE_WIDTH*world.icon_size/2
base_offset_x = -PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE/2
base_offset_y = -PARALLAX_IMAGE_WIDTH*WORLD_ICON_SIZE/2
//TODO: switch to grid size defines... somehow
switch(i)
if(1,4,7)
base_offset_x -= world.icon_size*PARALLAX_IMAGE_WIDTH
if(3,6,9)
base_offset_x += world.icon_size*PARALLAX_IMAGE_WIDTH
if(1,4,7) //1 mod grid_size
base_offset_x -= WORLD_ICON_SIZE*PARALLAX_IMAGE_WIDTH
if(3,6,9) //0 mod grid_size
base_offset_x += WORLD_ICON_SIZE*PARALLAX_IMAGE_WIDTH
switch(i)
if(1,2,3)
base_offset_y += world.icon_size*PARALLAX_IMAGE_WIDTH
if(7,8,9)
base_offset_y -= world.icon_size*PARALLAX_IMAGE_WIDTH
if(1,2,3) //round(i/grid_size) = 0
base_offset_y += WORLD_ICON_SIZE*PARALLAX_IMAGE_WIDTH
if(7,8,9) //round(i/grid_size) = 2
base_offset_y -= WORLD_ICON_SIZE*PARALLAX_IMAGE_WIDTH
screen_loc = "CENTER:[base_offset_x],CENTER:[base_offset_y]"

6
code/_onclick/hud/robot.dm
View File

@@ -196,7 +196,7 @@
return
var/display_rows = round((r.module.modules.len) / 8) +1 //+1 because round() returns floor of number
r.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
r.robot_modules_background.screen_loc = "CENTER-4:[WORLD_ICON_SIZE/2],SOUTH+1:[7*PIXEL_MULTIPLIER] to CENTER+3:[WORLD_ICON_SIZE/2],SOUTH+[display_rows]:[7*PIXEL_MULTIPLIER]"
r.client.screen += r.robot_modules_background
var/x = -4 //Start at CENTER-4,SOUTH+1
@@ -207,9 +207,9 @@
//Module is not currently active
r.client.screen += A
if(x < 0)
A.screen_loc = "CENTER[x]:16,SOUTH+[y]:7"
A.screen_loc = "CENTER[x]:[WORLD_ICON_SIZE/2],SOUTH+[y]:[7*PIXEL_MULTIPLIER]"
else
A.screen_loc = "CENTER+[x]:16,SOUTH+[y]:7"
A.screen_loc = "CENTER+[x]:[WORLD_ICON_SIZE/2],SOUTH+[y]:[7*PIXEL_MULTIPLIER]"
A.layer = HUD_ITEM_LAYER
A.plane = HUD_PLANE

44
code/_onclick/hud/screen_objects.dm
View File

@@ -192,54 +192,54 @@
var/old_selecting = selecting //We're only going to update_icon() if there's been a change
switch(icon_y)
if(1 to 3) //Feet
if(1 to 6) //Feet
switch(icon_x)
if(10 to 15)
if(20 to 30)
selecting = LIMB_RIGHT_FOOT
if(17 to 22)
if(34 to 44)
selecting = LIMB_LEFT_FOOT
else
return 1
if(4 to 9) //Legs
if(7 to 18) //Legs
switch(icon_x)
if(10 to 15)
if(20 to 31)
selecting = LIMB_RIGHT_LEG
if(17 to 22)
if(32 to 44)
selecting = LIMB_LEFT_LEG
else
return 1
if(10 to 13) //Hands and groin
if(19 to 26) //Hands and groin
switch(icon_x)
if(8 to 11)
if(16 to 22)
selecting = LIMB_RIGHT_HAND
if(12 to 20)
if(23 to 40)
selecting = LIMB_GROIN
if(21 to 24)
if(41 to 48)
selecting = LIMB_LEFT_HAND
else
return 1
if(14 to 22) //Chest and arms to shoulders
if(27 to 44) //Chest and arms to shoulders
switch(icon_x)
if(8 to 11)
if(16 to 22)
selecting = LIMB_RIGHT_ARM
if(12 to 20)
if(23 to 40)
selecting = LIMB_CHEST
if(21 to 24)
if(41 to 48)
selecting = LIMB_LEFT_ARM
else
return 1
if(23 to 30) //Head, but we need to check for eye or mouth
if(icon_x in 12 to 20)
if(45 to 60) //Head, but we need to check for eye or mouth
if(icon_x in 24 to 40)
selecting = LIMB_HEAD
switch(icon_y)
if(23 to 24)
if(icon_x in 15 to 17)
if(46 to 48)
if(icon_x in 30 to 34)
selecting = "mouth"
if(26) //Eyeline, eyes are on 15 and 17
if(icon_x in 14 to 18)
if(52) //Eyeline, eyes are on 15 and 17
if(icon_x in 28 to 36)
selecting = "eyes"
if(25 to 27)
if(icon_x in 15 to 17)
if(50 to 54)
if(icon_x in 30 to 34)
selecting = "eyes"
if(old_selecting != selecting)

8
code/controllers/shuttle_controller.dm
View File

@@ -308,8 +308,8 @@ datum/shuttle_controller/emergency_shuttle/process()
for(var/client/C in clients)
spawn
vote.interface.sendAssets(C)
return 1
else
@@ -330,8 +330,8 @@ datum/shuttle_controller/emergency_shuttle/process()
/obj/effect/bgstar/New()
. = ..()
pixel_x += rand(-2, 30)
pixel_y += rand(-2, 30)
pixel_x += rand(-2, 30) * PIXEL_MULTIPLIER
pixel_y += rand(-2, 30) * PIXEL_MULTIPLIER
icon_state = "star" + pick("1", "1", "1", "2", "3", "4")
speed = rand(2, 5)

10
code/datums/locking_category.dm
View File

@@ -27,8 +27,8 @@
if (flags & DENSE_WHEN_LOCKING || AM.lockflags & DENSE_WHEN_LOCKED)
owner.density = TRUE
AM.pixel_x += pixel_x_offset
AM.pixel_y += pixel_y_offset
AM.pixel_x += pixel_x_offset * PIXEL_MULTIPLIER
AM.pixel_y += pixel_y_offset * PIXEL_MULTIPLIER
update_lock(AM)
AM.change_dir(owner.dir, owner)
@@ -47,7 +47,7 @@
//Default position is NORTH - 0 degrees
//EAST means it's rotated 90 degrees clockwise
//SOUTH means it's rotated 180 degrees, and so on
switch (owner.dir)
if (NORTH) //up
new_x = x_offset
@@ -98,8 +98,8 @@
var/mob/M = AM
M.update_canmove()
AM.pixel_x -= pixel_x_offset
AM.pixel_y -= pixel_y_offset
AM.pixel_x -= pixel_x_offset * PIXEL_MULTIPLIER
AM.pixel_y -= pixel_y_offset * PIXEL_MULTIPLIER
/datum/locking_category/New(var/atom/new_owner)
locked = list()

2
code/datums/shuttle.dm
View File

@@ -652,7 +652,7 @@
if(!AM.can_shuttle_move(src))
continue
if(AM.bound_width > world.icon_size || AM.bound_height > world.icon_size) //If the moved object's bounding box is more than the default, move it after everything else (using spawn())
if(AM.bound_width > WORLD_ICON_SIZE || AM.bound_height > WORLD_ICON_SIZE) //If the moved object's bounding box is more than the default, move it after everything else (using spawn())
AM.loc = null //Without this, ALL neighbouring turfs attempt to move this object too, resulting in the object getting shifted to north/east
spawn()

6
code/defines/obj/weapon.dm
View File

@@ -661,13 +661,13 @@
if(wielded)
to_chat(user, "<span class='notice'>You hold \the [src] between your legs.</span>")
user.say("QUID 'ITCH")
animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING)
animate(user, pixel_y = pixel_y + 10 * PIXEL_MULTIPLIER , time = 10, loop = 1, easing = SINE_EASING)
else
animate(user, pixel_y = pixel_y + 10 , time = 1, loop = 1)
animate(user, pixel_y = pixel_y + 10 * PIXEL_MULTIPLIER , time = 1, loop = 1)
animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING)
animate(user)
if(user.lying)//aka. if they have just been stunned
user.pixel_y -= 6
user.pixel_y -= 6 * PIXEL_MULTIPLIER
else
if(wielded)
to_chat(user, "<span class='notice'>You hold \the [src] between your legs.</span>")

46
code/game/atoms.dm
View File

@@ -79,12 +79,12 @@ var/global/list/ghdel_profiling = list()
switch(xy)
if(1)
src.pixel_x += rand(-intensity, intensity)
src.pixel_x += rand(-intensity, intensity) * PIXEL_MULTIPLIER
if(2)
src.pixel_y += rand(-intensity, intensity)
src.pixel_y += rand(-intensity, intensity) * PIXEL_MULTIPLIER
if(3)
src.pixel_x += rand(-intensity, intensity)
src.pixel_y += rand(-intensity, intensity)
src.pixel_x += rand(-intensity, intensity) * PIXEL_MULTIPLIER
src.pixel_y += rand(-intensity, intensity) * PIXEL_MULTIPLIER
spawn(2)
src.pixel_x = old_pixel_x
@@ -320,39 +320,39 @@ its easier to just keep the beam vertical.
var/Angle=round(Get_Angle(src,BeamTarget))
var/icon/I=new(icon,icon_state)
I.Turn(Angle)
var/DX=(32*BeamTarget.x+BeamTarget.pixel_x)-(32*x+pixel_x)
var/DY=(32*BeamTarget.y+BeamTarget.pixel_y)-(32*y+pixel_y)
var/DX=(WORLD_ICON_SIZE*BeamTarget.x+BeamTarget.pixel_x)-(WORLD_ICON_SIZE*x+pixel_x)
var/DY=(WORLD_ICON_SIZE*BeamTarget.y+BeamTarget.pixel_y)-(WORLD_ICON_SIZE*y+pixel_y)
var/N=0
var/length=round(sqrt((DX)**2+(DY)**2))
for(N,N<length,N+=32)
for(N,N<length,N+=WORLD_ICON_SIZE)
var/obj/effect/overlay/beam/X=getFromPool(/obj/effect/overlay/beam,loc)
X.BeamSource=src
if(N+32>length)
if(N+WORLD_ICON_SIZE>length)
var/icon/II=new(icon,icon_state)
II.DrawBox(null,1,(length-N),32,32)
II.DrawBox(null,1,(length-N),WORLD_ICON_SIZE,WORLD_ICON_SIZE)
II.Turn(Angle)
X.icon=II
else X.icon=I
var/Pixel_x=round(sin(Angle)+32*sin(Angle)*(N+16)/32)
var/Pixel_y=round(cos(Angle)+32*cos(Angle)*(N+16)/32)
var/Pixel_x=round(sin(Angle)+WORLD_ICON_SIZE*sin(Angle)*(N+WORLD_ICON_SIZE/2)/WORLD_ICON_SIZE)
var/Pixel_y=round(cos(Angle)+WORLD_ICON_SIZE*cos(Angle)*(N+WORLD_ICON_SIZE/2)/WORLD_ICON_SIZE)
if(DX==0) Pixel_x=0
if(DY==0) Pixel_y=0
if(Pixel_x>32)
for(var/a=0, a<=Pixel_x,a+=32)
if(Pixel_x>WORLD_ICON_SIZE)
for(var/a=0, a<=Pixel_x,a+=WORLD_ICON_SIZE)
X.x++
Pixel_x-=32
if(Pixel_x<-32)
for(var/a=0, a>=Pixel_x,a-=32)
Pixel_x-=WORLD_ICON_SIZE
if(Pixel_x<-WORLD_ICON_SIZE)
for(var/a=0, a>=Pixel_x,a-=WORLD_ICON_SIZE)
X.x--
Pixel_x+=32
if(Pixel_y>32)
for(var/a=0, a<=Pixel_y,a+=32)
Pixel_x+=WORLD_ICON_SIZE
if(Pixel_y>WORLD_ICON_SIZE)
for(var/a=0, a<=Pixel_y,a+=WORLD_ICON_SIZE)
X.y++
Pixel_y-=32
if(Pixel_y<-32)
for(var/a=0, a>=Pixel_y,a-=32)
Pixel_y-=WORLD_ICON_SIZE
if(Pixel_y<-WORLD_ICON_SIZE)
for(var/a=0, a>=Pixel_y,a-=WORLD_ICON_SIZE)
X.y--
Pixel_y+=32
Pixel_y+=WORLD_ICON_SIZE
X.pixel_x=Pixel_x
X.pixel_y=Pixel_y
var/turf/TT = get_turf(X.loc)

4
code/game/atoms_movable.dm
View File

@@ -138,9 +138,9 @@
can_pull_tether = 1
else
return 0
glide_size = Ceiling(32 / move_delay * world.tick_lag) - 1 //We always split up movements into cardinals for issues with diagonal movements.
glide_size = Ceiling(WORLD_ICON_SIZE / move_delay * world.tick_lag) - 1 //We always split up movements into cardinals for issues with diagonal movements.
var/atom/oldloc = loc
if((bound_height != 32 || bound_width != 32) && (loc == newLoc))
if((bound_height != WORLD_ICON_SIZE || bound_width != WORLD_ICON_SIZE) && (loc == newLoc))
. = ..()
update_dir()

8
code/game/dna/genes/goon_powers.dm
View File

@@ -473,8 +473,8 @@
for(var/i=0, i<duration, i++)
step(target, target.dir)
if(i < 5) target.pixel_y += 8
else target.pixel_y -= 8
if(i < 5) target.pixel_y += 8 * PIXEL_MULTIPLIER
else target.pixel_y -= 8 * PIXEL_MULTIPLIER
sleep(1)
target.pixel_y = 0
@@ -496,8 +496,8 @@
var/wiggle = 6
while(wiggle > 0)
wiggle--
container.pixel_x = rand(-3,3)
container.pixel_y = rand(-3,3)
container.pixel_x = rand(-3,3) * PIXEL_MULTIPLIER
container.pixel_y = rand(-3,3) * PIXEL_MULTIPLIER
sleep(1)
container.pixel_x = 0
container.pixel_y = 0

14
code/game/gamemodes/blob/overmind.dm
View File

@@ -78,10 +78,10 @@
if(blob_core && hud_used)
var/matrix/M = matrix()
M.Scale(1,blob_core.health/blob_core.maxhealth)
var/total_offset = 60 + (100*(blob_core.health/blob_core.maxhealth))
var/total_offset = (60 + (100*(blob_core.health/blob_core.maxhealth))) * PIXEL_MULTIPLIER
hud_used.mymob.gui_icons.blob_healthbar.transform = M
hud_used.mymob.gui_icons.blob_healthbar.screen_loc = "EAST:14,CENTER-[8-round(total_offset/32)]:[total_offset%32]"
hud_used.mymob.gui_icons.blob_coverRIGHT.maptext = "[blob_core.health]"
hud_used.mymob.gui_icons.blob_healthbar.screen_loc = "EAST:[14*PIXEL_MULTIPLIER],CENTER-[8-round(total_offset/WORLD_ICON_SIZE)]:[total_offset%WORLD_ICON_SIZE]"
hud_used.mymob.gui_icons.blob_coverRIGHT.maptext = "<font size = 4>[blob_core.health]"
var/severity = 0
switch(round(blob_core.health))
@@ -117,11 +117,11 @@
if(hud_used)
var/matrix/M = matrix()
M.Scale(1,blob_points/max_blob_points)
var/total_offset = 60 + (100*(blob_points/max_blob_points))
var/total_offset = (60 + (100*(blob_points/max_blob_points))) * PIXEL_MULTIPLIER
hud_used.mymob.gui_icons.blob_powerbar.transform = M
hud_used.mymob.gui_icons.blob_powerbar.screen_loc = "WEST:0,CENTER-[8-round(total_offset/32)]:[total_offset%32]"
hud_used.mymob.gui_icons.blob_coverLEFT.maptext = "[blob_points]"
hud_used.mymob.gui_icons.blob_coverLEFT.maptext_x = 4
hud_used.mymob.gui_icons.blob_powerbar.screen_loc = "WEST,CENTER-[8-round(total_offset/WORLD_ICON_SIZE)]:[total_offset%WORLD_ICON_SIZE]"
hud_used.mymob.gui_icons.blob_coverLEFT.maptext = "<font size = 4>[blob_points]"
hud_used.mymob.gui_icons.blob_coverLEFT.maptext_x = 4*PIXEL_MULTIPLIER
if(blob_points >= 100)
hud_used.mymob.gui_icons.blob_coverLEFT.maptext_x = 1

8
code/game/gamemodes/blob/theblob.dm
View File

@@ -51,8 +51,8 @@ var/list/blob_looks
var/health_timestamp = 0
var/brute_resist = 4
var/fire_resist = 1
pixel_x = -16
pixel_y = -16
pixel_x = -WORLD_ICON_SIZE/2
pixel_y = -WORLD_ICON_SIZE/2
plane = BLOB_PLANE
var/spawning = 2
var/dying = 0
@@ -243,8 +243,8 @@ var/list/blob_looks
switch(blob_looks[looks])
if(64)
icon_state = icon_new
pixel_x = -16
pixel_y = -16
pixel_x = -WORLD_ICON_SIZE/2
pixel_y = -WORLD_ICON_SIZE/2
layer = initial(layer)
if(right_now)
spawning = 0

6
code/game/gamemodes/changeling/changeling_powers.dm
View File

@@ -37,10 +37,10 @@
if(!hud_used.vampire_blood_display)
hud_used.changeling_hud()
//hud_used.human_hud(hud_used.ui_style)
hud_used.vampire_blood_display.maptext_width = 64
hud_used.vampire_blood_display.maptext_height = 32
hud_used.vampire_blood_display.maptext_width = WORLD_ICON_SIZE*2
hud_used.vampire_blood_display.maptext_height = WORLD_ICON_SIZE
var/C = round(mind.changeling.chem_charges)
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> C:<font color='#EAB67B' size='1'>[C]</font><br> G:<font color='#FF2828' size='1'>[mind.changeling.absorbedcount]</font></div>"
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'><font size = 4> C:<font color='#EAB67B'>[C]</font><br> G:<font color='#FF2828'>[mind.changeling.absorbedcount]</font></font></div>"
return
//Used to dump the languages from the changeling datum into the actual mob.

8
code/game/gamemodes/cult/narsie.dm
View File

@@ -6,8 +6,8 @@ var/global/list/narsie_list = list()
desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
icon = 'icons/obj/narsie.dmi'
icon_state = "narsie-small"
pixel_x = -236
pixel_y = -256
pixel_x = -236 * PIXEL_MULTIPLIER
pixel_y = -256 * PIXEL_MULTIPLIER
current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO.
contained = 0 // Are we going to move around?
@@ -30,8 +30,8 @@ var/global/list/narsie_list = list()
icon_state = "narsie"//mobs perceive the geometer of blood through their see_narsie proc
// Pixel stuff centers Narsie.
pixel_x = -236
pixel_y = -256
pixel_x = -236 * PIXEL_MULTIPLIER
pixel_y = -256 * PIXEL_MULTIPLIER
light_range = 1
light_color = LIGHT_COLOR_RED

2
code/game/gamemodes/cult/ritual.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
var/cultwords = list()
var/global/runedec = 0

2
code/game/gamemodes/cult/runes.dm
View File

@@ -5,7 +5,7 @@
if(istype(target,/obj/item/weapon/nullrod))
var/turf/T = get_turf(target)
nullblock = 1
T.turf_animation('icons/effects/96x96.dmi',"nullding",-32,-32,MOB_LAYER+1,'sound/piano/Ab7.ogg',anim_plane = EFFECTS_PLANE)
T.turf_animation('icons/effects/96x96.dmi',"nullding",-WORLD_ICON_SIZE,-WORLD_ICON_SIZE,MOB_LAYER+1,'sound/piano/Ab7.ogg',anim_plane = EFFECTS_PLANE)
return 1
else if(target.contents)
for(var/atom/A in target.contents)

2
code/game/gamemodes/cult/talisman.dm
View File

@@ -39,7 +39,7 @@
if(istype(target,/obj/item/weapon/nullrod))
var/turf/T = get_turf(target)
nullblock = 1
T.turf_animation('icons/effects/96x96.dmi',"nullding",-32,-32,MOB_LAYER+1,'sound/piano/Ab7.ogg',anim_plane = EFFECTS_PLANE)
T.turf_animation('icons/effects/96x96.dmi',"nullding",-WORLD_ICON_SIZE,-WORLD_ICON_SIZE,MOB_LAYER+1,'sound/piano/Ab7.ogg',anim_plane = EFFECTS_PLANE)
return 1
else if(target.contents)
for(var/atom/A in target.contents)

14
code/game/gamemodes/endgame/xmas/snow.dm
View File

@@ -243,8 +243,8 @@
/obj/item/stack/sheet/snow/New(var/loc, var/amount=null)
recipes = snow_recipes
pixel_x = rand(-13,13)
pixel_y = rand(-13,13)
pixel_x = rand(-13,13) * PIXEL_MULTIPLIER
pixel_y = rand(-13,13) * PIXEL_MULTIPLIER
spawn_loc = src.loc
@@ -391,8 +391,8 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
var/growth = 0
var/growthlevel = 20
pixel_x = 16
pixel_y = 21
pixel_x = 16 * PIXEL_MULTIPLIER
pixel_y = 21 * PIXEL_MULTIPLIER
/obj/structure/snow_flora/sappling/New()
..()
@@ -475,7 +475,7 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
var/axe_hits = 0
pixel_y = 21//regular dead trees appear slightly to the north east, so we can justify that they don't block players.
pixel_y = 21 * PIXEL_MULTIPLIER//regular dead trees appear slightly to the north east, so we can justify that they don't block players.
/obj/structure/snow_flora/tree/New()
..()
@@ -523,8 +523,8 @@ var/global/list/datum/stack_recipe/snow_recipes = list (
icon_state = "pine_1"
density = 1
pixel_x = -16
pixel_y = 0
pixel_x = -16 * PIXEL_MULTIPLIER
pixel_y = 0 * PIXEL_MULTIPLIER
/obj/structure/snow_flora/tree/pine/New()
..()

4
code/game/gamemodes/meteor/meteors.dm
View File

@@ -352,8 +352,8 @@
name = "Blob"
icon = 'icons/obj/meteor_64x64.dmi'
icon_state = "meteorblob"
pixel_x = -16
pixel_y = -16
pixel_x = -16 * PIXEL_MULTIPLIER
pixel_y = -16 * PIXEL_MULTIPLIER
/obj/item/projectile/meteor/blob/Bump(atom/A)
if(!loc)

6
code/game/gamemodes/vampire/vampire.dm
View File

@@ -722,9 +722,9 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
if(!hud_used.vampire_blood_display)
hud_used.vampire_hud()
//hud_used.human_hud(hud_used.ui_style)
hud_used.vampire_blood_display.maptext_width = 64
hud_used.vampire_blood_display.maptext_height = 32
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
hud_used.vampire_blood_display.maptext_width = WORLD_ICON_SIZE*2
hud_used.vampire_blood_display.maptext_height = WORLD_ICON_SIZE
hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'><font size = 4> U:<font color='#33FF33'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00'>[mind.vampire.bloodtotal]</font></font></div>"
handle_vampire_cloak()
handle_vampire_menace()
handle_vampire_smite()

8
code/game/machinery/airlock_control.dm
View File

@@ -211,8 +211,8 @@ obj/machinery/airlock_sensor/airlock_exterior
//src.tdir = dir // to fix Vars bug
//dir = SOUTH
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 : -24)
pixel_y = (dir & 3)? (dir ==1 ? 24 : -24) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 * PIXEL_MULTIPLIER : -24 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? 24 * PIXEL_MULTIPLIER: -24* PIXEL_MULTIPLIER) : 0
//build=0
//stat |= MAINT
@@ -291,8 +291,8 @@ obj/machinery/access_button
//src.tdir = dir // to fix Vars bug
//dir = SOUTH
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 : -24)
pixel_y = (dir & 3)? (dir ==1 ? 24 : -24) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 * PIXEL_MULTIPLIER : -24 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? 24 * PIXEL_MULTIPLIER : -24 * PIXEL_MULTIPLIER) : 0
//build=0
//stat |= MAINT

8
code/game/machinery/alarm.dm
View File

@@ -141,8 +141,8 @@
buildstage = 0
wiresexposed = 1
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 * PIXEL_MULTIPLIER : 24 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? -24 * PIXEL_MULTIPLIER: 24 * PIXEL_MULTIPLIER) : 0
update_icon()
if(ticker && ticker.current_state == 3)//if the game is running
src.initialize()
@@ -1142,8 +1142,8 @@ var/global/list/firealarms = list() //shrug
if(building)
buildstage = 0
wiresexposed = 1
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 * PIXEL_MULTIPLIER: 24 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? -24 * PIXEL_MULTIPLIER: 24 * PIXEL_MULTIPLIER) : 0
machines.Remove(src)
firealarms |= src

4
code/game/machinery/atmoalter/meter.dm
View File

@@ -32,8 +32,8 @@
/obj/machinery/meter/proc/setAttachLayer(var/new_layer)
target_layer = new_layer
src.pixel_x = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
src.pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
src.pixel_x = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X * PIXEL_MULTIPLIER
src.pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y * PIXEL_MULTIPLIER
/obj/machinery/meter/process()
if(!target)

4
code/game/machinery/bees_items.dm
View File

@@ -101,8 +101,8 @@
/obj/item/beezeez/New()
. = ..()
pixel_x = rand(-5.0, 5)
pixel_y = rand(-5.0, 5)
pixel_x = rand(-5.0, 5) * PIXEL_MULTIPLIER
pixel_y = rand(-5.0, 5) * PIXEL_MULTIPLIER
/obj/item/weapon/reagent_containers/food/snacks/honeycomb
name = "honeycomb"

4
code/game/machinery/bots/mulebot.dm
View File

@@ -441,7 +441,7 @@ var/global/mulebot_count = 0
C.loc = src
load = C
C.pixel_y += 9
C.pixel_y += 9 * PIXEL_MULTIPLIER
if(C.layer < layer)
C.layer = layer + 0.1
overlays += C
@@ -466,7 +466,7 @@ var/global/mulebot_count = 0
overlays.len = 0
load.loc = src.loc
load.pixel_y -= 9
load.pixel_y -= 9 * PIXEL_MULTIPLIER
load.layer = initial(load.layer)
if(ismob(load))
var/mob/M = load

8
code/game/machinery/buttons.dm
View File

@@ -18,13 +18,13 @@
machine_flags |= MULTITOOL_MENU
switch(w_dir)
if(NORTH)
pixel_y = 25
pixel_y = 25 * PIXEL_MULTIPLIER
if(SOUTH)
pixel_y = -25
pixel_y = -25 * PIXEL_MULTIPLIER
if(EAST)
pixel_x = 25
pixel_x = 25 * PIXEL_MULTIPLIER
if(WEST)
pixel_x = -25
pixel_x = -25 * PIXEL_MULTIPLIER
/obj/machinery/ignition_switch
name = "ignition switch"

4
code/game/machinery/computer/slot_machine.dm
View File

@@ -73,10 +73,10 @@
overlay_1 = image('icons/obj/slot_machine.dmi',icon_state="[value_1]",loc = src)
overlay_2 = image('icons/obj/slot_machine.dmi',icon_state="[value_2]",loc = src)
overlay_2.pixel_x = 4
overlay_2.pixel_x = 4 * PIXEL_MULTIPLIER
overlay_3 = image('icons/obj/slot_machine.dmi',icon_state="[value_3]",loc = src)
overlay_3.pixel_x = 8
overlay_3.pixel_x = 8 * PIXEL_MULTIPLIER
//The reason why there guys aren't actually added to the overlays list is that their icon_state has to be changed during the spin() proc,
//which would be impossible if they were in the overlays list

20
code/game/machinery/doors/brigdoors.dm
View File

@@ -26,8 +26,8 @@
New()
..()
pixel_x = ((src.dir & 3)? (0) : (src.dir == 4 ? 32 : -32))
pixel_y = ((src.dir & 3)? (src.dir ==1 ? 32 : -32) : (0))
pixel_x = ((src.dir & 3)? (0) : (src.dir == 4 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE))
pixel_y = ((src.dir & 3)? (src.dir ==1 ? WORLD_ICON_SIZE : -WORLD_ICON_SIZE) : (0))
spawn(20)
for(var/obj/machinery/door/window/brigdoor/M in all_doors)
@@ -252,8 +252,8 @@
if(char == " ")
continue
var/image/ID = image('icons/obj/status_display.dmi', icon_state=char)
ID.pixel_x = -(d-1)*5 + px
ID.pixel_y = py
ID.pixel_x = (-(d-1)*5 + px) * PIXEL_MULTIPLIER
ID.pixel_y = py * PIXEL_MULTIPLIER
I.overlays += ID
return I
@@ -262,39 +262,39 @@
name = "Cell 1"
id_tag = "Cell 1"
dir = 2
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
/obj/machinery/door_timer/cell_2
name = "Cell 2"
id_tag = "Cell 2"
dir = 2
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
/obj/machinery/door_timer/cell_3
name = "Cell 3"
id_tag = "Cell 3"
dir = 2
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
/obj/machinery/door_timer/cell_4
name = "Cell 4"
id_tag = "Cell 4"
dir = 2
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
/obj/machinery/door_timer/cell_5
name = "Cell 5"
id_tag = "Cell 5"
dir = 2
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
/obj/machinery/door_timer/cell_6
name = "Cell 6"
id_tag = "Cell 6"
dir = 4
pixel_x = 32
pixel_x = WORLD_ICON_SIZE

16
code/game/machinery/doors/door.dm
View File

@@ -270,11 +270,11 @@ var/list/all_doors = list()
if(width > 1)
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
bound_height = world.icon_size
bound_width = width * WORLD_ICON_SIZE
bound_height = WORLD_ICON_SIZE
else
bound_width = world.icon_size
bound_height = width * world.icon_size
bound_width = WORLD_ICON_SIZE
bound_height = width * WORLD_ICON_SIZE
update_nearby_tiles()
@@ -362,11 +362,11 @@ var/list/all_doors = list()
. = ..()
if(width > 1)
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
bound_height = world.icon_size
bound_width = width * WORLD_ICON_SIZE
bound_height = WORLD_ICON_SIZE
else
bound_width = world.icon_size
bound_height = width * world.icon_size
bound_width = WORLD_ICON_SIZE
bound_height = width * WORLD_ICON_SIZE
update_nearby_tiles()

4
code/game/machinery/embedded_controller/embedded_controller_base.dm
View File

@@ -23,8 +23,8 @@
//src.tdir = dir // to fix Vars bug
//dir = SOUTH
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 : -24)
pixel_y = (dir & 3)? (dir ==1 ? 24 : -24) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? 24 * PIXEL_MULTIPLIER: -24 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? 24 * PIXEL_MULTIPLIER: -24 * PIXEL_MULTIPLIER) : 0
build=0
stat |= MAINT

4
code/game/machinery/gashapon.dm
View File

@@ -47,8 +47,8 @@
/obj/item/weapon/capsule/New()
..()
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
pixel_x = rand(-10,10) * PIXEL_MULTIPLIER
pixel_y = rand(-10,10) * PIXEL_MULTIPLIER
/obj/item/weapon/capsule/ex_act()
qdel(src)

4
code/game/machinery/kitchen/smartfridge.dm
View File

@@ -261,8 +261,8 @@
else if(istype(O, /obj/item/weapon/paper) && user.drop_item(O, src.loc))
var/list/params_list = params2list(params)
if(O.loc == src.loc && params_list.len)
var/clamp_x = 16
var/clamp_y = 16
var/clamp_x = WORLD_ICON_SIZE/2
var/clamp_y = WORLD_ICON_SIZE/2
O.pixel_x = Clamp(text2num(params_list["icon-x"]) - clamp_x, -clamp_x, clamp_x)
O.pixel_y = Clamp(text2num(params_list["icon-y"]) - clamp_y, -clamp_y, clamp_y)
to_chat(user, "<span class='notice'>You hang \the [O.name] on the fridge.</span>")

4
code/game/machinery/lightswitch.dm
View File

@@ -20,8 +20,8 @@
if(buildstage)
on = areaMaster.lightswitch
else
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 : -28)
pixel_y = (ndir & 3)? (ndir ==1 ? 28 : -28) : 0
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER)
pixel_y = (ndir & 3)? (ndir ==1 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER) : 0
dir = ndir
updateicon()

4
code/game/machinery/newscaster.dm
View File

@@ -136,8 +136,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
/obj/machinery/newscaster/New(var/loc, var/ndir, var/building = 1)
buildstage = building
if(!buildstage) //Already placed newscasters via mapping will not be affected by this
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 : -28)
pixel_y = (ndir & 3)? (ndir == 1 ? 28 : -28) : 0
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER)
pixel_y = (ndir & 3)? (ndir == 1 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER) : 0
dir = ndir
allCasters += src
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) // Let's give it an appropriate unit number

4
code/game/machinery/status_display.dm
View File

@@ -46,8 +46,8 @@ var/global/list/status_displays = list() //This list contains both normal status
var/spookymode=0 // Ghosts.
maptext_height = 26
maptext_width = 32
maptext_height = 26*PIXEL_MULTIPLIER
maptext_width = WORLD_ICON_SIZE
layer = ABOVE_WINDOW_LAYER
// new display

2
code/game/machinery/telecomms/machine_interactions.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*

2
code/game/machinery/telecomms/telecomunications.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*
Hello, friends, this is Doohl from sexylands. You may be wondering what this

2
code/game/machinery/telecomms/telemonitor.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/*

4
code/game/machinery/vending.dm
View File

@@ -1331,8 +1331,8 @@ var/global/num_vending_terminals = 1
// offset 32 pixels in direction of dir
// this allows the NanoMed to be embedded in a wall, yet still inside an area
dir = ndir
pixel_x = (dir & 3)? 0 : (dir == 4 ? 30 : -30)
pixel_y = (dir & 3)? (dir ==1 ? 30 : -30) : 0
pixel_x = (dir & 3)? 0 : (dir == 4 ? 30 * PIXEL_MULTIPLIER: -30 * PIXEL_MULTIPLIER)
pixel_y = (dir & 3)? (dir ==1 ? 30 * PIXEL_MULTIPLIER: -30 * PIXEL_MULTIPLIER) : 0
/obj/machinery/wallmed_frame/update_icon()
icon_state = "wallmed_frame[build]"

4
code/game/magic/Uristrunes.dm
View File

@@ -141,8 +141,8 @@ var/list/uristrune_cache = list()
I.SwapColor(rgb(0, 0, 0, 100), bc1)
I.SwapColor(rgb(0, 0, 0, 50), bc1)
for(var/x = 1, x <= 32, x++)
for(var/y = 1, y <= 32, y++)
for(var/x = 1, x <= WORLD_ICON_SIZE, x++)
for(var/y = 1, y <= WORLD_ICON_SIZE, y++)
var/p = I.GetPixel(x, y)
if(p == null)

16
code/game/objects/closets/walllocker.dm
View File

@@ -39,19 +39,19 @@
return
/obj/structure/closet/walllocker/emerglocker/north
pixel_y = 32
pixel_y = WORLD_ICON_SIZE
dir = SOUTH
/obj/structure/closet/walllocker/emerglocker/south
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
dir = NORTH
/obj/structure/closet/walllocker/emerglocker/west
pixel_x = -32
pixel_x = -WORLD_ICON_SIZE
dir = WEST
/obj/structure/closet/walllocker/emerglocker/east
pixel_x = 32
pixel_x = WORLD_ICON_SIZE
dir = EAST
/obj/structure/closet/walllocker/defiblocker
@@ -110,17 +110,17 @@
icon_state = icon_opened
/obj/structure/closet/walllocker/defiblocker/north
pixel_y = 32
pixel_y = WORLD_ICON_SIZE
dir = SOUTH
/obj/structure/closet/walllocker/defiblocker/south
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
dir = NORTH
/obj/structure/closet/walllocker/defiblocker/west
pixel_x = -32
pixel_x = -WORLD_ICON_SIZE
dir = WEST
/obj/structure/closet/walllocker/defiblocker/east
pixel_x = 32
pixel_x = WORLD_ICON_SIZE
dir = EAST

4
code/game/objects/effects/decals/Cleanable/misc.dm
View File

@@ -183,8 +183,8 @@
/obj/effect/decal/cleanable/clay_fragments/New()
..()
pixel_x = rand (-3,3)
pixel_y = rand (-3,3)
pixel_x = rand (-3,3) * PIXEL_MULTIPLIER
pixel_y = rand (-3,3) * PIXEL_MULTIPLIER
/obj/effect/decal/cleanable/soot
name = "soot"

4
code/game/objects/effects/effect_system.dm
View File

@@ -229,8 +229,8 @@ steam.start() -- spawns the effect
//Remove this bit to use the old smoke
icon = 'icons/effects/96x96.dmi'
pixel_x = -32
pixel_y = -32
pixel_x = -WORLD_ICON_SIZE
pixel_y = -WORLD_ICON_SIZE
/obj/effect/effect/smoke/New()
. = ..()

8
code/game/objects/effects/glowshroom.dm
View File

@@ -28,13 +28,13 @@
if(!floor)
switch(dir) //offset to make it be on the wall rather than on the floor
if(NORTH)
pixel_y = 32
pixel_y = WORLD_ICON_SIZE
if(SOUTH)
pixel_y = -32
pixel_y = -WORLD_ICON_SIZE
if(EAST)
pixel_x = 32
pixel_x = WORLD_ICON_SIZE
if(WEST)
pixel_x = -32
pixel_x = -WORLD_ICON_SIZE
icon_state = "glowshroom[rand(1,3)]"
else //if on the floor, glowshroom on-floor sprite
icon_state = "glowshroomf"

16
code/game/objects/effects/trackers.dm
View File

@@ -19,8 +19,8 @@
/obj/effect/tracker/New()
. = ..()
absolute_X = (x * 32)
absolute_Y = (y * 32)
absolute_X = (x * WORLD_ICON_SIZE)
absolute_Y = (y * WORLD_ICON_SIZE)
spawn(1)
process_step()
@@ -41,8 +41,8 @@
returnToPool(src)
return
var/target_absolute_X = target.x * 32
var/target_absolute_Y = target.y * 32
var/target_absolute_X = target.x * WORLD_ICON_SIZE
var/target_absolute_Y = target.y * WORLD_ICON_SIZE
var/dx = target_absolute_X - absolute_X
var/dy = target_absolute_Y - absolute_Y
@@ -71,8 +71,8 @@
speed += acceleration
x = absolute_X/32
y = absolute_Y/32
x = absolute_X/WORLD_ICON_SIZE
y = absolute_Y/WORLD_ICON_SIZE
update_icon()
sleep(refresh)
@@ -80,8 +80,8 @@
/obj/effect/tracker/update_icon()
pixel_x = absolute_X % 32
pixel_y = absolute_Y % 32
pixel_x = absolute_X % WORLD_ICON_SIZE
pixel_y = absolute_Y % WORLD_ICON_SIZE
/obj/effect/tracker/cultify()
return

2
code/game/objects/explosion.dm
View File

@@ -110,7 +110,7 @@ var/explosion_shake_message_cooldown = 0
E.set_up(epicenter)
E.start()
else
epicenter.turf_animation('icons/effects/96x96.dmi',"explosion_small",-32, -32, 13)
epicenter.turf_animation('icons/effects/96x96.dmi',"explosion_small",-WORLD_ICON_SIZE, -WORLD_ICON_SIZE, 13)
var/x0 = epicenter.x
var/y0 = epicenter.y

2
code/game/objects/items.dm
View File

@@ -1022,7 +1022,7 @@ var/global/list/image/blood_overlays = list()
if(kick_power > 6) //Fly in an arc!
spawn()
var/original_pixel_y = pixel_y
animate(src, pixel_y = original_pixel_y + 32, time = 10, easing = CUBIC_EASING)
animate(src, pixel_y = original_pixel_y + WORLD_ICON_SIZE, time = 10, easing = CUBIC_EASING)
while(loc)
if(!throwing)

6
code/game/objects/items/crayons.dm
View File

@@ -98,7 +98,7 @@ var/global/list/all_graffitis = list(
shadeColour = input(user, "Please select the shade colour.", "Crayon colour") as color
return
#define FONT_SIZE "6pt"
#define FONT_SIZE "12pt"
#define FONT_NAME "Comic Sans MS"
/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity) return
@@ -189,8 +189,8 @@ var/global/list/all_graffitis = list(
var/angle = dir2angle_t(get_dir(C, target))
C.pixel_x = 32 * cos(angle)
C.pixel_y = 32 * sin(angle) //Offset the graffiti to make it appear on the wall
C.pixel_x = WORLD_ICON_SIZE * cos(angle)
C.pixel_y = WORLD_ICON_SIZE * sin(angle) //Offset the graffiti to make it appear on the wall
C.on_wall = target
to_chat(user, "You finish drawing.")

4
code/game/objects/items/devices/maracas.dm
View File

@@ -17,8 +17,8 @@
/obj/item/device/maracas/New()
..()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
src.pixel_x = rand(-5, 5) * PIXEL_MULTIPLIER
src.pixel_y = rand(-5, 5) * PIXEL_MULTIPLIER
/obj/item/device/maracas/pickup(mob/user)
user.callOnFace |= "\ref[src]"

4
code/game/objects/items/devices/radio/intercom.dm
View File

@@ -25,8 +25,8 @@
if(buildstage)
processing_objects.Add(src)
else
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 : -28)
pixel_y = (ndir & 3)? (ndir ==1 ? 28 : -28) : 0
pixel_x = (ndir & 3)? 0 : (ndir == 4 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER)
pixel_y = (ndir & 3)? (ndir ==1 ? 28 * PIXEL_MULTIPLIER: -28 * PIXEL_MULTIPLIER) : 0
dir=ndir
b_stat=1
on = 0

4
code/game/objects/items/devices/remote/remote_buttons.dm
View File

@@ -28,8 +28,8 @@
var/icon_type = controller.get_icon_type(button_id)
var/list/pixel_dis = controller.get_pixel_displacement(button_id)
button_icon.icon_state = "[base_state][icon_type]"
button_icon.pixel_x = pixel_dis["pixel_x"]
button_icon.pixel_y = pixel_dis["pixel_y"]
button_icon.pixel_x = pixel_dis["pixel_x"] * PIXEL_MULTIPLIER
button_icon.pixel_y = pixel_dis["pixel_y"] * PIXEL_MULTIPLIER
holder.overlays += button_icon
else
button_icon.icon_state = base_state

10
code/game/objects/items/devices/remote/remotes/remote_3b.dm
View File

@@ -16,11 +16,11 @@
/datum/context_click/remote_control/three_button/return_clicked_id(x_pos, y_pos)
switch(y_pos)
if(6 to 12)
if(12 to 24)
return "3B1"
if(13 to 19)
if(25 to 39)
return "3B2"
if(20 to 26)
if(40 to 52)
return "3B3"
/datum/context_click/remote_control/three_button/get_icon_type(button_id)
@@ -30,9 +30,9 @@
var/y_dis = 0
switch(button_id)
if("3B1")
y_dis = -7
y_dis = -14
if("3B2")
y_dis = 0
if("3B3")
y_dis = 7
y_dis = 14
return list("pixel_x" = 0, "pixel_y" = y_dis)

18
code/game/objects/items/devices/remote/remotes/remote_4b.dm
View File

@@ -18,17 +18,17 @@
/datum/context_click/remote_control/four_button/return_clicked_id(x_pos, y_pos)
switch(y_pos)
if(4 to 12)
if(8 to 24)
switch(x_pos)
if(8 to 16)
if(16 to 32)
return "4B1"
if(17 to 25)
if(33 to 50)
return "4B2"
if(13 to 21)
if(26 to 42)
switch(x_pos)
if(8 to 16)
if(16 to 32)
return "4B4"
if(17 to 25)
if(33 to 50)
return "4B3"
/datum/context_click/remote_control/four_button/get_icon_type(button_id)
@@ -39,12 +39,12 @@
var/y_dis = 0
switch(button_id)
if("4B1", "4B4")
x_dis = -5
x_dis = -10
if("4B2", "4B3")
x_dis = 4
x_dis = 8
switch(button_id)
if("4B1", "4B2")
y_dis = -9
y_dis = -18
return list("pixel_x" = x_dis, "pixel_y" = y_dis)

12
code/game/objects/items/mountable_frames/paintings.dm
View File

@@ -45,8 +45,8 @@ var/global/list/available_paintings = list(
/obj/item/mounted/frame/painting/New()
..()
pixel_x = rand(-6,6)
pixel_y = rand(-6,6)
pixel_x = rand(-6,6) * PIXEL_MULTIPLIER
pixel_y = rand(-6,6) * PIXEL_MULTIPLIER
if(!paint)
paint = pick(available_paintings)
@@ -153,13 +153,13 @@ var/global/list/available_paintings = list(
var/pDir = get_dir(user,on_wall)
if(pDir & NORTH)
P.pixel_y = 32
P.pixel_y = WORLD_ICON_SIZE
if(pDir & SOUTH)
P.pixel_y = -32
P.pixel_y = -WORLD_ICON_SIZE
if(pDir & EAST)
P.pixel_x = 32
P.pixel_x = WORLD_ICON_SIZE
if(pDir & WEST)
P.pixel_x = -32
P.pixel_x = -WORLD_ICON_SIZE
playsound(on_wall, 'sound/items/Deconstruct.ogg', 25, 1)

2
code/game/objects/items/robot/robot_items.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/**********************************************************************
Cyborg Spec Items

8
code/game/objects/items/stacks/cable.dm
View File

@@ -49,8 +49,8 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \
if(param_color)
_color = param_color
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
pixel_x = rand(-2,2) * PIXEL_MULTIPLIER
pixel_y = rand(-2,2) * PIXEL_MULTIPLIER
update_icon()
///////////////////////////////////
@@ -277,8 +277,8 @@ var/global/list/datum/stack_recipe/cable_recipes = list ( \
..(loc)
if(!amount)
src.amount = rand(1, 2)
pixel_x = rand(-2, 2)
pixel_y = rand(-2, 2)
pixel_x = rand(-2, 2) * PIXEL_MULTIPLIER
pixel_y = rand(-2, 2) * PIXEL_MULTIPLIER
update_icon()
/obj/item/stack/cable_coil/yellow

4
code/game/objects/items/stacks/sheets/sheets.dm
View File

@@ -14,8 +14,8 @@
mech_flags = MECH_SCAN_FAIL
/obj/item/stack/sheet/New(var/newloc, var/amount = null)
pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4
pixel_x = (rand(0,4)-4) * PIXEL_MULTIPLIER
pixel_y = (rand(0,4)-4) * PIXEL_MULTIPLIER
..()

4
code/game/objects/items/stacks/teeth.dm
View File

@@ -14,8 +14,8 @@
/obj/item/stack/teeth/New(loc, amount)
.=..()
pixel_x = rand(-24,24)
pixel_y = rand(-24,24)
pixel_x = rand(-24,24) * PIXEL_MULTIPLIER
pixel_y = rand(-24,24) * PIXEL_MULTIPLIER
/obj/item/stack/teeth/can_stack_with(obj/item/other_stack)
if(!istype(other_stack)) return 0

4
code/game/objects/items/stacks/tiles/plasteel.dm
View File

@@ -19,8 +19,8 @@
/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
. = ..()
pixel_x = rand(1, 14)
pixel_y = rand(1, 14)
pixel_x = rand(1, 14) * PIXEL_MULTIPLIER
pixel_y = rand(1, 14) * PIXEL_MULTIPLIER
/*
/obj/item/stack/tile/plasteel/attack_self(mob/user as mob)

4
code/game/objects/items/weapons/cash.dm
View File

@@ -96,8 +96,8 @@ var/global/list/moneytypes = list(
//Up to 100 items per stack.
overlays = 0
var/stacksize=round(amount/2.5)
pixel_x = rand(-7, 7)
pixel_y = rand(-14, 14)
pixel_x = rand(-7, 7) * PIXEL_MULTIPLIER
pixel_y = rand(-14, 14) * PIXEL_MULTIPLIER
if(stacksize)
// 0 = single
// 1 = 1/4 stack

4
code/game/objects/items/weapons/dice.dm
View File

@@ -319,8 +319,8 @@
set_sides(usr)
/datum/context_click/digi_die/return_clicked_id(x_pos, y_pos)
if(23 <= x_pos && x_pos <= 26) //yellow bit
if(23 <= y_pos && y_pos <= 26)
if(46 <= x_pos && x_pos <= 52) //yellow bit
if(46 <= y_pos && y_pos <= 52)
return 1
/datum/context_click/digi_die/action(obj/item/used_item, mob/user, params)

4
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -65,8 +65,8 @@
/obj/item/weapon/winter_gift/New()
..()
pixel_x = rand(-10,10)
pixel_y = rand(-10,10)
pixel_x = rand(-10,10) * PIXEL_MULTIPLIER
pixel_y = rand(-10,10) * PIXEL_MULTIPLIER
/obj/item/weapon/winter_gift/ex_act()
qdel(src)

2
code/game/objects/items/weapons/implants/implantcase.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implantcase
name = "Glass Case"

2
code/game/objects/items/weapons/implants/implantchair.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/machinery/implantchair
name = "Loyalty Implanter"

2
code/game/objects/items/weapons/implants/implantfreedom.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implant/freedom
name = "freedom"

2
code/game/objects/items/weapons/implants/implantpad.dm
View File

@@ -1,4 +1,4 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
/obj/item/weapon/implantpad
name = "implantpad"

10
code/game/objects/items/weapons/kitchen.dm
View File

@@ -31,7 +31,7 @@
. = ..()
if (prob(60))
src.pixel_y = rand(0, 4)
src.pixel_y = rand(0, 4) * PIXEL_MULTIPLIER
/*
* Spoons
@@ -113,8 +113,8 @@
var/icon/food_to_load = getFlatIcon(snack)
food_to_load.Scale(16,16)
loaded_food = image(food_to_load)
loaded_food.pixel_x = 8 + src.pixel_x
loaded_food.pixel_y = 15 + src.pixel_y
loaded_food.pixel_x = 8 * PIXEL_MULTIPLIER + src.pixel_x
loaded_food.pixel_y = 15 * PIXEL_MULTIPLIER + src.pixel_y
src.overlays += loaded_food
if(snack.reagents.total_volume > snack.bitesize)
snack.reagents.trans_to(src, snack.bitesize)
@@ -502,13 +502,13 @@
overlays += image
else
..()
/obj/item/weapon/tray/proc/calc_carry()
/obj/item/weapon/tray/proc/calc_carry()
// calculate the weight of the items on the tray
. = 0 // value to return
for(var/obj/item/I in carrying)
. += I.get_trayweight() || INFINITY
/* previous functionality of trays,
/* previous functionality of trays,
/obj/item/weapon/tray/prepickup(mob/user)
..()

12
code/game/objects/items/weapons/shard.dm
View File

@@ -25,14 +25,14 @@
src.icon_state = pick("large", "medium", "small")
switch(src.icon_state)
if("small")
src.pixel_x = rand(-12, 12)
src.pixel_y = rand(-12, 12)
src.pixel_x = rand(-12, 12) * PIXEL_MULTIPLIER
src.pixel_y = rand(-12, 12) * PIXEL_MULTIPLIER
if("medium")
src.pixel_x = rand(-8, 8)
src.pixel_y = rand(-8, 8)
src.pixel_x = rand(-8, 8) * PIXEL_MULTIPLIER
src.pixel_y = rand(-8, 8) * PIXEL_MULTIPLIER
if("large")
src.pixel_x = rand(-5, 5)
src.pixel_y = rand(-5, 5)
src.pixel_x = rand(-5, 5) * PIXEL_MULTIPLIER
src.pixel_y = rand(-5, 5) * PIXEL_MULTIPLIER
else
..()
return

4
code/game/objects/items/weapons/stock_parts.dm
View File

@@ -8,8 +8,8 @@
/obj/item/weapon/stock_parts/New()
. = ..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
pixel_x = rand(-5, 5) * PIXEL_MULTIPLIER
pixel_y = rand(-5, 5) * PIXEL_MULTIPLIER
/obj/item/weapon/stock_parts/get_rating()
return rating

Some files were not shown because too many files have changed in this diff Show More