diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 78f8569cb4f..be8639e4bcc 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -95,7 +95,7 @@ data["real_name"] = user.real_name data["allow_items"] = allow_items data["crew"] = frozen_crew - + var/list/items = list() if(allow_items) for(var/F in frozen_items) @@ -250,6 +250,10 @@ /obj/machinery/cryopod/robot/door/dorms name = "Residential District Elevator" desc = "A small elevator that goes down to the deeper section of the colony." + icon = 'icons/obj/Cryogenic2_vr.dmi' + icon_state = "lift_closed" + base_icon_state = "lift_open" + occupied_icon_state = "lift_closed" on_store_message = "has departed for the residential district." on_store_name = "Residential Oversight" on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the residential district." @@ -259,6 +263,10 @@ /obj/machinery/cryopod/robot/door/travel name = "Passenger Elevator" desc = "A small elevator that goes down to the passenger section of the vessel." + icon = 'icons/obj/Cryogenic2_vr.dmi' + icon_state = "lift_closed" + base_icon_state = "lift_open" + occupied_icon_state = "lift_closed" on_store_message = "is slated to depart from the colony." on_store_name = "Travel Oversight" on_enter_occupant_message = "The elevator door closes slowly, ready to bring you down to the hell that is economy class travel." @@ -491,7 +499,7 @@ for(var/datum/data/record/G in data_core.general) if((G.fields["name"] == to_despawn.real_name)) qdel(G) - + // Also check the hidden version of each datacore, if they're an offmap role. var/datum/job/J = SSjob.get_job(job) if(J?.offmap_spawn) diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm index 31f4681da90..2de10aeb386 100644 --- a/code/game/turfs/simulated/fancy_shuttles.dm +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -301,6 +301,16 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /obj/effect/fancy_shuttle_floor_preview/delivery icon = 'icons/turf/fancy_shuttles/delivery_preview.dmi' +/** + * Tether Cargo shuttle + * North facing: W:8, H:12 + */ +/obj/effect/fancy_shuttle/tether_cargo + icon = 'icons/turf/fancy_shuttles/tether_cargo_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/tether_cargo.dmi' +/obj/effect/fancy_shuttle_floor_preview/tether_cargo + icon = 'icons/turf/fancy_shuttles/tether_cargo_preview.dmi' + /** * Wagon * North facing: W:5, H:13 diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index bd4fdca8148..22af37dd531 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -9,4 +9,9 @@ icon_state = "rockvault" /turf/unsimulated/floor/shuttle_ceiling - icon_state = "reinforced" \ No newline at end of file + icon_state = "reinforced" + +/turf/unsimulated/elevator_shaft + name = "floor" + icon = 'icons/turf/floors.dmi' + icon_state = "elevatorshaft" \ No newline at end of file diff --git a/code/game/turfs/unsimulated/planetary_vr.dm b/code/game/turfs/unsimulated/planetary_vr.dm index 17c33b75254..b82342ea0a4 100644 --- a/code/game/turfs/unsimulated/planetary_vr.dm +++ b/code/game/turfs/unsimulated/planetary_vr.dm @@ -52,8 +52,16 @@ alpha = 0xFF VIRGO3B_SET_ATMOS +//other set - for map building +/turf/unsimulated/wall2/planetary/virgo3b_better + icon_state = "riveted2" + /turf/unsimulated/wall/planetary/virgo3b_better name = "facility wall" desc = "An eight-meter tall carbyne wall. For when the wildlife on your planet is mostly militant megacorps." alpha = 0xFF VIRGO3BB_SET_ATMOS + +//other set - for map building +/turf/unsimulated/wall2/planetary/virgo3b_better + icon_state = "riveted2" \ No newline at end of file diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm index 878a12404ae..dce3c345bb7 100644 --- a/code/game/turfs/unsimulated/walls.dm +++ b/code/game/turfs/unsimulated/walls.dm @@ -6,10 +6,22 @@ density = TRUE blocks_air = TRUE +//other set - for map building +/turf/unsimulated/wall/wall1 + icon_state = "riveted1" + +/turf/unsimulated/wall/wall2 + icon_state = "riveted2" + /turf/unsimulated/wall/fakeglass name = "window" icon_state = "fakewindows" opacity = 0 +//other set - for map building +/turf/unsimulated/wall/fakeglass2 + icon_state = "fakewindows2" + opacity = 0 + /turf/unsimulated/wall/other icon_state = "r_wall" \ No newline at end of file diff --git a/icons/obj/Cryogenic2_vr.dmi b/icons/obj/Cryogenic2_vr.dmi index 69d24bc15e8..e4b88cb6359 100644 Binary files a/icons/obj/Cryogenic2_vr.dmi and b/icons/obj/Cryogenic2_vr.dmi differ diff --git a/icons/turf/fancy_shuttles/tether_cargo.dmi b/icons/turf/fancy_shuttles/tether_cargo.dmi new file mode 100644 index 00000000000..b65e9a0e6c7 Binary files /dev/null and b/icons/turf/fancy_shuttles/tether_cargo.dmi differ diff --git a/icons/turf/fancy_shuttles/tether_cargo_preview.dmi b/icons/turf/fancy_shuttles/tether_cargo_preview.dmi new file mode 100644 index 00000000000..48ef0cb78fa Binary files /dev/null and b/icons/turf/fancy_shuttles/tether_cargo_preview.dmi differ diff --git a/icons/turf/transit_vr.dmi b/icons/turf/transit_vr.dmi index 4b7339548ee..b4bdfc19530 100644 Binary files a/icons/turf/transit_vr.dmi and b/icons/turf/transit_vr.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index e3fc2202e9b..86243a853ff 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ