diff --git a/code/game/area/Space Station 13 areas_ch.dm b/code/game/area/Space Station 13 areas_ch.dm index 4c863ea87a..938859baa7 100644 --- a/code/game/area/Space Station 13 areas_ch.dm +++ b/code/game/area/Space Station 13 areas_ch.dm @@ -160,3 +160,6 @@ name = "\improper Cargo - Disposals Sorting" icon_state = "quart" flags = AREA_FLAG_IS_NOT_PERSISTENT + +/area/maintenance/field + name = "Maintenance Deck Field" diff --git a/code/modules/events/mutants.dm b/code/modules/events/mutants.dm index 13793f19d6..2d68488633 100644 --- a/code/modules/events/mutants.dm +++ b/code/modules/events/mutants.dm @@ -7,6 +7,7 @@ #define LOC_HANGAR1 6 #define LOC_HANGAR2 7 #define LOC_HANGAR3 8 +#define LOC_FIELD 9 // CHOMPEdit - More mutant places! This one might allow them to grow #define VERM_RATS 0 @@ -22,7 +23,7 @@ /datum/event/mutants/start() - location = rand(0,8) + location = rand(0,9) // CHOMPEdit - Bumping up to 9 var/list/turf/simulated/floor/turfs = list() var/spawn_area_type switch(location) @@ -53,6 +54,9 @@ if(LOC_HANGAR3) spawn_area_type = /area/hangar/three locstring = "the hangar deck" + if(LOC_FIELD) // CHOMPEdit - Another one for the list... + spawn_area_type = /area/maintenance/field + locstring = "the maintenance deck" for(var/areapath in typesof(spawn_area_type)) var/area/A = locate(areapath) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm index 6b3c0c8ab8..3555b99870 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm @@ -13,4 +13,22 @@ icon_dead = "labrat-dead" icon_rest = "labrat_rest" faction = "neutral" - icon = 'modular_chomp/icons/mob/vore64x32_ch.dmi' \ No newline at end of file + icon = 'modular_chomp/icons/mob/vore64x32_ch.dmi' + +/mob/living/simple_mob/vore/aggressive/rat/labrat/genetics + name = "Nibbles" + desc = "A giant rat that made it's nest in an abandoned genetics lab. This one seems fairly docile." + ai_holder_type = /datum/ai_holder/simple_mob/retaliate + + vore_active = 1 + vore_capacity = 1 + vore_escape_chance = 20 + swallowTime = 25 + vore_bump_chance = 100 + faction_bump_vore = 1 + vore_standing_too = TRUE + vore_pounce_chance = 75 + vore_pounce_maxhealth = 80 + vore_bump_emote = "knocks over and attempts to engulf" + + can_be_drop_prey = FALSE diff --git a/maps/southern_cross/southern_cross-0.dmm b/maps/southern_cross/southern_cross-0.dmm index c912326790..35d98ecfda 100644 --- a/maps/southern_cross/southern_cross-0.dmm +++ b/maps/southern_cross/southern_cross-0.dmm @@ -129,7 +129,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "aw" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -143,9 +143,16 @@ /turf/simulated/floor/tiled/white, /area/maintenance/abfirstaid) "ay" = ( +/obj/machinery/door/firedoor/border_only, +/obj/effect/floor_decal/industrial/arrows/yellow{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/arrows/yellow{ + dir = 4 + }, /obj/machinery/door/airlock/maintenance/common, -/obj/item/tape/engineering, -/turf/simulated/floor/plating/turfpack/station, +/obj/item/tape/atmos, +/turf/simulated/floor/tiled/techmaint, /area/maintenance/starboard) "aC" = ( /obj/effect/floor_decal/rust, @@ -205,7 +212,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "aN" = ( /obj/structure/cable{ d1 = 1; @@ -213,7 +220,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "aO" = ( /obj/effect/floor_decal/rust, /obj/structure/reagent_dispensers/foam, @@ -284,7 +291,7 @@ on = 0 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "aV" = ( /obj/structure/cable{ d1 = 4; @@ -390,7 +397,7 @@ "bj" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "bl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -417,7 +424,7 @@ "bo" = ( /obj/item/device/radio/subspace, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "bp" = ( /obj/structure/prop/dark_node, /turf/simulated/floor/plating/turfpack/station, @@ -457,7 +464,7 @@ /area/maintenance/abscience) "bs" = ( /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "bt" = ( /obj/effect/floor_decal/rust, /obj/machinery/alarm{ @@ -549,7 +556,7 @@ }, /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "bT" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, @@ -567,7 +574,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "bV" = ( /obj/structure/bed/chair/wood, /obj/structure/cable{ @@ -627,7 +634,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "cn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -649,7 +656,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "cq" = ( /obj/structure/cable{ d1 = 2; @@ -670,7 +677,7 @@ dir = 1 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "ct" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -703,12 +710,12 @@ "cz" = ( /obj/item/weapon/laserdome_flag/red, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "cD" = ( /obj/random/trash, /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "cE" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -772,7 +779,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "cP" = ( /obj/structure/sign/directions/engineering{ dir = 8; @@ -793,7 +800,7 @@ }, /obj/random/tool/powermaint, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "cV" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -808,7 +815,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "cX" = ( /obj/machinery/alarm{ dir = 4; @@ -946,7 +953,7 @@ dir = 1 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "dx" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -960,7 +967,7 @@ /area/maintenance/central) "dB" = ( /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "dD" = ( /turf/simulated/floor/plating/turfpack/station, /area/maintenance/abchemistry) @@ -971,7 +978,7 @@ pixel_x = 24 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "dG" = ( /obj/structure/railing, /turf/simulated/floor/wood/alt/panel/broken/turfpack/station, @@ -986,7 +993,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "dJ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -1005,7 +1012,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "dO" = ( /obj/random/trash, /turf/simulated/floor/lino, @@ -1013,7 +1020,7 @@ "dP" = ( /obj/structure/bed/chair/bay/chair/padded/red/bignest, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "dR" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -1056,6 +1063,18 @@ /obj/effect/decal/cleanable/filth, /turf/simulated/floor/tiled/hydro, /area/maintenance/abhydroponicssupp) +"dX" = ( +/obj/machinery/door/airlock/external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "d0_outer"; + locked = 1; + name = "External Airlock Access"; + req_access = list(13) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/plating, +/area/maintenance/port) "dY" = ( /obj/structure/curtain/bed, /turf/simulated/floor/plating/turfpack/station, @@ -1169,7 +1188,7 @@ /obj/structure/table/standard, /obj/random/maintenance/foodstuff, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "ex" = ( /obj/machinery/door/airlock/external{ frequency = 1379; @@ -1179,6 +1198,8 @@ name = "External Airlock Access"; req_access = list(13) }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/plating, /area/maintenance/port) "ez" = ( @@ -1243,7 +1264,7 @@ "eM" = ( /obj/random/junk, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "eN" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -1261,7 +1282,7 @@ /obj/structure/catwalk, /obj/machinery/floodlight, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "eQ" = ( /obj/structure/table/rack/shelf, /obj/random/tool, @@ -1370,7 +1391,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "fl" = ( /obj/structure/table/rack/shelf, /obj/random/mainttoyloot, @@ -1386,7 +1407,7 @@ "fm" = ( /obj/machinery/light/floortube, /turf/simulated/floor/grass2/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "fo" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/cobweb, @@ -1437,7 +1458,7 @@ dir = 5 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "fx" = ( /obj/structure/cable{ d1 = 1; @@ -1486,6 +1507,10 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/aft) +"fL" = ( +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating/turfpack/station, +/area/maintenance/engineering) "fM" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -1564,7 +1589,7 @@ "gc" = ( /obj/structure/hyperball_goal/blue, /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "gd" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow, @@ -1654,7 +1679,7 @@ }, /obj/random/tool, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "gp" = ( /obj/machinery/light/small{ dir = 8 @@ -1694,7 +1719,7 @@ dir = 4 }, /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "gB" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, @@ -1850,7 +1875,7 @@ /area/maintenance/thrift) "he" = ( /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "hg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating/turfpack/station, @@ -1904,11 +1929,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "ht" = ( /obj/structure/bed/pillowpilefront/orange, /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "hx" = ( /obj/random/mouseremains, /turf/simulated/floor/plating/turfpack/station, @@ -1945,7 +1970,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "hC" = ( /turf/simulated/wall, /area/maintenance/janitoral) @@ -2001,7 +2026,7 @@ pixel_x = 24 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "hR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -2076,6 +2101,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/starboard) "ic" = ( @@ -2094,6 +2120,7 @@ name = "Internal Airlock Access"; req_access = list(13) }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/maintenance/port) "if" = ( @@ -2132,14 +2159,14 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "ir" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "iu" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2240,7 +2267,7 @@ /area/space) "iS" = ( /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "iU" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -2253,7 +2280,7 @@ "iX" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "iY" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -2265,7 +2292,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "jb" = ( /obj/random/trash, /obj/random/junk, @@ -2323,7 +2350,7 @@ "jm" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "jn" = ( /obj/effect/floor_decal/rust, /obj/random/junk, @@ -2378,7 +2405,7 @@ }, /obj/random/flashlight, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "ju" = ( /obj/effect/decal/cleanable/flour, /obj/structure/cable{ @@ -2416,6 +2443,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/central) "jz" = ( @@ -2562,7 +2592,7 @@ }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "kb" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, @@ -2605,7 +2635,7 @@ }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "kg" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -2671,7 +2701,7 @@ dir = 1 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "kq" = ( /turf/simulated/floor/plating/turfpack/station, /area/maintenance/smoleroom) @@ -2684,7 +2714,7 @@ /area/maintenance/aft) "kt" = ( /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "kw" = ( /obj/random/junk, /turf/simulated/floor/plating/turfpack/station, @@ -2726,11 +2756,11 @@ "kI" = ( /obj/structure/hyperball_goal/red, /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "kJ" = ( /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "kK" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -2803,8 +2833,9 @@ id_tag = "MaintRoom1"; req_one_access = null }, +/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "kV" = ( /obj/structure/table/rack/shelf, /obj/item/clothing/head/fishing, @@ -2903,7 +2934,7 @@ /area/maintenance/abcargo) "lt" = ( /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "lv" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/plating/turfpack/station, @@ -2969,10 +3000,10 @@ /area/engineering/backuppowerlobby) "lK" = ( /turf/simulated/floor/grass2/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "lL" = ( /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "lM" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/grass, @@ -3027,7 +3058,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "ma" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -3038,7 +3069,7 @@ /area/engineering/gravgen) "mb" = ( /turf/simulated/wall, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "me" = ( /obj/machinery/floodlight, /turf/simulated/floor/plating/turfpack/station, @@ -3046,7 +3077,7 @@ "mh" = ( /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "mj" = ( /obj/random/junk, /turf/simulated/floor/plating/turfpack/station, @@ -3057,7 +3088,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mo" = ( /obj/structure/cable{ d1 = 1; @@ -3123,7 +3154,7 @@ "my" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mz" = ( /obj/structure/door_assembly/door_assembly_highsecurity, /turf/simulated/floor/plating, @@ -3162,7 +3193,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mF" = ( /obj/structure/sign/levels/engineering{ dir = 5 @@ -3178,10 +3209,10 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mJ" = ( /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "mK" = ( /obj/structure/table/rack/shelf, /obj/random/powercell, @@ -3207,7 +3238,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mN" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow, @@ -3216,7 +3247,7 @@ }, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "mO" = ( /obj/structure/sign/directions/stairs_up{ dir = 10 @@ -3268,7 +3299,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "mW" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -3330,7 +3361,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "nc" = ( /obj/structure/cable{ d1 = 4; @@ -3342,7 +3373,7 @@ pixel_y = 26 }, /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "nf" = ( /obj/machinery/light/small, /turf/simulated/floor/plating/turfpack/station, @@ -3422,7 +3453,7 @@ pixel_y = 26 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "nq" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 5 @@ -3561,11 +3592,11 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "nU" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, -/turf/simulated/wall/r_wall/turfpack/station, +/turf/simulated/floor/plating/turfpack/station, /area/maintenance/abscience) "nX" = ( /obj/item/weapon/material/shard{ @@ -3704,7 +3735,7 @@ on = 0 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "oq" = ( /obj/structure/table/rack/shelf, /obj/random/material, @@ -3764,7 +3795,7 @@ specialfunctions = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "oE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -3775,20 +3806,9 @@ /turf/simulated/floor/plating/turfpack/station, /area/maintenance/starboard) "oH" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar) +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating/turfpack/station, +/area/maintenance/starboard) "oJ" = ( /obj/structure/sign/directions/recreation{ dir = 5 @@ -3884,7 +3904,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "pg" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plating/turfpack/station, @@ -3922,7 +3942,7 @@ pixel_x = 22 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "pq" = ( /obj/structure/table/rack/shelf, /obj/random/medical/pillbottle, @@ -4015,9 +4035,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/engineering/gravgen) "pE" = ( -/mob/living/simple_mob/vore/aggressive/rat/labrat{ - faction = "mouse" - }, +/mob/living/simple_mob/vore/aggressive/rat/labrat/genetics, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/absgenetics) "pH" = ( @@ -4090,7 +4108,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "pW" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -4160,7 +4178,7 @@ "qo" = ( /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "qq" = ( /turf/simulated/wall/r_wall/turfpack/station, /area/maintenance/lookout) @@ -4284,6 +4302,8 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/port) "qJ" = ( @@ -4293,7 +4313,7 @@ "qK" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "qL" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -4363,12 +4383,12 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "qW" = ( /obj/structure/catwalk, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "rc" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -4413,7 +4433,7 @@ "rh" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "ri" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -4446,7 +4466,7 @@ "rn" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "ro" = ( /obj/effect/floor_decal/rust, /obj/effect/landmark/event_spawn/morphspawn, @@ -4619,7 +4639,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "sa" = ( /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, @@ -4627,7 +4647,7 @@ "sc" = ( /obj/random/trash, /turf/simulated/floor/grass2/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "se" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating/turfpack/station, @@ -4658,7 +4678,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "sk" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -4704,6 +4724,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/starboard) "sr" = ( @@ -4806,7 +4829,7 @@ dir = 6 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "sL" = ( /obj/item/weapon/storage/firstaid/regular{ pixel_x = 2; @@ -4831,7 +4854,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "sT" = ( /obj/structure/catwalk, /obj/structure/catwalk, @@ -4842,7 +4865,7 @@ /area/engineering/lowlobby) "sW" = ( /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "sY" = ( /obj/structure/table/woodentable, /obj/random/maintenance/foodstuff, @@ -4854,7 +4877,7 @@ /area/maintenance/engineering/gravgen) "tb" = ( /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "tf" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4958,7 +4981,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "tx" = ( /obj/structure/ladder/up, /obj/effect/floor_decal/industrial/outline/yellow, @@ -5022,7 +5045,7 @@ }, /obj/random/flashlight, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "tN" = ( /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor/plating/turfpack/station, @@ -5082,7 +5105,7 @@ /obj/structure/hyperball_pedestal, /obj/item/weapon/laserdome_hyperball, /turf/simulated/floor/grass2/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "ue" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow{ @@ -5180,12 +5203,6 @@ /obj/structure/smolebuilding/warehouses, /turf/simulated/floor/smole, /area/maintenance/smoleroom) -"ut" = ( -/obj/structure/lattice, -/obj/structure/grille, -/obj/structure/lattice, -/turf/space, -/area/space) "uy" = ( /obj/structure/cable{ d1 = 1; @@ -5222,11 +5239,11 @@ pixel_x = 22 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "uG" = ( /obj/item/weapon/laserdome_flag/blue, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "uH" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -5287,6 +5304,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/port) "uS" = ( @@ -5407,7 +5425,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "vx" = ( /obj/structure/closet/lasertag/blue, /obj/item/device/tvcamera{ @@ -5419,7 +5437,7 @@ name = "hyperball camera drone" }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "vy" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -5470,7 +5488,7 @@ "vJ" = ( /obj/random/mouseremains, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "vK" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -5492,14 +5510,14 @@ name = "hyperball camera drone" }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "vM" = ( /obj/structure/catwalk, /obj/machinery/door/firedoor/multi_tile/glass{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "vN" = ( /obj/random/mouseremains, /turf/simulated/floor/wood/alt/parquet/turfpack/station, @@ -5791,20 +5809,18 @@ /turf/simulated/floor/plating/turfpack/station, /area/maintenance/aft) "wV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "d0_inner"; + locked = 1; + name = "Internal Airlock Access"; + req_access = list(13) }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar) +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/map_helper/airlock/button/int_button, +/turf/simulated/floor/plating, +/area/maintenance/port) "wW" = ( /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating, @@ -5830,13 +5846,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "xb" = ( /obj/structure/sign/directions/ladder_up{ dir = 1 }, /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "xd" = ( /obj/structure/cable{ d1 = 4; @@ -5969,7 +5985,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "xG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -6008,7 +6024,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "xL" = ( /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, @@ -6106,7 +6122,7 @@ dir = 5 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "yj" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, @@ -6202,14 +6218,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/floodlight, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "yM" = ( /obj/structure/railing/grey{ dir = 4 }, /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "yN" = ( /turf/simulated/wall/r_wall/turfpack/station, /area/engineering/backuppowerlobby) @@ -6358,7 +6374,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "zu" = ( /turf/simulated/floor/plating/turfpack/station, /area/maintenance/abcargo) @@ -6489,7 +6505,7 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/barricade, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Af" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow, @@ -6556,7 +6572,7 @@ }, /obj/structure/bed/pillowpilefront/teal, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "An" = ( /obj/random/mouseremains, /turf/simulated/floor/plating/turfpack/station, @@ -6622,6 +6638,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/port) "AE" = ( @@ -6992,7 +7009,7 @@ /area/maintenance/bar) "BZ" = ( /turf/simulated/wall/r_wall/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Ca" = ( /obj/structure/sign/directions/recreation{ dir = 4 @@ -7019,7 +7036,7 @@ on = 0 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Cg" = ( /obj/structure/sign/warning/radioactive{ pixel_y = -32 @@ -7049,7 +7066,7 @@ "Cl" = ( /obj/machinery/light/small, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Cm" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, @@ -7063,7 +7080,7 @@ dir = 10 }, /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "Co" = ( /obj/structure/cable/yellow{ d2 = 8; @@ -7075,7 +7092,7 @@ "Cq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "Cr" = ( /obj/random/junk, /obj/structure/cable{ @@ -7219,10 +7236,9 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/port) "CK" = ( -/obj/effect/floor_decal/rust, -/obj/item/tape/medical, +/obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/abchemistry) +/area/maintenance/aft) "CN" = ( /obj/effect/wingrille_spawn/reinforced, /obj/item/tape/engineering, @@ -7233,7 +7249,7 @@ /obj/structure/table/rack/shelf, /obj/item/device/radio/subspace, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "CR" = ( /obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/plating/turfpack/station, @@ -7324,7 +7340,7 @@ dir = 1 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Dk" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -7415,16 +7431,6 @@ /turf/simulated/floor/plating/turfpack/station, /area/maintenance/engineering) "DN" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -7563,7 +7569,7 @@ "Eq" = ( /obj/structure/catwalk, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Er" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -7671,7 +7677,7 @@ "EM" = ( /obj/structure/catwalk, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "EN" = ( /obj/structure/table/marble, /turf/simulated/floor/plating/turfpack/station, @@ -7681,7 +7687,7 @@ /obj/machinery/light/small, /obj/item/device/radio/subspace, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "EP" = ( /obj/machinery/light/small, /turf/simulated/floor/lino, @@ -7752,7 +7758,7 @@ on = 0 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Fb" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -7850,7 +7856,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Fs" = ( /obj/random/trash, /obj/machinery/alarm{ @@ -7907,7 +7913,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "FH" = ( /obj/structure/smoletrack/roadF, /turf/simulated/floor/smole, @@ -8087,7 +8093,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "Gn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -8149,7 +8155,7 @@ dir = 1 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "GD" = ( /obj/machinery/door/firedoor/multi_tile/glass{ dir = 1 @@ -8340,7 +8346,7 @@ "Hk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Hl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -8407,7 +8413,6 @@ /turf/simulated/floor/plating/turfpack/station, /area/maintenance/port) "Hw" = ( -/obj/structure/closet/crate/mimic/cointoss, /obj/effect/floor_decal/borderfloor{ dir = 5 }, @@ -8421,7 +8426,7 @@ /obj/effect/wingrille_spawn/reinforced, /obj/structure/barricade, /obj/machinery/door/firedoor/border_only, -/turf/simulated/wall/r_wall/turfpack/station, +/turf/simulated/floor/plating/turfpack/station, /area/maintenance/abscience) "Hz" = ( /obj/structure/cable{ @@ -8446,7 +8451,7 @@ dir = 10 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "HE" = ( /turf/simulated/wall/r_wall/turfpack/station, /area/maintenance/ragecage) @@ -8475,8 +8480,9 @@ id_tag = "MaintRoom2"; req_one_access = null }, +/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "HI" = ( /obj/structure/sign/directions/engineering{ dir = 9; @@ -8702,7 +8708,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "ID" = ( /obj/structure/sign/warning/radioactive{ pixel_y = -32 @@ -8840,7 +8846,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Jm" = ( /obj/structure/dark_portal/minion, /turf/simulated/floor/weird_things/dark, @@ -8893,9 +8899,6 @@ /area/maintenance/engineering/gravgen) "JC" = ( /obj/effect/floor_decal/rust, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -8910,7 +8913,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "JH" = ( /obj/structure/prop/dark_node/dust, /turf/simulated/floor/plating/turfpack/station, @@ -8968,7 +8971,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "JP" = ( /obj/structure/cable{ d1 = 1; @@ -9006,7 +9009,7 @@ pixel_x = -24 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "JY" = ( /obj/random/trash, /obj/effect/floor_decal/rust, @@ -9103,7 +9106,7 @@ on = 0 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Kl" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/cobweb2, @@ -9244,7 +9247,7 @@ "KM" = ( /obj/structure/railing/grey, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "KQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating/turfpack/station, @@ -9256,7 +9259,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "KS" = ( /obj/structure/closet/crate/secure/large, /obj/effect/floor_decal/rust, @@ -9445,7 +9448,7 @@ /area/maintenance/central) "LY" = ( /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "Mf" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow, @@ -9573,7 +9576,7 @@ pixel_y = 26 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "MH" = ( /obj/structure/cable{ d1 = 1; @@ -9771,7 +9774,7 @@ "Ny" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Nz" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, @@ -9802,7 +9805,7 @@ pixel_y = 22 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "NG" = ( /obj/structure/sign/levels/engineering/gravgen{ pixel_y = 5 @@ -9836,17 +9839,17 @@ dir = 1 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "NM" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, /obj/item/tape/engineering, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "NN" = ( /obj/machinery/floodlight, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "NQ" = ( /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/plating/turfpack/station, @@ -9897,7 +9900,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "NY" = ( /obj/random/trash, /obj/structure/mob_spawner/mouse_nest/mousehole, @@ -9984,7 +9987,7 @@ }, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Ok" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10016,7 +10019,7 @@ }, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Oo" = ( /obj/effect/floor_decal/industrial/arrows/yellow{ dir = 3 @@ -10034,7 +10037,7 @@ "Op" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Oq" = ( /obj/item/stack/material/smolebricks, /turf/simulated/floor/plating/turfpack/station, @@ -10053,6 +10056,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/backuppower) +"Ox" = ( +/obj/structure/catwalk, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating/turfpack/station, +/area/maintenance/port) "Oy" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10077,7 +10085,7 @@ icon_state = "2-8" }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "OE" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/turfpack/station, @@ -10198,7 +10206,7 @@ "Pc" = ( /obj/random/mouseremains, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Pd" = ( /obj/structure/table/rack/shelf, /obj/random/maintenance/engineering, @@ -10422,7 +10430,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "PV" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, @@ -10502,7 +10510,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Qq" = ( /turf/simulated/floor/plating/turfpack/station, /area/maintenance/abmedical) @@ -10542,7 +10550,7 @@ dir = 4 }, /turf/simulated/floor/wood/broken/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "QE" = ( /obj/effect/floor_decal/rust, /obj/machinery/light/small{ @@ -10569,7 +10577,7 @@ pixel_y = 22 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "QM" = ( /turf/simulated/floor/tiled/hydro, /area/maintenance/abhydroponics) @@ -10665,7 +10673,7 @@ "Rd" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Re" = ( /obj/effect/decal/cleanable/filth, /turf/simulated/floor/plating/turfpack/station, @@ -10703,7 +10711,7 @@ pixel_x = -24 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Rl" = ( /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, @@ -10718,7 +10726,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Ro" = ( /obj/structure/cable{ d1 = 2; @@ -10736,7 +10744,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Rt" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -10792,7 +10800,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "RL" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -10815,7 +10823,7 @@ pixel_x = -24 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "RQ" = ( /turf/simulated/wall, /area/maintenance/abhydroponicssupp) @@ -10855,6 +10863,7 @@ name = "Medical Storage"; req_one_access = null }, +/obj/item/tape/medical, /turf/simulated/floor/tiled/white, /area/maintenance/abchemistry) "Se" = ( @@ -10945,7 +10954,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "SB" = ( /obj/random/instrument, /turf/simulated/floor/wood/alt/panel, @@ -10980,7 +10989,7 @@ /obj/structure/railing/grey, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "SI" = ( /obj/structure/cable{ d1 = 1; @@ -11003,7 +11012,7 @@ /area/engineering/backuppower) "SN" = ( /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "SP" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11020,7 +11029,7 @@ }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "ST" = ( /obj/machinery/power/apc{ dir = 1; @@ -11063,7 +11072,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "SY" = ( /obj/random/trash, /turf/simulated/floor/plating/turfpack/station, @@ -11102,7 +11111,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Ti" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/wood/turfpack/station, @@ -11166,7 +11175,7 @@ pixel_x = -24 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Tx" = ( /obj/random/crate, /turf/simulated/floor/tiled, @@ -11283,7 +11292,7 @@ dir = 4 }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_1) +/area/maintenance/bar/dorms/dorm_1) "TR" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -11315,7 +11324,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "TW" = ( /obj/random/mouseremains, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11378,7 +11387,7 @@ /obj/effect/wingrille_spawn/reinforced, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Up" = ( /turf/simulated/floor/tiled/techfloor, /area/engineering/gravgen) @@ -11418,7 +11427,7 @@ "Ux" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Uz" = ( /obj/structure/cable{ d1 = 4; @@ -11450,7 +11459,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "UJ" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/floor_decal/industrial/arrows/yellow{ @@ -11653,7 +11662,7 @@ "Vt" = ( /obj/random/junk, /turf/simulated/floor/grass2/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Vu" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11812,6 +11821,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/port) "VY" = ( @@ -11839,7 +11849,7 @@ "Wb" = ( /obj/item/device/radio/subspace, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Wc" = ( /obj/structure/catwalk, /obj/structure/catwalk, @@ -11864,7 +11874,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techmaint, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Wm" = ( /obj/structure/reagent_dispensers/watertank/high, /obj/effect/floor_decal/borderfloor, @@ -11950,7 +11960,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Wx" = ( /obj/structure/cable{ d1 = 1; @@ -12010,7 +12020,7 @@ dir = 8 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "WN" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -12100,7 +12110,7 @@ }, /obj/structure/mob_spawner/mouse_nest/mousehole, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Xm" = ( /obj/effect/floor_decal/rust, /obj/structure/cable{ @@ -12448,7 +12458,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, -/area/maintenance/maintdeck/field) +/area/maintenance/field) "Yt" = ( /obj/structure/catwalk, /obj/machinery/alarm{ @@ -12480,14 +12490,11 @@ frequency = 1379; master_tag = "d3_port_dorms_airlock"; name = "exterior access button"; - pixel_x = 25; - pixel_y = -26; - req_access = null + pixel_y = 0; + req_access = null; + dir = 8; + pixel_x = 25 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/shield_diffuser, /turf/simulated/floor/plating/turfpack/airless, /area/space) "YB" = ( @@ -12551,14 +12558,14 @@ /area/maintenance/engineering/gravgen) "YG" = ( /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "YH" = ( /obj/structure/catwalk, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "YI" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12648,7 +12655,7 @@ /obj/effect/floor_decal/rust, /obj/structure/catwalk, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldthrift) +/area/maintenance/fieldthrift) "Zd" = ( /turf/simulated/wall/turfpack/station, /area/maintenance/starboard) @@ -12703,7 +12710,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) "Zm" = ( /obj/effect/decal/cleanable/blood, /obj/effect/floor_decal/borderfloorwhite, @@ -12859,7 +12866,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood/turfpack/station, -/area/maintenance/bar/dorm_2) +/area/maintenance/bar/dorms/dorm_2) "ZF" = ( /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag{ @@ -12997,7 +13004,7 @@ dir = 4 }, /turf/simulated/floor/plating/turfpack/station, -/area/maintenance/maintdeck/fieldhallway) +/area/maintenance/fieldhallway) (1,1,1) = {" wZ @@ -33504,7 +33511,7 @@ sV sV sV ua -sA +Ox Do ua iP @@ -36101,8 +36108,8 @@ iP iP iP nS +nS YA -iP TJ wZ wZ @@ -36358,7 +36365,7 @@ Cm PN We We -ex +dX ex ua ua @@ -37132,7 +37139,7 @@ Ac qh ca dm -ie +wV ie jU ua @@ -39161,7 +39168,7 @@ Td Td Td EK -wV +uy AV zK WF @@ -39939,7 +39946,7 @@ uy WG Hc WG -oH +WG fe uy WG @@ -39959,7 +39966,7 @@ xf xz xf Sd -CK +sr Xm SF Ir @@ -40200,7 +40207,7 @@ he he kU he -lL +he lL lL HH @@ -40458,7 +40465,7 @@ Am LY TQ QC -lL +he dI dB gy @@ -40716,7 +40723,7 @@ aU aN PU ev -lL +he op ZE Gm @@ -40974,7 +40981,7 @@ np Cq Cn dw -lL +he MF rh HC @@ -41232,7 +41239,7 @@ NF xK dP rn -lL +he QJ dB bs @@ -41490,7 +41497,7 @@ he he he he -lL +he lL qK KR @@ -42255,7 +42262,7 @@ pj jC qf Et -OE +CK Mq Mq wZ @@ -46124,7 +46131,7 @@ jC Ng cX jC -OE +CK fb xS xS @@ -46395,7 +46402,7 @@ CE CE gG Sb -Ky +fL dd jd lc @@ -49461,7 +49468,7 @@ wZ wZ wZ wZ -ut +jx wZ wZ HE @@ -50044,7 +50051,7 @@ pj qf jC xL -OE +CK OE pj pj @@ -52821,8 +52828,8 @@ wZ wZ wZ wZ -wZ -wZ +XU +xC wZ wZ wZ @@ -53080,7 +53087,7 @@ wZ wZ wZ wZ -wZ +eY wZ wZ wZ @@ -53336,9 +53343,9 @@ wZ wZ wZ wZ -wZ -wZ -wZ +il +il +eY wZ wZ wZ @@ -53594,9 +53601,9 @@ wZ wZ wZ wZ -wZ -XU -xC +il +lR +Yk wZ wZ wZ @@ -53852,9 +53859,9 @@ wZ wZ wZ wZ -wZ -wZ -eY +il +il +Yk wZ wZ wZ @@ -54110,9 +54117,9 @@ wZ wZ wZ wZ -il -il -eY +wZ +wZ +Yk wZ wZ wZ @@ -54368,8 +54375,8 @@ wZ wZ wZ wZ -il -lR +wZ +wZ Yk Yk Yk @@ -54626,8 +54633,8 @@ wZ wZ wZ wZ -Yk -Yk +wZ +wZ Yk wZ wZ @@ -54886,7 +54893,7 @@ wZ wZ wZ wZ -Yk +wZ wZ wZ wZ @@ -57504,7 +57511,7 @@ Fv Fv Fv Fv -ZK +oH xh gL Yk @@ -59011,7 +59018,7 @@ wZ wZ wZ wZ -wZ +Yk eY eY wZ @@ -59269,8 +59276,8 @@ wZ wZ wZ wZ -wZ -wZ +Yk +lR eY eY eY @@ -59527,9 +59534,9 @@ wZ wZ wZ wZ -wZ -wZ -wZ +Yk +Yk +Yk wZ wZ wZ diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm index e96d282ede..4ec1de88bf 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -2331,12 +2331,9 @@ End Chompstation Edit*/ /area/maintenance/engineering/gravgen name = "Gravity Generator Maintenance" -/area/maintenance/maintdeck/field - name = "Maintenance Deck Field" - -/area/maintenance/maintdeck/fieldhallway +/area/maintenance/fieldhallway name = "Maintenance Deck Field Hallway" -/area/maintenance/maintdeck/fieldthrift +/area/maintenance/fieldthrift name = "Maintenance Deck Thrift Store Hallway" /area/maintenance/abhydroponicssupp @@ -2354,8 +2351,17 @@ End Chompstation Edit*/ /area/maintenance/lookout name = "Maintenance Deck Lookout" -/area/maintenance/bar/dorm_1 +/area/maintenance/bar/dorms + name = "Maintenance Bar Dorms" + icon_state = "Sleep" + soundproofed = TRUE + limit_mob_size = FALSE + block_suit_sensors = TRUE + flags = RAD_SHIELDED + block_tracking = TRUE + +/area/maintenance/bar/dorms/dorm_1 name = "Maintenance Deck Bar Dorms 1" -/area/maintenance/bar/dorm_2 +/area/maintenance/bar/dorms/dorm_2 name = "Maintenance Deck Bar Dorms 2" diff --git a/modular_chomp/code/game/objects/mob_spawner.dm b/modular_chomp/code/game/objects/mob_spawner.dm index 3d830ce2a6..ba6e0ed8ec 100644 --- a/modular_chomp/code/game/objects/mob_spawner.dm +++ b/modular_chomp/code/game/objects/mob_spawner.dm @@ -31,8 +31,9 @@ icon = 'icons/effects/effects.dmi' icon_state = "tunnel_hole" spawn_types = list( - /mob/living/simple_mob/animal/passive/mouse= 100, + /mob/living/simple_mob/animal/passive/mouse = 100, /mob/living/simple_mob/animal/passive/cockroach = 25, + /mob/living/simple_mob/animal/passive/mouse/rat = 10, // Because I'm a horrible person. <3 /obj/effect/spider/spiderling/non_growing = 5) /obj/structure/mob_spawner/mouse_nest/mousehole/New() diff --git a/modular_chomp/code/modules/event/event_container_ch.dm b/modular_chomp/code/modules/event/event_container_ch.dm index 9e8216d66f..e8c0b9cd21 100644 --- a/modular_chomp/code/modules/event/event_container_ch.dm +++ b/modular_chomp/code/modules/event/event_container_ch.dm @@ -85,7 +85,7 @@ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, -20, list(ASSIGNMENT_SECURITY = 40, ASSIGNMENT_ENGINEER = 40), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Infected Room", /datum/event/infectedroom, -30, list(ASSIGNMENT_MEDICAL = 30, ASSIGNMENT_JANITOR = 10, ASSIGNMENT_ANY = 1), 1, min_jobs = list(ASSIGNMENT_MEDICAL = 2)), // Pure RP fun, no mechanical effects. - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ionstorm, -125, list(ASSIGNMENT_AI = 80, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5), min_jobs = list(ASSIGNMENT_SCIENTIST = 1, ASSIGNMENT_CYBORG = 3)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ionstorm, -125, list(ASSIGNMENT_AI = 80, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5), min_jobs = list(ASSIGNMENT_CYBORG = 3)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School", /datum/event/jellyfish_migration, 5, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 75, list(ASSIGNMENT_SECURITY = 25, ASSIGNMENT_SCIENTIST = 10), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meaty Ore Shower", /datum/event/meteor_wave/meatyores, -50, list(ASSIGNMENT_ENGINEER = 45), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 2)),