mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
Tram Mk. IV hotfixes [NO GBP] (#73243)
## About The Pull Request Fixes some little issues in https://github.com/tgstation/tgstation/pull/73057 - tram doors only crush people if either emagged (100%) or malfunctioning (15%) - emag works on tram doors - crossing signals use correct amount of power, increased brightness - crossing signals and destination signs consume power when idle - green static crossing signal shuts off when power lost - left/right emag icons are swapped - tram bench override shouldn't override all benches | Fixes https://github.com/tgstation/tgstation/issues/73250 - reduced damage from tram door crushing (60 > 45) ## Changelog 🆑 LT3 fix: Fixed motion sensors on tram doors, they will now crush you much less often! balance: Reduced damage from being crushed by tram doors code: Un-nested emag blacklist code: emag works properly on tram doors fix: Backwards tram door sparks animation fix: Tram displays power consumption fix: Tram crossing signals power consumption balance: Increased brightness on tram crossing signals fix: West Wing NW/SW and East Wing NE/SE crossing signals now shut off when power is lost fix: Tram benches don't override standard benches fix: Reduced saturation and brightness of standard bench /🆑 --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
This commit is contained in:
@@ -100,27 +100,23 @@ COLORED_SOFA(/obj/structure/chair/sofa, maroon, SOFA_MAROON)
|
||||
desc = "Perfectly designed to be comfortable to sit on, and hellish to sleep on."
|
||||
icon_state = "bench_middle"
|
||||
greyscale_config = /datum/greyscale_config/bench_middle
|
||||
greyscale_colors = "#00CCFF"
|
||||
greyscale_colors = "#2E668A"
|
||||
|
||||
/obj/structure/chair/sofa/bench/left
|
||||
icon_state = "bench_left"
|
||||
greyscale_config = /datum/greyscale_config/bench_left
|
||||
greyscale_colors = "#00CCFF"
|
||||
|
||||
/obj/structure/chair/sofa/bench/right
|
||||
icon_state = "bench_right"
|
||||
greyscale_config = /datum/greyscale_config/bench_right
|
||||
greyscale_colors = "#00CCFF"
|
||||
|
||||
/obj/structure/chair/sofa/bench/corner
|
||||
icon_state = "bench_corner"
|
||||
greyscale_config = /datum/greyscale_config/bench_corner
|
||||
greyscale_colors = "#00CCFF"
|
||||
|
||||
/obj/structure/chair/sofa/bench/solo
|
||||
icon_state = "bench_solo"
|
||||
greyscale_config = /datum/greyscale_config/bench_solo
|
||||
greyscale_colors = "#00CCFF"
|
||||
|
||||
/obj/structure/chair/sofa/bench/post_buckle_mob(mob/living/Mob)
|
||||
if(src.dir == EAST || WEST)
|
||||
|
||||
Reference in New Issue
Block a user