cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a bunch of sidemap/plane cube issues (#72178)

Browse Source 
## About The Pull Request

[fixes solor trackers offsetting wrong, and panels not using plane
offsets](https://github.com/tgstation/tgstation/commit/8f461ab8ec17df5c158a564a3b3d92c165eb88f5)

[fixes cyborg hats offsetting phyiscally over their
head](https://github.com/tgstation/tgstation/commit/5fd5b4240efe71f0d8ac9a5b9342780cc2540a87)

[fixes reflector parts z fighting with their neighbors. if we physically
offset them, they'll have nothing to fight
with](https://github.com/tgstation/tgstation/commit/088dcfe91ff750fcfe78c02c85a3a63408c9b21f)

[fixes burgers layering wrong. uses a combo of pixel z to do the visual
offsets, and pixel_y to modify
layering](https://github.com/tgstation/tgstation/commit/ec39e2bcd39b1d8bd61a1f008a391b642f92a575)

[fixes signs, needed to use pixel_w instead of x, I think we may be
living under iso rules? I'm not totally sure I need to investigate
more](https://github.com/tgstation/tgstation/commit/560d152fd745d9f37dd4f6a9e67cc67f43b14821)

[fixes paperbin
rendering](https://github.com/tgstation/tgstation/commit/e6c57ec00eba1b4522b8ef1d056e0ef036a9e901)

## Why It's Good For The Game

Closes #72094
Closes #72035
This commit is contained in:
LemonInTheDark
2022-12-24 02:43:36 -08:00
committed by GitHub
parent 5290f365de
commit 44c61dfed6
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/reflector.dm
+5 -2
View File
@@ -6,7 +6,7 @@
anchored = FALSE
density = FALSE
var/deflector_icon_state
var/image/deflector_overlay
var/mutable_appearance/deflector_overlay
var/finished = FALSE
var/admin = FALSE //Can't be rotated or deconstructed
var/can_rotate = TRUE
@@ -22,7 +22,10 @@
icon_state = "reflector_base"
allowed_projectile_typecache = typecacheof(allowed_projectile_typecache)
if(deflector_icon_state)
deflector_overlay = image(icon, deflector_icon_state)
deflector_overlay = mutable_appearance(icon, deflector_icon_state)
// We offset our physical position DOWN, because TRANSFORM IS A FUCK
deflector_overlay.pixel_y = -32
deflector_overlay.pixel_z = 32
add_overlay(deflector_overlay)
if(rotation_angle == -1)
code/game/objects/structures/signs/signs_interactive.dm
+4 -4
View File
@@ -60,12 +60,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delamination_counter, 32)
var/ones = since_last % 10
var/mutable_appearance/ones_overlay = mutable_appearance('icons/obj/signs.dmi', "days_[ones]")
ones_overlay.pixel_x = 4
ones_overlay.pixel_w = 4
. += ones_overlay
var/tens = (since_last / 10) % 10
var/mutable_appearance/tens_overlay = mutable_appearance('icons/obj/signs.dmi', "days_[tens]")
tens_overlay.pixel_x = -5
tens_overlay.pixel_w = -5
. += tens_overlay
/obj/structure/sign/delamination_counter/examine(mob/user)
@@ -118,12 +118,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delamination_counter, 32)
var/ones = hit_count % 10
var/mutable_appearance/ones_overlay = mutable_appearance('icons/obj/signs.dmi', "hits_[ones]")
ones_overlay.pixel_x = 4
ones_overlay.pixel_w = 4
. += ones_overlay
var/tens = (hit_count / 10) % 10
var/mutable_appearance/tens_overlay = mutable_appearance('icons/obj/signs.dmi', "hits_[tens]")
tens_overlay.pixel_x = -5
tens_overlay.pixel_w = -5
. += tens_overlay
/obj/structure/sign/collision_counter/examine(mob/user)