Commit 6edf0208 authored by clusterfack's avatar clusterfack Committed by PJB3005
Browse files

64x64 Sprites (#11214)

* 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
parent 66d143ca
......@@ -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.
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment