diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm index aadc086b085..29529d3f7d6 100644 --- a/code/controllers/subsystems/skybox.dm +++ b/code/controllers/subsystems/skybox.dm @@ -61,7 +61,7 @@ SUBSYSTEM_DEF(skybox) res.appearance_flags = KEEP_TOGETHER var/image/base = image(settings.icon, settings.icon_state) - //base.color = background_color + base.color = settings.color if(settings.use_stars) var/image/stars = image(settings.icon, settings.star_state) @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(skybox) if(global.using_map.use_overmap && settings.use_overmap_details) var/obj/effect/overmap/visitable/O = map_sectors["[z]"] if(istype(O)) - var/image/overmap = image(settings.icon_state) + var/image/overmap = image(settings.icon) overmap.overlays += O.generate_skybox() for(var/obj/effect/overmap/visitable/other in O.loc) if(other != O) diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 44a34fddec0..86876abe282 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -117,7 +117,7 @@ if(docking_codes) var/code = signal.data["code"] if(code != docking_codes) - testing("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]") + log_debug("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]") return control_mode = MODE_SERVER diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 095a327fe55..8169b64ad9b 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -1,7 +1,7 @@ /turf/space icon = 'icons/turf/space.dmi' name = "\proper space" - icon_state = "0" + icon_state = "default" dynamic_lighting = 0 plane = SPACE_PLANE diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 5f19e691f26..02c589e966d 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -1,5 +1,4 @@ /turf/space/transit - keep_sprite = TRUE can_build_into_floor = FALSE var/pushdirection // push things that get caught in the transit tile this direction @@ -7,61 +6,26 @@ /turf/space/transit/attackby(obj/O as obj, mob/user as mob) return +/turf/space/transit/Initialize() + . = ..() + toggle_transit(reverse_dir[pushdirection]) + //------------------------ /turf/space/transit/north // moving to the north icon_state = "arrow-north" pushdirection = SOUTH // south because the space tile is scrolling south -/turf/space/transit/north/Initialize() - . = ..() - - var/x_shift = SSskybox.phase_shift_by_x[src.x % (SSskybox.phase_shift_by_x.len - 1) + 1] - var/transit_state = (world.maxy - src.y + x_shift)%15 + 1 - - icon_state = "speedspace_ns_[transit_state]" -//------------------------ - /turf/space/transit/south // moving to the south icon_state = "arrow-south" pushdirection = SOUTH // south because the space tile is scrolling south -/turf/space/transit/south/Initialize() - . = ..() - - var/x_shift = SSskybox.phase_shift_by_x[src.x % (SSskybox.phase_shift_by_x.len - 1) + 1] - var/transit_state = (world.maxy - src.y + x_shift)%15 + 1 - - var/icon/I = new(icon, "speedspace_ns_[transit_state]") - I.Flip(SOUTH) - icon = I -//------------------------ - /turf/space/transit/east // moving to the east icon_state = "arrow-east" pushdirection = WEST -/turf/space/transit/east/Initialize() - . = ..() - - var/y_shift = SSskybox.phase_shift_by_y[src.y % (SSskybox.phase_shift_by_y.len - 1) + 1] - var/transit_state = (world.maxx - src.x + y_shift)%15 + 1 - - icon_state = "speedspace_ew_[transit_state]" -//------------------------ - /turf/space/transit/west // moving to the west icon_state = "arrow-west" pushdirection = WEST -/turf/space/transit/west/Initialize() - . = ..() - - var/y_shift = SSskybox.phase_shift_by_y[src.y % (SSskybox.phase_shift_by_y.len - 1) + 1] - var/transit_state = (world.maxx - src.x + y_shift)%15 + 1 - - var/icon/I = new(icon, "speedspace_ew_[transit_state]") - I.Flip(WEST) - icon = I - //------------------------ \ No newline at end of file diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 51ffef49241..cd57485cb7c 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) var/dy //coordinates var/speedlimit = 1/(20 SECONDS) //top speed for autopilot, 5 var/accellimit = 0.001 //manual limiter for acceleration - req_one_access = list(access_pilot) + req_one_access = list(access_pilot) //VOREStation Edit /obj/machinery/computer/ship/helm/Initialize() . = ..() diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 81d59070ac7..982872a1e22 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -113,7 +113,7 @@ /obj/machinery/shipsensors name = "sensors suite" - desc = "Long range gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." + desc = "Long range gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." //VOREStation Edit icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit icon_state = "sensors" anchored = 1 @@ -223,4 +223,4 @@ /obj/machinery/shipsensors/weak heat_reduction = 0.2 - desc = "Miniturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum BS elements." \ No newline at end of file + desc = "Miniaturized gravity scanner with various other sensors, used to detect irregularities in surrounding space. Can only run in vacuum to protect delicate quantum bluespace elements." \ No newline at end of file diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index a5876f55ddf..cad706c8001 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -48,3 +48,9 @@ /datum/shuttle/autodock/ferry/process_arrived() ..() next_location = get_location_waypoint(!location) + +// Ferry shuttles should generally always be able to dock. So read the docking codes off of the target. +/datum/shuttle/autodock/ferry/update_docking_target(var/obj/effect/shuttle_landmark/location) + ..() + if(active_docking_controller && active_docking_controller.docking_codes) + set_docking_codes(active_docking_controller.docking_codes) diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm index a90bae98023..ee258167960 100644 --- a/code/modules/shuttles/shuttle_supply.dm +++ b/code/modules/shuttles/shuttle_supply.dm @@ -79,9 +79,3 @@ /datum/shuttle/autodock/ferry/supply/proc/eta_minutes() var/ticksleft = arrive_time - world.time return round(ticksleft/600,1) - -// Read the docking codes off of the target to make sure we can always dock. -/datum/shuttle/autodock/ferry/supply/update_docking_target(var/obj/effect/shuttle_landmark/location) - ..() - if(active_docking_controller && active_docking_controller.docking_codes) - set_docking_codes(active_docking_controller.docking_codes) diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index b3f6a15d3bf..408264594c8 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm index 7cf3ac4dc79..c1d099af294 100644 --- a/maps/southern_cross/southern_cross_defines.dm +++ b/maps/southern_cross/southern_cross_defines.dm @@ -79,8 +79,10 @@ ) usable_email_tlds = list("freemail.nt") allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage") - unit_test_exempt_areas = list(/area/ninja_dojo, /area/ninja_dojo/firstdeck, /area/ninja_dojo/arrivals_dock) + default_skybox = /datum/skybox_settings/southern_cross + + unit_test_exempt_areas = list(/area/ninja_dojo, /area/ninja_dojo/firstdeck, /area/ninja_dojo/arrivals_dock) unit_test_exempt_from_atmos = list(/area/tcomm/chamber) planet_datums_to_make = list(/datum/planet/sif) @@ -127,6 +129,11 @@ // Todo: Forest generation. return 1 +// Skybox Settings +/datum/skybox_settings/southern_cross + icon_state = "dyable" + random_color = TRUE + // For making the 6-in-1 holomap, we calculate some offsets #define SOUTHERN_CROSS_MAP_SIZE 160 // Width and height of compiled in Southern Cross z levels. #define SOUTHERN_CROSS_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns