Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Requisitions elevator lighting fix #5204

Merged
merged 2 commits into from Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,25 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
/area/supply
ceiling = CEILING_METAL

/area/supply/station //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
/area/supply/station
name = "Supply Shuttle"
icon_state = "shuttle3"
base_lighting_alpha = 255
requires_power = 0
ambience_exterior = AMBIENCE_ALMAYER

/area/supply/dock //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
/area/supply/dock
name = "Supply Shuttle"
icon_state = "shuttle3"
base_lighting_alpha = 255
requires_power = 0

/area/supply/station_vehicle //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
/area/supply/station_vehicle
name = "Vehicle ASRS"
icon_state = "shuttle3"
base_lighting_alpha = 255
requires_power = 0

/area/supply/dock_vehicle //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
/area/supply/dock_vehicle
name = "Vehicle ASRS"
icon_state = "shuttle3"
base_lighting_alpha = 255
requires_power = 0

//SUPPLY PACKS MOVED TO /code/defines/obj/supplypacks.dm
Expand Down
6 changes: 3 additions & 3 deletions code/modules/shuttles/shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@
if(iselevator)
if(istype(T,/turf/open/space))
if(is_mainship_level(T.z))
new /turf/open/floor/almayer/empty(T)
T.ChangeTurf(/turf/open/floor/almayer/empty)
else
new /turf/open/gm/empty(T)
T.ChangeTurf(/turf/open/gm/empty)
else if(istype(T,/turf/open/space))
new /turf/open/floor/plating(T)
T.ChangeTurf(/turf/open/floor/plating)

return

Expand Down
Loading