diff --git a/code/modules/admin/secrets/random_events/gravity_vr.dm b/code/modules/admin/secrets/random_events/gravity_vr.dm new file mode 100644 index 0000000000..fc0c854c19 --- /dev/null +++ b/code/modules/admin/secrets/random_events/gravity_vr.dm @@ -0,0 +1,34 @@ +/********** +* Gravity * +**********/ +/datum/admin_secret_item/random_event/gravity + name = "Toggle Station Artificial Gravity" + +/datum/admin_secret_item/random_event/gravity/can_execute(var/mob/user) + if(!(ticker && ticker.mode)) + return 0 + + return ..() + +/datum/admin_secret_item/random_event/gravity/execute(var/mob/user) + . = ..() + if(!.) + return + + gravity_is_on = !gravity_is_on + for(var/obj/machinery/gravity_generator/main/GG in machines) + if(GG.z in using_map.station_levels) + GG.breaker = gravity_is_on + GG.set_power() + GG.charge_count = gravity_is_on ? 90 : 10 + + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","Grav") + if(gravity_is_on) + log_admin("[key_name(user)] toggled gravity on.", 1) + message_admins("[key_name_admin(user)] toggled gravity on.", 1) + command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.") + else + log_admin("[key_name(user)] toggled gravity off.", 1) + message_admins("[key_name_admin(usr)] toggled gravity off.", 1) + command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled. Please wait for the system to reinitialize, or contact your engineering department.", "Gravity Failure") diff --git a/code/modules/events/gravity_vr.dm b/code/modules/events/gravity_vr.dm new file mode 100644 index 0000000000..314a23a3aa --- /dev/null +++ b/code/modules/events/gravity_vr.dm @@ -0,0 +1,38 @@ +/datum/event/gravity + announceWhen = 5 + var/list/zLevels + var/list/generators = list() + +/datum/event/gravity/setup() + endWhen = rand(5 MINUTES, 20 MINUTES) + // Setup which levels we will disrupt gravit on. + zLevels = using_map.station_levels.Copy() + for(var/datum/planet/P in SSplanets.planets) + zLevels -= P.expected_z_levels + +/datum/event/gravity/announce() + command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled. Please wait for the system to reinitialize, or contact your engineering department.", "Gravity Failure") + +/datum/event/gravity/start() + gravity_is_on = 0 + + for(var/obj/machinery/gravity_generator/main/GG in machines) + if((GG.z in zLevels) && GG.on) + generators += GG + GG.breaker = FALSE + GG.set_power() + GG.charge_count = 10 + +/datum/event/gravity/end() + gravity_is_on = 1 + + var/did_anything = FALSE + for(var/obj/machinery/gravity_generator/main/GG in generators) + if(!GG.on) + GG.breaker = TRUE + GG.set_power() + GG.charge_count = 90 + did_anything = TRUE + + if(did_anything) + command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored") diff --git a/code/modules/gamemaster/event2/events/everyone/gravity_vr.dm b/code/modules/gamemaster/event2/events/everyone/gravity_vr.dm new file mode 100644 index 0000000000..bb3b824d98 --- /dev/null +++ b/code/modules/gamemaster/event2/events/everyone/gravity_vr.dm @@ -0,0 +1,45 @@ +/datum/event2/meta/gravity + name = "gravity failure" + departments = list(DEPARTMENT_EVERYONE) + chaos = 20 + chaotic_threshold = EVENT_CHAOS_THRESHOLD_LOW_IMPACT + reusable = TRUE + event_type = /datum/event2/event/gravity + +/datum/event2/meta/gravity/get_weight() + return (20 + (metric.count_people_in_department(DEPARTMENT_EVERYONE) * 20)) / (times_ran + 1) + + + + +/datum/event2/event/gravity + length_lower_bound = 5 MINUTES + length_upper_bound = 20 MINUTES + var/list/generators = list() + +/datum/event2/event/gravity/announce() + command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled. Please wait for the system to reinitialize, or contact your engineering department.", "Gravity Failure") + +/datum/event2/event/gravity/start() + gravity_is_on = 0 + + for(var/obj/machinery/gravity_generator/main/GG in machines) + if((GG.z in get_location_z_levels()) && GG.on) + generators += GG + GG.breaker = FALSE + GG.set_power() + GG.charge_count = 10 + +/datum/event2/event/gravity/end() + gravity_is_on = 1 + + var/did_anything = FALSE + for(var/obj/machinery/gravity_generator/main/GG in generators) + if(!GG.on) + GG.breaker = TRUE + GG.set_power() + GG.charge_count = 90 + did_anything = TRUE + + if(did_anything) + command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored") \ No newline at end of file diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm new file mode 100644 index 0000000000..ae677eaf70 --- /dev/null +++ b/code/modules/power/gravitygenerator_vr.dm @@ -0,0 +1,441 @@ + +GLOBAL_LIST_EMPTY(gravity_generators) + +// +// Gravity Generator +// + +#define POWER_IDLE 0 +#define POWER_UP 1 +#define POWER_DOWN 2 + +#define GRAV_NEEDS_SCREWDRIVER 0 +#define GRAV_NEEDS_WELDING 1 +#define GRAV_NEEDS_PLASTEEL 2 +#define GRAV_NEEDS_WRENCH 3 + +// +// Abstract Generator +// + +/obj/machinery/gravity_generator + name = "gravitational generator" + desc = "A device which produces a graviton field when set up." + icon = 'icons/obj/machines/gravity_generator.dmi' + anchored = TRUE + density = TRUE + use_power = USE_POWER_OFF + var/sprite_number = 0 + + pixel_y = 16 + +/obj/machinery/gravity_generator/ex_act(severity, target) + if(severity == 1) // Very sturdy. + set_broken() + +/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B) + if(prob(20)) + set_broken() + +/obj/machinery/gravity_generator/tesla_act(power, tesla_flags) + ..() + qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over + +/obj/machinery/gravity_generator/update_icon() + icon_state = "[get_status()]_[sprite_number]" + +/obj/machinery/gravity_generator/proc/get_status() + return "off" + +// You aren't allowed to move. +/obj/machinery/gravity_generator/Move() + . = ..() + qdel(src) + +/obj/machinery/gravity_generator/proc/set_broken() + stat |= BROKEN + +/obj/machinery/gravity_generator/proc/set_fix() + stat &= ~BROKEN + +/obj/machinery/gravity_generator/part/Destroy() + if(main_part) + qdel(main_part) + set_broken() + return ..() + +// +// Part generator which is mostly there for looks +// + +/obj/machinery/gravity_generator/part + var/obj/machinery/gravity_generator/main/main_part = null + +/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params) + return main_part.attackby(I, user) + +/obj/machinery/gravity_generator/part/get_status() + return main_part?.get_status() + +/obj/machinery/gravity_generator/part/attack_hand(mob/user) + return main_part.attack_hand(user) + +/obj/machinery/gravity_generator/part/set_broken() + ..() + if(main_part && !(main_part.stat & BROKEN)) + main_part.set_broken() + +// +// Generator which spawns with the station. +// + +/obj/machinery/gravity_generator/main/station/Initialize() + . = ..() + setup_parts() + middle.add_overlay("activated") + use_power = USE_POWER_ACTIVE + +// +// Generator an admin can spawn +// +/obj/machinery/gravity_generator/main/station/admin + use_power = USE_POWER_OFF + +// +// Main Generator with the main code +// + +/obj/machinery/gravity_generator/main + icon_state = "on_8" + idle_power_usage = 0 + active_power_usage = 3000 + power_channel = ENVIRON + sprite_number = 8 + use_power = USE_POWER_IDLE + + var/on = TRUE + var/breaker = TRUE + var/list/parts = list() + var/obj/middle = null + var/charging_state = POWER_IDLE + var/charge_count = 100 + var/current_overlay = null + var/broken_state = 0 + var/setting = 1 //Gravity value when on + var/list/levels = list() + var/list/areas = list() + +/obj/machinery/gravity_generator/main/Initialize() + . = ..() + update_list() + update_areas() + +/obj/machinery/gravity_generator/main/set_fix() + . = ..() + update_list() + update_areas() + +/obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts. + investigate_log("was destroyed!", "gravity") + on = FALSE + update_list() + if(!gravity_in_level()) + update_gravity(FALSE) + for(var/obj/machinery/gravity_generator/part/O in parts) + O.main_part = null + if(!QDESTROYING(O)) + qdel(O) + return ..() + +/obj/machinery/gravity_generator/main/proc/setup_parts() + var/turf/our_turf = get_turf(src) + // 9x9 block obtained from the bottom middle of the block + var/list/spawn_turfs = block(locate(our_turf.x - 1, our_turf.y + 2, our_turf.z), locate(our_turf.x + 1, our_turf.y, our_turf.z)) + var/count = 10 + for(var/turf/T in spawn_turfs) + count-- + if(T == our_turf) // Skip our turf. + continue + var/obj/machinery/gravity_generator/part/part = new(T) + if(count == 5) // Middle + middle = part + if(count <= 3) // Their sprite is the top part of the generator + part.density = FALSE + part.plane = MOB_PLANE + part.layer = ABOVE_MOB_LAYER + part.sprite_number = count + part.main_part = src + parts += part + part.update_icon() + +/obj/machinery/gravity_generator/main/proc/connected_parts() + return parts.len == 8 + +/obj/machinery/gravity_generator/main/set_broken() + ..() + for(var/obj/machinery/gravity_generator/M in parts) + if(!(M.stat & BROKEN)) + M.set_broken() + middle.cut_overlays() + charge_count = 0 + breaker = FALSE + set_power() + set_state(0) + investigate_log("has broken down.", "gravity") + +/obj/machinery/gravity_generator/main/set_fix() + ..() + for(var/obj/machinery/gravity_generator/M in parts) + if(M.stat & BROKEN) + M.set_fix() + broken_state = FALSE + update_icon() + set_power() + +// Interaction + +// Fixing the gravity generator. +/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params) + switch(broken_state) + if(GRAV_NEEDS_SCREWDRIVER) + if(I.is_screwdriver()) + to_chat(user, "You secure the screws of the framework.") + playsound(src, I.usesound, 75, 1) + broken_state++ + update_icon() + return + if(GRAV_NEEDS_WELDING) + if(I.is_welder()) + var/obj/item/weapon/weldingtool/W = I + if(W.remove_fuel(0,user)) + to_chat(user, "You mend the damaged framework.") + broken_state++ + update_icon() + return + if(GRAV_NEEDS_PLASTEEL) + if(istype(I, /obj/item/stack/material/plasteel)) + var/obj/item/stack/material/plasteel/PS = I + if(PS.get_amount() >= 10) + PS.use(10) + to_chat(user, "You add the plating to the framework.") + playsound(src.loc, 'sound/machines/click.ogg', 75, 1) + broken_state++ + update_icon() + else + to_chat(user, "You need 10 sheets of plasteel!") + return + if(GRAV_NEEDS_WRENCH) + if(I.is_wrench()) + to_chat(user, "You secure the plating to the framework.") + playsound(src, I.usesound, 75, 1) + set_fix() + return + return ..() + +/obj/machinery/gravity_generator/main/attack_hand(mob/user) + if((. = ..())) + return + if(CanUseTopic(user, global.default_state) > STATUS_CLOSE) + ui_interact(user) + return TRUE + +/obj/machinery/gravity_generator/main/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) + var/data[0] + + data["breaker"] = breaker + data["charge_count"] = charge_count + data["charging_state"] = charging_state + data["on"] = on + data["operational"] = (stat & BROKEN) ? FALSE : TRUE + + ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) + if (!ui) + ui = new(user, src, ui_key, "gravity_generator.tmpl", src.name, 500, 400) + ui.set_initial_data(data) + ui.open() + ui.set_auto_update(1) + +/obj/machinery/gravity_generator/main/Topic(href, href_list, datum/topic_state/state = default_state) + if((. = ..())) + return + + if(href_list["gentoggle"]) + breaker = !breaker + investigate_log("was toggled [breaker ? "ON" : "OFF"] by [key_name(usr)].", "gravity") + set_power() + return TOPIC_REFRESH + +// Power and Icon States + +/obj/machinery/gravity_generator/main/power_change() + ..() + investigate_log("has [stat & NOPOWER ? "lost" : "regained"] power.", "gravity") + set_power() + +/obj/machinery/gravity_generator/main/get_status() + if(stat & BROKEN) + return "fix[min(broken_state, 3)]" + return on || charging_state != POWER_IDLE ? "on" : "off" + +// Set the charging state based on power/breaker. +/obj/machinery/gravity_generator/main/proc/set_power() + var/new_state = FALSE + if(stat & (NOPOWER|BROKEN) || !breaker) + new_state = FALSE + else if(breaker) + new_state = TRUE + + charging_state = new_state ? POWER_UP : POWER_DOWN // Startup sequence animation. + investigate_log("is now [charging_state == POWER_UP ? "charging" : "discharging"].", "gravity") + update_icon() + +// Set the state of the gravity. +/obj/machinery/gravity_generator/main/proc/set_state(new_state) + charging_state = POWER_IDLE + on = new_state + use_power = on ? USE_POWER_ACTIVE : USE_POWER_IDLE + // Sound the alert if gravity was just enabled or disabled. + var/alert = FALSE + if(SSticker.IsRoundInProgress()) + if(on) // If we turned on and the game is live. + if(gravity_in_level() == FALSE) + alert = TRUE + investigate_log("was brought online and is now producing gravity for this level.", "gravity") + message_admins("The gravity generator was brought online [ADMIN_JMP(src)]") + else + if(gravity_in_level() == TRUE) + alert = TRUE + investigate_log("was brought offline and there is now no gravity for this level.", "gravity") + message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_JMP(src)]") + + update_list() + update_gravity(on) + update_icon() + src.updateUsrDialog() + if(alert) + shake_everyone() + +// Charge/Discharge and turn on/off gravity when you reach 0/100 percent. +// Also emit radiation and handle the overlays. +/obj/machinery/gravity_generator/main/process() + if(stat & BROKEN) + return + if(charging_state != POWER_IDLE) + if(charging_state == POWER_UP && charge_count >= 100) + set_state(1) + else if(charging_state == POWER_DOWN && charge_count <= 0) + set_state(0) + else + if(charging_state == POWER_UP) + charge_count += 2 + else if(charging_state == POWER_DOWN) + charge_count -= 2 + + if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging. + playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1) + + updateDialog() + if(prob(25)) // To help stop "Your clothes feel warm." spam. + pulse_radiation() + + var/overlay_state = null + switch(charge_count) + if(0 to 20) + overlay_state = null + if(21 to 40) + overlay_state = "startup" + if(41 to 60) + overlay_state = "idle" + if(61 to 80) + overlay_state = "activating" + if(81 to 100) + overlay_state = "activated" + + if(overlay_state != current_overlay) + if(middle) + middle.cut_overlays() + if(overlay_state) + middle.add_overlay(overlay_state) + current_overlay = overlay_state + + +/obj/machinery/gravity_generator/main/proc/pulse_radiation() + SSradiation.radiate(src, 200) + +/obj/machinery/gravity_generator/main/proc/update_gravity(var/on) + for(var/area/A in src.areas) + A.gravitychange(on) + +// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged. +/obj/machinery/gravity_generator/main/proc/shake_everyone() + var/sound/alert_sound = sound('sound/effects/alert.ogg') + for(var/i in player_list) + var/mob/M = i + if(!(M.z in levels)) + continue + M.update_gravity(M.mob_has_gravity()) + if(M.client) + shake_camera(M, 15, 1) + M.playsound_local(src, null, 100, 1, 0.5, S = alert_sound) + +/obj/machinery/gravity_generator/main/proc/gravity_in_level() + var/my_z = get_z(src) + if(!my_z) + return FALSE + if(GLOB.gravity_generators["[my_z]"]) + return length(GLOB.gravity_generators["[my_z]"]) + return FALSE + +/obj/machinery/gravity_generator/main/proc/update_list() + levels.Cut() + var/my_z = get_z(src) + + //Actually doing it special this time instead of letting using_map decide + if(using_map.use_overmap) + var/obj/effect/overmap/visitable/S = get_overmap_sector(my_z) + if(S) + levels = S.get_space_zlevels() //Just the spacey ones + else + levels = GetConnectedZlevels(my_z) + else + levels = GetConnectedZlevels(my_z) + + for(var/z in levels) + if(!GLOB.gravity_generators["[z]"]) + GLOB.gravity_generators["[z]"] = list() + if(on) + GLOB.gravity_generators["[z]"] |= src + else + GLOB.gravity_generators["[z]"] -= src + +/obj/machinery/gravity_generator/main/proc/update_areas() + areas.Cut() + for(var/area/A) + if(A.z in levels) + areas += A + +// Misc +/* +/obj/item/paper/guides/jobs/engi/gravity_gen + name = "paper- 'Generate your own gravity!'" + info = {"

Gravity Generator Instructions For Dummies

+

Surprisingly, gravity isn't that hard to make! All you have to do is inject deadly radioactive minerals into a ball of + energy and you have yourself gravity! You can turn the machine on or off when required but you must remember that the generator + will EMIT RADIATION when charging or discharging, you can tell it is charging or discharging by the noise it makes, so please WEAR PROTECTIVE CLOTHING.

+
+

It blew up!

+

Don't panic! The gravity generator was designed to be easily repaired. If, somehow, the sturdy framework did not survive then + please proceed to panic; otherwise follow these steps.

    +
  1. Secure the screws of the framework with a screwdriver.
  2. +
  3. Mend the damaged framework with a welding tool.
  4. +
  5. Add additional plasteel plating.
  6. +
  7. Secure the additional plating with a wrench.
"} +*/ +#undef POWER_IDLE +#undef POWER_UP +#undef POWER_DOWN + +#undef GRAV_NEEDS_SCREWDRIVER +#undef GRAV_NEEDS_WELDING +#undef GRAV_NEEDS_PLASTEEL +#undef GRAV_NEEDS_WRENCH diff --git a/icons/obj/machines/gravity_generator.dmi b/icons/obj/machines/gravity_generator.dmi new file mode 100644 index 0000000000..69395034dc Binary files /dev/null and b/icons/obj/machines/gravity_generator.dmi differ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index bc473fd7da..7ba0149e4b 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2760,17 +2760,13 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aeW" = ( -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "aeX" = ( /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "aeY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4813,9 +4809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "ahS" = ( /obj/machinery/gateway/centerstation, @@ -4828,9 +4822,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "ahU" = ( /obj/effect/floor_decal/borderfloor{ @@ -5323,9 +5315,7 @@ "aiN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "aiO" = ( /obj/structure/cable{ @@ -6064,9 +6054,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "akm" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -6526,9 +6514,7 @@ req_access = list(11); req_one_access = newlist() }, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "ala" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6561,9 +6547,7 @@ req_access = list(11); req_one_access = newlist() }, -/turf/simulated/floor/tiled{ - icon_state = "techmaint" - }, +/turf/simulated/floor/tiled/steel_grid, /area/engineering/storage) "ald" = ( /obj/structure/cable/green{ @@ -7970,15 +7954,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "anC" = ( @@ -8014,18 +7996,29 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "anE" = ( /obj/structure/symbol/lo{ pixel_y = 32 @@ -8056,8 +8049,12 @@ name = "Engineering Lockdown"; opacity = 0 }, -/obj/machinery/door/airlock/maintenance/engi, -/turf/simulated/floor, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Hard Storage"; + req_access = list(11); + req_one_access = newlist() + }, +/turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "anG" = ( /obj/structure/bookcase, @@ -8558,6 +8555,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/rust, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aoI" = ( @@ -18447,6 +18445,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"aHe" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "aHt" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -19609,6 +19612,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) +"aOU" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "aOW" = ( /obj/structure/table/reinforced, /obj/machinery/button/remote/blast_door{ @@ -19687,6 +19701,21 @@ }, /turf/simulated/floor/carpet, /area/engineering/foyer) +"aPE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "aQa" = ( /obj/structure/table/rack{ dir = 8; @@ -20430,6 +20459,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"aWA" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "aWJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -20609,6 +20647,16 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"aYA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "aYF" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills, @@ -21580,6 +21628,15 @@ /obj/fiftyspawner/plastic, /turf/simulated/floor/tiled, /area/engineering/workshop) +"bkU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) "bmv" = ( /obj/structure/cable/green{ d1 = 1; @@ -22681,6 +22738,12 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"bVn" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "bXl" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -22957,6 +23020,20 @@ /obj/machinery/power/thermoregulator, /turf/simulated/floor, /area/engineering/storage) +"chD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/structure/closet/radiation, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "col" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -22966,6 +23043,27 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_two) +"cto" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_outer"; + req_access = list(11) + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "cwR" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -22975,6 +23073,61 @@ }, /turf/space, /area/space) +"cEi" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"cRa" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) +"cTc" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"dls" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "dlV" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -22994,12 +23147,81 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"dnX" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"dsY" = ( +/obj/effect/floor_decal/corner_techfloor_grid, +/obj/effect/floor_decal/techfloor/corner, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"dtd" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"dJL" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"dOQ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westright{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "dRy" = ( /obj/machinery/lapvend{ dir = 4 }, /turf/simulated/floor/tiled, /area/storage/tools) +"dZN" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "ezX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23018,14 +23240,267 @@ }, /turf/space, /area/space) +"eYw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"fgA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"fEF" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/machinery/alarm{ + alarm_id = null; + breach_detection = 0; + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"fUR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2"; + pixel_y = 0 + }, +/obj/machinery/power/apc/super{ + dir = 1; + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"ghJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -35; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"gHF" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = 0; + pixel_y = 0 + }, +/turf/simulated/wall/r_wall, +/area/engineering/gravity_lobby) +"gOT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 8 + }, +/obj/machinery/airlock_sensor{ + command = "cycle_exterior"; + dir = 4; + id_tag = "gravity_esensor"; + master_tag = "gravity_airlock"; + pixel_x = -28; + req_access = list(11) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"hxy" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"hxD" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"hGr" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, /area/engineering/shaft) -"jRS" = ( +"hWs" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"hZW" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"iaf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"inf" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner{ + icon_state = "bordercolorcorner"; + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"ioI" = ( +/obj/effect/floor_decal/rust, /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"iOq" = ( +/obj/effect/floor_decal/techfloor/orange, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) +"jcJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + id_tag = "gravity_csensor"; + master_tag = "gravity_airlock"; + pixel_y = -28; + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) +"jIo" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner{ + icon_state = "bordercolorcorner"; + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"jNX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"jOe" = ( +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 9 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"jXR" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "klO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23033,6 +23508,28 @@ /obj/machinery/door/window/northleft, /turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) +"kth" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"kxG" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "kCH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23062,6 +23559,42 @@ /obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"kXK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"lfK" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"lCO" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 9 + }, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner_steel_grid, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"lFA" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 9 + }, +/obj/effect/floor_decal/corner_steel_grid, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "lGA" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23074,6 +23607,21 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"lTD" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 6 + }, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "mnt" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -23083,6 +23631,26 @@ }, /turf/space, /area/space) +"mqL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + icon_state = "danger"; + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"mtm" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "mNU" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23092,6 +23660,18 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"mPs" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "nov" = ( /obj/structure/railing, /obj/structure/table/rack{ @@ -23103,6 +23683,38 @@ /obj/random/tech_supply, /turf/simulated/floor, /area/engineering/shaft) +"nCV" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"obA" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "odO" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -23113,6 +23725,52 @@ }, /turf/space, /area/space) +"odW" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 5 + }, +/obj/structure/closet/radiation, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"ort" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"oxr" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "oEH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -23120,6 +23778,44 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"oZb" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/engineering/gravity_lobby) +"pbR" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"plz" = ( +/turf/simulated/wall/r_wall, +/area/engineering/gravity_gen) +"pny" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"psh" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "pQN" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -23130,6 +23826,76 @@ }, /turf/space, /area/space) +"pXr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"qer" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 5 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"qiQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"quP" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"qvg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"qxn" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "qBc" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -23137,6 +23903,125 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"rbZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) +"rxE" = ( +/obj/structure/sign/department/gravi{ + pixel_x = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/engineering/gravity_lobby) +"rys" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable{ + icon_state = "0-4"; + d2 = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"rzK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1379; + id_tag = "gravity_pump" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) +"rAZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/airlock_sensor{ + command = "cycle_interior"; + dir = 8; + id_tag = "gravity_isensor"; + master_tag = "gravity_airlock"; + pixel_x = 28; + req_access = list(11) + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"rEb" = ( +/turf/simulated/wall/r_wall, +/area/engineering/gravity_lobby) +"sbX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"scu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/danger{ + icon_state = "danger"; + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "scB" = ( /obj/machinery/computer/shuttle_control/tether_backup{ icon_state = "computer"; @@ -23144,6 +24029,91 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"shi" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/engineering/gravity_lobby) +"sjw" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engineering Hard Storage"; + req_access = list(11); + req_one_access = newlist() + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/gravity_lobby) +"sqw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"sTb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"sUY" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"tsV" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"tCZ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"tGV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) "tKI" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -23158,6 +24128,56 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +"uhN" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/yellow/bordercorner, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"uyn" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"uOm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"uUL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 10 + }, +/obj/effect/floor_decal/corner_steel_grid{ + icon_state = "steel_grid"; + dir = 4 + }, +/obj/item/device/geiger, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) +"uZh" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(11) + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"uZR" = ( +/obj/machinery/gravity_generator/main/station, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "vbm" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23178,16 +24198,119 @@ }, /turf/space, /area/space) +"vxw" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "vyI" = ( /mob/living/simple_mob/animal/passive/bird/parrot/poly, /turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) +"vAQ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) +"vCw" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"vLS" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "gravity_pump" + }, +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ + dir = 8; + id_tag = "gravity_airlock"; + name = "Gravity Generator Airlock"; + pixel_x = 24; + req_access = list(11); + tag_airpump = "gravity_pump"; + tag_chamber_sensor = "gravity_csensor"; + tag_exterior_door = "gravity_outer"; + tag_exterior_sensor = "gravity_esensor"; + tag_interior_door = "gravity_inner"; + tag_interior_sensor = "gravity_isensor" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_lobby) +"vYM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8; + icon_state = "borderfloor"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/yellow/bordercorner2{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "wlD" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"wDo" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) +"xdE" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/gravity_gen) "xfY" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -23195,6 +24318,40 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"xiv" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/gravity_gen) +"xEU" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + id_tag = "gravity_inner"; + req_access = list(11) + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) "xMk" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -23209,6 +24366,25 @@ /obj/structure/railing, /turf/simulated/floor, /area/engineering/shaft) +"ykG" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/engineering/gravity_lobby) (1,1,1) = {" aaa @@ -32060,8 +33236,8 @@ aeG aiO aiO aiO -aeG -aeG +wDo +shi anD aoH apU @@ -32202,11 +33378,11 @@ aik aik aik aik -ack -ack -ack -jRS -ach +aik +rxE +dnX +aik +ioI ach acj aiR @@ -32342,18 +33518,18 @@ ack ack ack ack -ack -aik -aik -aik -aik -aik -aik -aik -aik -aik -aik aik +rEb +rEb +rEb +sjw +rEb +rEb +rEb +rEb +rEb +rEb +rEb aik ach aBH @@ -32484,18 +33660,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +rEb +sbX +pbR +vAQ +jNX +rys +eYw +ghJ +sTb +dls +rEb aik azD aBR @@ -32626,18 +33802,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +rEb +fgA +hZW +vxw +uOm +ykG +qiQ +qiQ +uyn +aHe +rEb aik azB alQ @@ -32768,18 +33944,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +rEb +fgA +uhN +tCZ +aPE +pXr +rAZ +aYA +kth +aHe +rEb aik azB alT @@ -32910,18 +34086,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +rEb +odW +chD +gHF +oZb +xEU +oZb +rEb +qer +lTD +rEb aik azJ alT @@ -33052,18 +34228,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +plz +plz +rEb +bkU +rbZ +jcJ +rEb +plz +plz +plz aik azJ alT @@ -33194,18 +34370,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +lFA +uUL +rEb +vLS +cRa +rzK +rEb +lCO +hGr +plz afC azI alT @@ -33336,18 +34512,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +aOU +psh +rEb +rEb +cto +rEb +gHF +aOU +psh +plz afC abX acw @@ -33478,18 +34654,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +fUR +jIo +ort +vYM +jOe +gOT +mPs +inf +fEF +plz afC acc acN @@ -33620,18 +34796,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +qvg +mqL +mqL +mqL +scu +mqL +mqL +mqL +cEi +plz afC acf acn @@ -33762,18 +34938,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +tsV +aWA +kXK +kXK +sqw +tGV +tGV +xiv +dZN +plz afC aih acm @@ -33904,18 +35080,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +dsY +vCw +dOQ +dtd +uZh +vCw +nCV +lfK +plz afC agq aCe @@ -34046,18 +35222,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +oxr +hxy +iaf +iaf +iaf +qxn +jXR +lfK +plz afC aAL acp @@ -34188,18 +35364,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +oxr +hWs +xdE +xdE +xdE +iOq +jXR +lfK +plz afC aak acp @@ -34330,18 +35506,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +oxr +hWs +xdE +xdE +uZR +iOq +jXR +lfK +plz afC aak acp @@ -34472,18 +35648,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +oxr +hWs +xdE +xdE +xdE +iOq +jXR +lfK +plz afC aak acp @@ -34614,18 +35790,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +oxr +bVn +cTc +cTc +cTc +mtm +jXR +lfK +plz afC aak acp @@ -34756,18 +35932,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +pny +obA +kxG +kxG +kxG +kxG +kxG +hxD +lfK +plz afC afg xfY @@ -34898,18 +36074,18 @@ ack ack ack ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack -ack +aik +plz +dJL +sUY +sUY +sUY +sUY +sUY +sUY +sUY +quP +plz afC aiW acp diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 331cc3b7a6..9445a490ff 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -95,6 +95,12 @@ name = "\improper Engineering Electrical Shaft" icon_state = "substation" +/area/engineering/gravity_lobby + name = "\improper Engineering GravGen Lobby" + +/area/engineering/gravity_gen + name = "\improper Engineering GravGen" + /area/vacant/vacant_office name = "\improper Vacant Office" icon_state = "vacant_site" diff --git a/nano/templates/gravity_generator.tmpl b/nano/templates/gravity_generator.tmpl new file mode 100644 index 0000000000..ad8e686c49 --- /dev/null +++ b/nano/templates/gravity_generator.tmpl @@ -0,0 +1,45 @@ +
+
+
+ Breaker Setting: +
+
+ {{if data.breaker}} + Generator Enabled + {{else}} + Generator Disabled + {{/if}} +
+
+
+
+ Charge Mode: +
+
+ {{if (data.breaker && data.charge_count < 100)}} + Generator CHARGING + {{else (data.breaker && data.charge_count >= 100)}} + Generator Running + {{else (!data.breaker && data.charge_count > 0)}} + Generator DISCHARGING + {{else}} + Generator Offline + {{/if}} +
+
+
+
+ Charge Status: +
+
+ {{:data.charge_count}}% +
+
+
+
+
+
+ {{:helper.link('Toggle Breaker', 'alert', {'gentoggle' : 1}, null)}} +
+
+
\ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index a7b4957d8b..21aa864cef 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1544,7 +1544,7 @@ #include "code\modules\admin\secrets\fun_secrets\triple_ai_mode.dm" #include "code\modules\admin\secrets\fun_secrets\turn_humans_into_corgies.dm" #include "code\modules\admin\secrets\fun_secrets\turn_humans_into_monkeys.dm" -#include "code\modules\admin\secrets\random_events\gravity.dm" +#include "code\modules\admin\secrets\random_events\gravity_vr.dm" #include "code\modules\admin\secrets\random_events\trigger_cordical_borer_infestation.dm" #include "code\modules\admin\secrets\random_events\trigger_xenomorph_infestation.dm" #include "code\modules\admin\verbs\adminhelp.dm" @@ -1954,7 +1954,7 @@ #include "code\modules\events\event_container_vr.dm" #include "code\modules\events\event_dynamic.dm" #include "code\modules\events\event_manager.dm" -#include "code\modules\events\gravity.dm" +#include "code\modules\events\gravity_vr.dm" #include "code\modules\events\grid_check.dm" #include "code\modules\events\grubinfestation_vr.dm" #include "code\modules\events\ian_storm_vr.dm" @@ -2073,7 +2073,7 @@ #include "code\modules\gamemaster\event2\events\engineering\window_break.dm" #include "code\modules\gamemaster\event2\events\everyone\comms_blackout.dm" #include "code\modules\gamemaster\event2\events\everyone\electrical_fault.dm" -#include "code\modules\gamemaster\event2\events\everyone\gravity.dm" +#include "code\modules\gamemaster\event2\events\everyone\gravity_vr.dm" #include "code\modules\gamemaster\event2\events\everyone\infestation.dm" #include "code\modules\gamemaster\event2\events\everyone\pda_spam.dm" #include "code\modules\gamemaster\event2\events\everyone\radiation_storm.dm" @@ -2966,7 +2966,7 @@ #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" #include "code\modules\power\generator_type2.dm" -#include "code\modules\power\gravitygenerator.dm" +#include "code\modules\power\gravitygenerator_vr.dm" #include "code\modules\power\grid_checker.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\lighting_vr.dm"