diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 4d7613f41f192..ff543d316fe7b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -508,7 +508,7 @@ /obj/item/folder, /obj/item/paper, /obj/item/pen, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/pinpointer/radio, /obj/item/device/taperecorder, /obj/item/device/tape, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 187c309ef0793..286982fdf307c 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -208,7 +208,7 @@ /obj/item/pickaxe/xeno/hand, /obj/item/storage/bag/fossils, /obj/item/hand_labeler, - /obj/item/device/spaceflare + /obj/item/shuttle_beacon ) /obj/structure/closet/shipping_wall diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 03e826e341c9b..963fe3859bfae 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -23,11 +23,11 @@ var/shuttle_restricted var/flags = 0 + /obj/shuttle_landmark/Initialize() . = ..() if(docking_controller) . = INITIALIZE_HINT_LATELOAD - if(flags & SLANDMARK_FLAG_AUTOSET) base_area = get_area(src) var/turf/T = get_turf(src) @@ -35,10 +35,10 @@ base_turf = T.type else base_area = locate(base_area || world.area) - SetName(name + " ([x],[y])") SSshuttle.register_landmark(landmark_tag, src) + /obj/shuttle_landmark/LateInitialize(mapload) if(!docking_controller) return @@ -51,6 +51,7 @@ if(location && location.docking_codes) docking_controller.docking_codes = location.docking_codes + /obj/shuttle_landmark/forceMove() var/obj/overmap/visitable/map_origin = map_sectors["[z]"] . = ..() @@ -61,10 +62,12 @@ if(map_destination) map_destination.add_landmark(src, shuttle_restricted) + //Called when the landmark is added to an overmap sector. /obj/shuttle_landmark/proc/sector_set(obj/overmap/visitable/O, shuttle_name) shuttle_restricted = shuttle_name + /obj/shuttle_landmark/proc/is_valid(datum/shuttle/shuttle) if(shuttle.current_location == src) return FALSE @@ -78,12 +81,15 @@ return FALSE return TRUE + /obj/shuttle_landmark/proc/cannot_depart(datum/shuttle/shuttle) return FALSE + /obj/shuttle_landmark/proc/shuttle_arrived(datum/shuttle/shuttle) return + /proc/check_collision(area/target_area, list/target_turfs) for(var/target_turf in target_turfs) var/turf/target = target_turf @@ -95,28 +101,34 @@ return TRUE //dense turf return FALSE + //Self-naming/numbering ones. /obj/shuttle_landmark/automatic name = "Navpoint" landmark_tag = "navpoint" flags = SLANDMARK_FLAG_AUTOSET + /obj/shuttle_landmark/automatic/Initialize() landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]" return ..() + /obj/shuttle_landmark/automatic/sector_set(obj/overmap/visitable/O) ..() SetName("[O.name] - [initial(name)] ([x],[y])") + //Subtype that calls explosion on init to clear space for shuttles /obj/shuttle_landmark/automatic/clearing var/radius = LANDING_ZONE_RADIUS + /obj/shuttle_landmark/automatic/clearing/Initialize() ..() return INITIALIZE_HINT_LATELOAD + /obj/shuttle_landmark/automatic/clearing/LateInitialize(mapload) ..() for(var/turf/T in range(radius, src)) @@ -124,19 +136,72 @@ T.ChangeTurf(get_base_turf_by_area(T)) -/obj/item/device/spaceflare +/obj/shuttle_landmark/automatic/beacon + name = "Bluespace Beacon Signal" + /// The beacon object synced to this landmark. If this is ever null or qdeleted the landmark should delete itself. + var/obj/item/shuttle_beacon/beacon + + +/obj/shuttle_landmark/automatic/beacon/Initialize(mapload, obj/item/shuttle_beacon/beacon) + . = ..() + if (!istype(beacon)) + log_debug(append_admin_tools("\A [src] was initialized with an invalid or nonexistant beacon", location = get_turf(src))) + return INITIALIZE_HINT_QDEL + if (beacon.landmark && beacon.landmark != src) + log_debug(append_admin_tools("\A [src] was initialized with a beacon already has a synced landmark.", location = get_turf(src))) + return INITIALIZE_HINT_QDEL + src.beacon = beacon + GLOB.moved_event.register(beacon, src, /obj/shuttle_landmark/automatic/beacon/proc/update_beacon_moved) + + +/obj/shuttle_landmark/automatic/beacon/Destroy() + GLOB.moved_event.unregister(beacon, src, /obj/shuttle_landmark/automatic/beacon/proc/update_beacon_moved) + if (beacon?.active) + log_debug(append_admin_tools("\A [src] was destroyed with a still active beacon.", location = get_turf(beacon))) + beacon.deactivate() + beacon = null + return ..() + + +/// Event handler for when the beacon moves. Theoretically possible with a beacon deployed on a shuttle turf, or with adminbus. +/obj/shuttle_landmark/automatic/beacon/proc/update_beacon_moved(atom/movable/moving_instance, atom/old_loc, atom/new_loc) + if (!isturf(new_loc) || isspaceturf(new_loc) || isopenspace(new_loc)) + log_debug(append_admin_tools("\A [src]'s beacon was moved to a non-turf or unacceptable location.", location = get_turf(new_loc))) + beacon.deactivate() + return + forceMove(new_loc) + SetName("[initial(name)] ([x],[y])") + log_debug(append_admin_tools("\A [src]'s beacon was moved to [get_area(new_loc)].", location = get_turf(src))) + + +/// Desynchronizes the effect from the beacon, rendering it a permanent landmark. +/obj/shuttle_landmark/automatic/beacon/proc/desync_beacon() + GLOB.moved_event.unregister(beacon, src, /obj/shuttle_landmark/automatic/beacon/proc/update_beacon_moved) + if (beacon?.active) + beacon.deactivate(TRUE, TRUE) + beacon = null + + +/obj/item/shuttle_beacon name = "shuttle beacon" desc = "Burst transmitter used to broadcast all needed information for shuttle navigation systems. Has a bright blue light attached for marking the spot where you probably shouldn't be standing." icon = 'icons/obj/space_flare.dmi' icon_state = "packaged" light_color = "#3728ff" - /// Boolean. Whether or not the spaceflare has been activated. + + /// Boolean. Whether or not the beacon has been activated. var/active = FALSE + /// The shuttle landmark synced to this beacon. This is set when the beacon is activated. - var/obj/shuttle_landmark/automatic/spaceflare/landmark + var/obj/shuttle_landmark/automatic/beacon/landmark + + +/obj/item/shuttle_beacon/Destroy() + deactivate(TRUE) + return ..() -/obj/item/device/spaceflare/attack_self(mob/user) +/obj/item/shuttle_beacon/attack_self(mob/user) if (activate(user)) user.visible_message( SPAN_NOTICE("\The [user] plants \the [src] and activates it."), @@ -145,6 +210,28 @@ ) +/obj/item/shuttle_beacon/on_update_icon() + if (active) + icon_state = "deployed" + var/image/image = image(icon, "active") + image.plane = EFFECTS_ABOVE_LIGHTING_PLANE + image.layer = ABOVE_LIGHTING_LAYER + AddOverlays(image) + pixel_x = rand(-6, 6) + pixel_y = rand(-6, 6) + set_light(7, 0.7, "#85d1ff") + else + icon_state = initial(icon_state) + ClearOverlays() + set_light(0) + + +/obj/item/shuttle_beacon/shuttle_land_on() + if (active) + landmark.desync_beacon() + ..() + + /** * Handles activation of the flare. * @@ -153,26 +240,21 @@ * * Returns boolean - FALSE if the flare was not activated, TRUE if it was. */ -/obj/item/device/spaceflare/proc/activate(mob/user) +/obj/item/shuttle_beacon/proc/activate(mob/user) if (active) log_debug(append_admin_tools("\A [src] attempted to activate but was already active.", user, get_turf(src))) return FALSE - var/turf/T = get_turf(src) if (isspaceturf(T) || isopenspace(T)) if (user) to_chat(user, SPAN_WARNING("\The [src] needs to be activated on solid ground.")) return FALSE - if (istype(user) && !user.unEquip(src, T)) log_debug(append_admin_tools("\A [src] attempted to activate but could not be unequipped by the mob.", user, get_turf(src))) return FALSE - - // Just in case some other weird things happen that try to call activate on a non-turf location if (loc != T) log_debug(append_admin_tools("\A [src] attempted to activate but was not on a valid turf.", user, get_turf(src))) return FALSE - if (user) user.visible_message( SPAN_ITALIC("\The [user] starts setting up \a [src]."), @@ -196,94 +278,29 @@ * * Returns boolean - FALSE if the flare was not deactivated, TRUE if it was. */ -/obj/item/device/spaceflare/proc/deactivate(silent = FALSE, keep_landmark = FALSE) +/obj/item/shuttle_beacon/proc/deactivate(silent, skip_destroy_landmark) if (!active) return FALSE - active = FALSE anchored = FALSE - if (keep_landmark) - landmark = null - else + if (!skip_destroy_landmark) QDEL_NULL(landmark) + landmark = null update_icon() if (!silent) visible_message(SPAN_WARNING("\The [src] deactivates, going dark.")) return TRUE -/obj/item/device/spaceflare/on_update_icon() - if (active) - icon_state = "deployed" - var/image/image = image(icon, "active") - image.plane = EFFECTS_ABOVE_LIGHTING_PLANE - image.layer = ABOVE_LIGHTING_LAYER - AddOverlays(image) - pixel_x = rand(-6, 6) - pixel_y = rand(-6, 6) - set_light(7, 0.7, "#85d1ff") - else - icon_state = initial(icon_state) - ClearOverlays() - set_light(0) - - -/obj/item/device/spaceflare/Destroy() - deactivate(TRUE) - . = ..() - - -/obj/item/device/spaceflare/shuttle_land_on() - if (active) - // If a shuttle landed here we don't want to destroy the landmark, that breaks things. It becomes a permanent beacon smushed into the ground instead. - landmark.desync_flare() - ..() - - -/obj/shuttle_landmark/automatic/spaceflare - name = "Bluespace Beacon Signal" - /// The beacon object synced to this landmark. If this is ever null or qdeleted the landmark should delete itself. - var/obj/item/device/spaceflare/beacon +/obj/item/shuttle_beacon/active + active = TRUE + anchored = TRUE -/obj/shuttle_landmark/automatic/spaceflare/Initialize(mapload, obj/item/device/spaceflare/beacon) +/obj/item/shuttle_beacon/active/Initialize() . = ..() - - if (!istype(beacon)) - log_debug(append_admin_tools("\A [src] was initialized with an invalid or nonexistant beacon", location = get_turf(src))) - return INITIALIZE_HINT_QDEL - - if (beacon.landmark && beacon.landmark != src) - log_debug(append_admin_tools("\A [src] was initialized with a beacon already has a synced landmark.", location = get_turf(src))) + var/turf/turf = get_turf(src) + if (!turf) return INITIALIZE_HINT_QDEL - - src.beacon = beacon - GLOB.moved_event.register(beacon, src, TYPE_PROC_REF(/obj/shuttle_landmark/automatic/spaceflare, update_beacon_moved)) - - -/obj/shuttle_landmark/automatic/spaceflare/Destroy() - GLOB.moved_event.unregister(beacon, src, TYPE_PROC_REF(/obj/shuttle_landmark/automatic/spaceflare, update_beacon_moved)) - if (beacon?.active) - log_debug(append_admin_tools("\A [src] was destroyed with a still active beacon.", location = get_turf(beacon))) - beacon.deactivate() - beacon = null - . = ..() - - -/// Event handler for when the beacon moves. Theoretically possible with a beacon deployed on a shuttle turf, or with adminbus. -/obj/shuttle_landmark/automatic/spaceflare/proc/update_beacon_moved(atom/movable/moving_instance, atom/old_loc, atom/new_loc) - if (!isturf(new_loc) || isspaceturf(new_loc) || isopenspace(new_loc)) - log_debug(append_admin_tools("\A [src]'s beacon was moved to a non-turf or unacceptable location.", location = get_turf(new_loc))) - beacon.deactivate() - return - forceMove(new_loc) - SetName("[initial(name)] ([x],[y])") - log_debug(append_admin_tools("\A [src]'s beacon was moved to [get_area(new_loc)].", location = get_turf(src))) - - -/// Desynchronizes the effect from the beacon, rendering it a permanent landmark. -/obj/shuttle_landmark/automatic/spaceflare/proc/desync_flare() - GLOB.moved_event.unregister(beacon, src, TYPE_PROC_REF(/obj/shuttle_landmark/automatic/spaceflare, update_beacon_moved)) - if (beacon?.active) - beacon.deactivate(TRUE, TRUE) - beacon = null + landmark = new (turf, src) + update_icon() diff --git a/maps/antag_spawn/mercenary/mercenary_base.dmm b/maps/antag_spawn/mercenary/mercenary_base.dmm index 69c9af3eac1c4..f56e40cd7fb10 100644 --- a/maps/antag_spawn/mercenary/mercenary_base.dmm +++ b/maps/antag_spawn/mercenary/mercenary_base.dmm @@ -1839,9 +1839,9 @@ /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, /obj/item/inflatable_dispenser, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /obj/machinery/light{ dir = 4 }, diff --git a/maps/antag_spawn/vox/vox_raider.dmm b/maps/antag_spawn/vox/vox_raider.dmm index 4776ec505d1ce..247c6e95b20a6 100644 --- a/maps/antag_spawn/vox/vox_raider.dmm +++ b/maps/antag_spawn/vox/vox_raider.dmm @@ -121,8 +121,8 @@ /obj/item/device/multitool, /obj/item/device/multitool, /obj/item/stack/material/rods/fifty, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /obj/item/storage/backpack/weldpack, /obj/item/storage/backpack/weldpack, /obj/item/storage/backpack/dufflebag, diff --git a/maps/away/scavver/scavver_gantry-1.dmm b/maps/away/scavver/scavver_gantry-1.dmm index 86e783653fe96..6a5470be8dacc 100644 --- a/maps/away/scavver/scavver_gantry-1.dmm +++ b/maps/away/scavver/scavver_gantry-1.dmm @@ -504,7 +504,7 @@ /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /turf/simulated/floor, /area/scavver/gantry/down1) "iB" = ( diff --git a/maps/random_ruins/exoplanet_ruins/playablecolony2/colony2.dmm b/maps/random_ruins/exoplanet_ruins/playablecolony2/colony2.dmm index 4d3bb983c9bfa..073568322c19c 100644 --- a/maps/random_ruins/exoplanet_ruins/playablecolony2/colony2.dmm +++ b/maps/random_ruins/exoplanet_ruins/playablecolony2/colony2.dmm @@ -1825,8 +1825,8 @@ /obj/floor_decal/industrial/outline/yellow, /obj/item/wrench, /obj/item/wrench, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /turf/simulated/floor/reinforced{ map_airless = 1 }, diff --git a/maps/random_ruins/exoplanet_ruins/skrell_biodome/skrell_biodome.dmm b/maps/random_ruins/exoplanet_ruins/skrell_biodome/skrell_biodome.dmm index 2fc9e5036cc23..0fae1518415b0 100644 --- a/maps/random_ruins/exoplanet_ruins/skrell_biodome/skrell_biodome.dmm +++ b/maps/random_ruins/exoplanet_ruins/skrell_biodome/skrell_biodome.dmm @@ -1147,7 +1147,7 @@ /obj/item/device/radio/hailing, /obj/item/device/radio/hailing, /obj/item/gun/energy/gun/skrell, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /obj/machinery/light/skrell{ dir = 8 }, diff --git a/maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dmm b/maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dmm index a35ae005ff705..8a92b486463de 100644 --- a/maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dmm +++ b/maps/random_ruins/exoplanet_ruins/transshipment/transshipment.dmm @@ -181,7 +181,7 @@ "CD" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/alarm{pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse) "CV" = (/obj/machinery/vending/engineering{req_access = list(); dir = 4},/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse) "CY" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/map_template/transshipment/warehouse) -"De" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/table/rack,/obj/floor_decal/industrial/outline/grey,/obj/item/storage/briefcase/inflatable,/obj/item/device/spaceflare,/obj/item/device/spaceflare,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz) +"De" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/structure/table/rack,/obj/floor_decal/industrial/outline/grey,/obj/item/storage/briefcase/inflatable,/obj/item/shuttle_beacon,/obj/item/shuttle_beacon,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/techfloor/grid,/area/map_template/transshipment/old_snz) "Dj" = (/obj/machinery/door/blast/shutters/open{dir = 4; name = "Container Flaps"},/turf/simulated/floor/plating,/area/map_template/transshipment/smes_crate) "Dn" = (/obj/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse) "Dx" = (/obj/decal/cleanable/blood,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techmaint,/area/map_template/transshipment/warehouse) diff --git a/maps/sierra/_references/z1-3_sierra.dmm b/maps/sierra/_references/z1-3_sierra.dmm index f17b7f03426b2..a65b6eb134f7d 100644 --- a/maps/sierra/_references/z1-3_sierra.dmm +++ b/maps/sierra/_references/z1-3_sierra.dmm @@ -11319,8 +11319,8 @@ dir = 4 }, /obj/item/storage/box/glowsticks, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /turf/simulated/floor/tiled, /area/quartermaster/exploration) "cyA" = ( @@ -54856,7 +54856,7 @@ /obj/floor_decal/borderfloor/corner2, /obj/floor_decal/corner/brown/bordercorner2, /obj/floor_decal/industrial/outline/yellow, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /obj/item/device/radio, /obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled, @@ -65731,8 +65731,8 @@ /obj/random/maintenance, /obj/random/maintenance, /obj/floor_decal/industrial/outline/grey, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /turf/simulated/floor/tiled/techfloor/grid, /area/quartermaster/storage) "ogT" = ( @@ -111561,7 +111561,7 @@ dir = 6 }, /obj/floor_decal/industrial/outline/yellow, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /obj/item/device/radio, /obj/item/storage/belt/utility/full, /turf/simulated/floor/tiled, diff --git a/maps/sierra/structures/closets.dm b/maps/sierra/structures/closets.dm index 65a6987e047af..54c3a1ae4ce63 100644 --- a/maps/sierra/structures/closets.dm +++ b/maps/sierra/structures/closets.dm @@ -25,7 +25,7 @@ /obj/item/storage/bag/fossils, /obj/item/hand_labeler, /obj/item/taperoll/research, - /obj/item/device/spaceflare + /obj/item/shuttle_beacon ) /obj/structure/closet/wardrobe/ptgear diff --git a/maps/sierra/structures/closets/exploration.dm b/maps/sierra/structures/closets/exploration.dm index 88081f1e7565d..5b8ed350ca06c 100644 --- a/maps/sierra/structures/closets/exploration.dm +++ b/maps/sierra/structures/closets/exploration.dm @@ -16,7 +16,7 @@ /obj/item/taperoll/research, /obj/item/material/hatchet/machete/deluxe, /obj/item/storage/belt/holster/machete, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/taperecorder, /obj/item/device/scanner/gas, @@ -46,7 +46,7 @@ /obj/item/device/gps, /obj/item/taperoll/research, /obj/item/storage/belt/holster/machete, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, /obj/item/device/radio/headset/exploration, @@ -68,7 +68,7 @@ /obj/item/device/radio, /obj/item/device/gps, /obj/item/storage/belt/utility/full, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/holster/machete, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, @@ -93,7 +93,7 @@ /obj/item/device/radio, /obj/item/device/gps, /obj/item/storage/belt/medical/emt, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/holster/machete, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, @@ -120,7 +120,7 @@ /obj/item/device/gps, /obj/item/storage/belt/utility/full, /obj/item/device/multitool, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/holster/machete, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 8365b10a82493..69d119e8d27f9 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -27996,7 +27996,7 @@ /area/rnd/storage) "edI" = ( /obj/structure/closet/secure_closet/prospector, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /obj/item/device/radio, /obj/item/storage/belt/utility/full, /obj/floor_decal/borderfloor{ @@ -35516,7 +35516,7 @@ /area/hallway/primary/firstdeck/aft) "fjo" = ( /obj/structure/closet/secure_closet/prospector, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, /obj/item/device/radio, /obj/item/storage/belt/utility/full, /obj/floor_decal/borderfloor{ @@ -117327,8 +117327,8 @@ /obj/random/maintenance, /obj/random/maintenance, /obj/random/maintenance, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /obj/item/device/radio/intercom{ dir = 8; pixel_x = 24 @@ -148846,8 +148846,8 @@ /obj/item/stack/flag/yellow, /obj/item/stack/flag/yellow, /obj/item/storage/box/glowsticks, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/exploration/eva) "wiF" = ( diff --git a/maps/torch/structures/closets.dm b/maps/torch/structures/closets.dm index d3d5d36085327..4a16267e7ffcd 100644 --- a/maps/torch/structures/closets.dm +++ b/maps/torch/structures/closets.dm @@ -25,7 +25,7 @@ /obj/item/storage/bag/fossils, /obj/item/hand_labeler, /obj/item/taperoll/research, - /obj/item/device/spaceflare + /obj/item/shuttle_beacon ) /obj/structure/closet/wardrobe/ptgear diff --git a/maps/torch/structures/closets/exploration.dm b/maps/torch/structures/closets/exploration.dm index 0c7e76da7d6ec..d258cef66a6b9 100644 --- a/maps/torch/structures/closets/exploration.dm +++ b/maps/torch/structures/closets/exploration.dm @@ -39,7 +39,7 @@ /obj/item/taperoll/research, /obj/item/material/hatchet/machete/deluxe, /obj/item/storage/belt/holster/machete, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/taperecorder, /obj/item/device/scanner/gas, @@ -66,7 +66,7 @@ /obj/item/device/gps, /obj/item/taperoll/research, /obj/item/storage/belt/holster/machete, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, /obj/item/device/radio/headset/exploration, @@ -90,7 +90,7 @@ /obj/item/device/radio, /obj/item/device/gps, /obj/item/storage/belt/utility/full, - /obj/item/device/spaceflare, + /obj/item/shuttle_beacon, /obj/item/clothing/accessory/storage/webbing_large, /obj/item/device/scanner/gas, /obj/item/device/radio/headset/headset_pilot, diff --git a/maps/torch/torch1_deck5.dmm b/maps/torch/torch1_deck5.dmm index 60bde1ba40c32..7d070398aa235 100644 --- a/maps/torch/torch1_deck5.dmm +++ b/maps/torch/torch1_deck5.dmm @@ -1659,8 +1659,8 @@ /obj/item/device/radio, /obj/item/device/radio, /obj/item/device/radio, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/monotile, /area/exploration_shuttle/medical) @@ -4352,14 +4352,14 @@ pixel_x = -10; pixel_y = 8 }, -/obj/item/device/spaceflare{ +/obj/item/shuttle_beacon{ pixel_x = 5; pixel_y = -3 }, -/obj/item/device/spaceflare{ +/obj/item/shuttle_beacon{ pixel_y = -2 }, -/obj/item/device/spaceflare{ +/obj/item/shuttle_beacon{ pixel_x = -5; pixel_y = -1 }, diff --git a/mods/_maps/farfleet/maps/farfleet-2.dmm b/mods/_maps/farfleet/maps/farfleet-2.dmm index 887b2a0393e96..573a09a1d56cf 100644 --- a/mods/_maps/farfleet/maps/farfleet-2.dmm +++ b/mods/_maps/farfleet/maps/farfleet-2.dmm @@ -5098,8 +5098,8 @@ /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/snz) "WY" = ( diff --git a/mods/_maps/sentinel/maps/sentinel-1.dmm b/mods/_maps/sentinel/maps/sentinel-1.dmm index 074e89d0add67..0bcef473cc9c2 100644 --- a/mods/_maps/sentinel/maps/sentinel-1.dmm +++ b/mods/_maps/sentinel/maps/sentinel-1.dmm @@ -5252,8 +5252,8 @@ /obj/structure/table/rack, /obj/item/storage/briefcase/inflatable, /obj/item/storage/briefcase/inflatable, -/obj/item/device/spaceflare, -/obj/item/device/spaceflare, +/obj/item/shuttle_beacon, +/obj/item/shuttle_beacon, /obj/item/clothing/head/helmet/solgov/pilot/fleet, /turf/simulated/floor/tiled/techfloor, /area/ship/reaper)