diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 70680ec3b06..e5e7fba837d 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -106,6 +106,9 @@ /proc/is_not_maint_area(var/area/A) . = !is_maint_area(A) +/proc/allows_hostile_events(var/area/A) + . = A.hostile_events + /* Area Sorting */ diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 642b242e245..38439f300df 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -111,6 +111,9 @@ GLOBAL_LIST_INIT(area_blurb_stated_to, list()) /// You probably shouldn't be setting this to true on any planet-based maps, or on any indoors areas. var/needs_starlight = FALSE + /// defaults to TRUE, false disables hostile events (like drone uprising). + var/hostile_events = TRUE + /** * Don't move this to Initialize(). Things in here need to run before SSatoms does. */ @@ -544,6 +547,9 @@ GLOBAL_LIST_INIT(area_blurb_stated_to, list()) if (istype(A, /area/turret_protected) || LAZYLEN(A.turret_controls)) continue + if(!A.hostile_events) + continue + if(filter_players) var/should_continue = FALSE for(var/mob/living/carbon/human/H in GLOB.human_mob_list) diff --git a/code/modules/cooking/machinery/smartfridge.dm b/code/modules/cooking/machinery/smartfridge.dm index 70d9b3dcd50..973c24e3493 100644 --- a/code/modules/cooking/machinery/smartfridge.dm +++ b/code/modules/cooking/machinery/smartfridge.dm @@ -198,6 +198,10 @@ /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment) +/obj/machinery/smartfridge/drinks/bar + density = FALSE + layer = BELOW_TABLE_LAYER + /obj/machinery/smartfridge/drying_rack name = "\improper Drying Rack" desc = "A machine for drying plants." diff --git a/code/modules/events/maint_drones.dm b/code/modules/events/maint_drones.dm index bc49ac178d3..ea1d6b111a0 100644 --- a/code/modules/events/maint_drones.dm +++ b/code/modules/events/maint_drones.dm @@ -27,7 +27,7 @@ command_announcement.Announce("A [naming] maintenance drone hijacking has occurred. The hacked drones are aggressive and dangerous. Caution is advised when entering maintenance tunnels.", "Drone Behaviour Control", zlevels = affecting_z) /datum/event/rogue_maint_drones/proc/get_infestation_turfs() - var/area/location = pick_area(list(/proc/is_not_space_area, /proc/is_station_area, /proc/is_maint_area)) + var/area/location = pick_area(list(/proc/is_not_space_area, /proc/is_station_area, /proc/is_maint_area, /proc/allows_hostile_events)) if(!location) LOG_DEBUG("Drone infestation failed to find a viable area. Aborting.") kill() diff --git a/html/changelogs/mneme-barbugfixesround2.yml b/html/changelogs/mneme-barbugfixesround2.yml new file mode 100644 index 00000000000..87f42386aff --- /dev/null +++ b/html/changelogs/mneme-barbugfixesround2.yml @@ -0,0 +1,9 @@ + +author: Mneme + +delete-after: True + +changes: + - bugfix: "Removed an errant holopad under a scrubber from the bar." + - bugfix: "Added a check to areas to prevent hostile events from spawning in areas that are not intended to have them." + - qol: "Relocated the bar's smartfridge interaction point." diff --git a/maps/sccv_horizon/areas/horizon_areas_maintenance.dm b/maps/sccv_horizon/areas/horizon_areas_maintenance.dm index f54e8d55306..96e3e9a5487 100644 --- a/maps/sccv_horizon/areas/horizon_areas_maintenance.dm +++ b/maps/sccv_horizon/areas/horizon_areas_maintenance.dm @@ -79,6 +79,7 @@ name = "Service Maintenance" location_ew = LOC_STARBOARD location_ns = LOC_FORE + hostile_events = FALSE /area/horizon/maintenance/deck_2/service/port name = "Service Maintenance" @@ -186,6 +187,12 @@ location_ew = LOC_STARBOARD location_ns = LOC_FORE +/area/horizon/maintenance/deck_3/crewlounge + name = "Crew Lounge Maintenance" + location_ew = LOC_STARBOARD + location_ns = LOC_FORE + hostile_events = FALSE + /// SUBSTATIONS (Subtype of maint) /area/horizon/maintenance/substation name = "Substation" diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index e20fce4a300..7ba87501f10 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -4923,7 +4923,7 @@ /area/horizon/security/brig) "aHQ" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "aHS" = ( /obj/machinery/light{ dir = 1 @@ -22783,7 +22783,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "dhW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -25565,7 +25565,7 @@ "dAC" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "dAD" = ( /obj/machinery/telecomms/processor/preset_four, /turf/simulated/floor/bluegrid, @@ -45888,7 +45888,7 @@ }, /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "gvK" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/condiment/sugar{ @@ -50140,7 +50140,7 @@ /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "gZF" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -53416,9 +53416,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/service/hydroponics/garden) -"hwQ" = ( -/turf/simulated/floor/lino, -/area/horizon/service/bar) "hwS" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -54646,7 +54643,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "hFU" = ( /obj/machinery/newscaster/east, /obj/effect/floor_decal/corner/dark_green{ @@ -56785,7 +56782,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "hWi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -57975,7 +57972,7 @@ req_one_access = list(12) }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "ifJ" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -60767,7 +60764,7 @@ }, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "izr" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -67045,7 +67042,7 @@ /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "jvb" = ( /obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ @@ -68876,6 +68873,9 @@ }, /turf/simulated/floor/tiled, /area/horizon/hangar/operations) +"jIE" = ( +/turf/simulated/floor/lino, +/area/horizon/service/bar) "jIJ" = ( /obj/effect/floor_decal/corner/lime/diagonal{ dir = 8 @@ -69365,7 +69365,7 @@ /area/horizon/command/heads/captain) "jLJ" = ( /turf/simulated/open, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "jLN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -77032,7 +77032,7 @@ pixel_x = 20 }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "kOt" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -85473,7 +85473,7 @@ /obj/machinery/power/apc/west, /obj/structure/cable/green, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "lYp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -96016,7 +96016,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm/west, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "nCL" = ( /obj/effect/floor_decal/spline/plain/cee, /obj/effect/landmark/skrell_srom, @@ -99879,6 +99879,9 @@ pixel_x = -4; pixel_y = 16 }, +/obj/machinery/smartfridge/drinks/bar{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "ofB" = ( @@ -116495,10 +116498,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/smartfridge/drinks{ - pixel_x = 32; - density = 0 - }, /turf/simulated/floor/wood, /area/horizon/service/bar) "qBZ" = ( @@ -121268,7 +121267,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "rmb" = ( /turf/simulated/mineral/planet, /area/centcom/shared_dream) @@ -127189,7 +127188,7 @@ dir = 4 }, /obj/structure/curtain/open/bar, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "sdN" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -127558,7 +127557,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "sgu" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning{ @@ -130985,7 +130984,7 @@ name = "airlock_horizon_deck_3_fore_starboard_1" }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "sDo" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor, @@ -134177,7 +134176,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "sZZ" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -136169,7 +136168,7 @@ pixel_x = -20 }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "tos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -150552,7 +150551,7 @@ dir = 4 }, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "voH" = ( /obj/structure/closet/crate/trashcart, /obj/random/junk, @@ -153896,7 +153895,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/hologram/holopad, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -161552,7 +161550,7 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "wPz" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -163793,7 +163791,7 @@ name = "airlock_horizon_deck_3_fore_starboard_1" }, /turf/simulated/wall, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "xdF" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor/monotile, @@ -166058,7 +166056,7 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, -/area/horizon/maintenance/deck_3/bridge) +/area/horizon/maintenance/deck_3/crewlounge) "xvi" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -168803,7 +168801,7 @@ id = "bar_shutter"; name = "Bar Shutter" }, -/turf/simulated/floor/lino, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "xPT" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -268163,7 +268161,7 @@ gKc bWP gry xPS -hwQ +jIE jrl ieu ezA