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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-04a

Browse Source
This commit is contained in:
Waterpig
2025-04-08 18:58:45 +02:00
parent 38f2ed5afb faeb997bc0
commit 753d8e5ba4
1089 changed files with 42417 additions and 34460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/bci/hud/bar_overlay.dm
+2 -2
View File
@@ -49,10 +49,10 @@
SET_PLANE_EXPLICIT(cool_overlay, ABOVE_LIGHTING_PLANE, target_atom)
if(image_pixel_x.value != null)
cool_overlay.pixel_x = image_pixel_x.value
cool_overlay.pixel_w = image_pixel_x.value
if(image_pixel_y.value != null)
cool_overlay.pixel_y = image_pixel_y.value
cool_overlay.pixel_z = image_pixel_y.value
var/datum/atom_hud/alternate_appearance/basic/one_person/alt_appearance = target_atom.add_alt_appearance(
/datum/atom_hud/alternate_appearance/basic/one_person,
code/modules/wiremod/components/bci/hud/counter_overlay.dm
+5 -5
View File
@@ -68,9 +68,9 @@
SET_PLANE_EXPLICIT(counter, ABOVE_LIGHTING_PLANE, owner)
if(image_pixel_x.value != null)
counter.pixel_x = image_pixel_x.value
counter.pixel_w = image_pixel_x.value
if(image_pixel_y.value != null)
counter.pixel_y = image_pixel_y.value
counter.pixel_z = image_pixel_y.value
var/datum/atom_hud/alternate_appearance/basic/one_person/alt_appearance = owner.add_alt_appearance(
/datum/atom_hud/alternate_appearance/basic/one_person,
@@ -91,12 +91,12 @@
SET_PLANE_EXPLICIT(number, ABOVE_LIGHTING_PLANE, owner)
if(image_pixel_x.value != null)
number.pixel_x = image_pixel_x.value + (i - 1) * 9
number.pixel_w = image_pixel_x.value + (i - 1) * 9
else
number.pixel_x = (i - 1) * 9
number.pixel_w = (i - 1) * 9
if(image_pixel_y.value != null)
number.pixel_y = image_pixel_y.value
number.pixel_z = image_pixel_y.value
var/datum/atom_hud/alternate_appearance/basic/one_person/number_alt_appearance = owner.add_alt_appearance(
/datum/atom_hud/alternate_appearance/basic/one_person,
code/modules/wiremod/components/bci/hud/object_overlay.dm
+2 -2
View File
@@ -104,10 +104,10 @@
SET_PLANE_EXPLICIT(cool_overlay, ABOVE_LIGHTING_PLANE, target_atom)
if(image_pixel_x.value != null)
cool_overlay.pixel_x = image_pixel_x.value
cool_overlay.pixel_w = image_pixel_x.value
if(image_pixel_y.value != null)
cool_overlay.pixel_y = image_pixel_y.value
cool_overlay.pixel_z = image_pixel_y.value
if(image_rotation.value != null)
var/matrix/turn_matrix = cool_overlay.transform