mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 08:29:57 +01:00
Replaces our lighting system with CM's. (#21465)
Depends on #21458. Ports https://github.com/cmss13-devs/cmss13/pull/4229, with the original authors as: - https://github.com/tgstation/TerraGov-Marine-Corps/pull/1964 for the lighting controller (A-lexa) - https://github.com/tgstation/TerraGov-Marine-Corps/pull/4747 and https://github.com/tgstation/TerraGov-Marine-Corps/pull/7263 for the lighting (TiviPlus) - https://github.com/tgstation/tgstation/pull/54520 for the dir lighting component - https://github.com/tgstation/tgstation/pull/75018 for the out of bounds fix in lighting - https://github.com/tgstation/TerraGov-Marine-Corps/pull/6678 for the emissives (TiviPlus) The main driving reason behind this is that current lighting consumes way too much processing power, especially for things like odysseys/away sites where a billion light sources are processing/moving at once and the game slows down to a crawl. Hopefully this improves the situation by a good margin, but we will need some testmerging to confirm that. <img width="1349" height="1349" alt="image" src="https://github.com/user-attachments/assets/1059ba2b-c0c5-495a-9c76-2d75d0c42bf2" /> <img width="1349" height="1349" alt="image" src="https://github.com/user-attachments/assets/9704b0f6-4cf6-4dfd-a6cb-5702ad07d677" /> - [x] Resolve todos - [x] Look into open space fuckery (border objects) --------- Co-authored-by: Matt Atlas <liermattia@gmail.com> Co-authored-by: JohnWildkins <john.wildkins@gmail.com>
This commit is contained in:
co-authored by
Matt Atlas
JohnWildkins
parent
8ebd7c9ad5
commit
94d92803b4
@@ -40,6 +40,10 @@
|
||||
. += "Click-drag yourself onto the animal to climb onto it."
|
||||
. += "Click-drag it onto yourself to access its mounted storage."
|
||||
|
||||
/obj/vehicle/animal/Destroy()
|
||||
QDEL_NULL(storage_compartment)
|
||||
return ..()
|
||||
|
||||
/obj/vehicle/animal/setup_vehicle()
|
||||
..()
|
||||
on = TRUE
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
/obj/vehicle/bike/Destroy()
|
||||
QDEL_NULL(key)
|
||||
QDEL_NULL(ion)
|
||||
QDEL_NULL(storage_compartment)
|
||||
return ..()
|
||||
|
||||
/obj/vehicle/bike/setup_vehicle()
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
var/obj/item/key/key
|
||||
var/key_type = /obj/item/key/cargo_train
|
||||
|
||||
/obj/vehicle/train/cargo/engine/Destroy()
|
||||
QDEL_NULL(key)
|
||||
return ..()
|
||||
|
||||
/obj/vehicle/train/cargo/engine/mechanics_hints(mob/user, distance, is_adjacent)
|
||||
. += ..()
|
||||
. += "Click-drag yourself onto the truck to climb onto it."
|
||||
|
||||
@@ -50,6 +50,10 @@
|
||||
. = ..()
|
||||
setup_vehicle()
|
||||
|
||||
/obj/vehicle/Destroy()
|
||||
QDEL_NULL(cell)
|
||||
return ..()
|
||||
|
||||
/obj/vehicle/proc/setup_vehicle()
|
||||
LAZYADD(can_buckle, /mob/living)
|
||||
|
||||
@@ -198,13 +202,15 @@
|
||||
if(powered && cell?.charge < charge_use && !organic)
|
||||
return FALSE
|
||||
on = TRUE
|
||||
set_light(initial(light_range))
|
||||
set_light_range_power_color(initial(light_range))
|
||||
set_light_on(on)
|
||||
update_icon()
|
||||
return TRUE
|
||||
|
||||
/obj/vehicle/proc/turn_off()
|
||||
on = FALSE
|
||||
set_light(0)
|
||||
set_light_range_power_color(0)
|
||||
set_light_on(on)
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/emag_act(var/remaining_charges, mob/user as mob)
|
||||
|
||||
Reference in New Issue
Block a user