diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm index 0c4a9038434..aa1fdde9804 100644 --- a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm +++ b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm @@ -7052,7 +7052,6 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/interdyne_planetary_base/science/xeno) "tZ" = ( -/obj/structure/pod, /obj/effect/supplypod_rubble, /obj/effect/turf_decal/weather/snow{ layer = 3 @@ -7078,7 +7077,6 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/serv/hydr) "uJ" = ( -/obj/structure/pod, /obj/effect/supplypod_rubble, /turf/open/floor/plating/reinforced{ initial_gas_mix = "ICEMOON_ATMOS" diff --git a/_maps/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm b/_maps/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm index 66b9798ebf4..bfb6c354f95 100644 --- a/_maps/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm @@ -6855,7 +6855,6 @@ /turf/open/floor/stone, /area/ruin/interdyne_planetary_base/serv/hydr) "XP" = ( -/obj/structure/pod, /obj/effect/supplypod_rubble, /turf/open/floor/plating/reinforced{ initial_gas_mix = "LAVALAND_ATMOS" diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index e42e33f49a7..9d8e135d4f0 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -2375,11 +2375,6 @@ /obj/item/circular_saw/alien, /turf/open/floor/plating/abductor, /area/awaymission/mothership_astrum/halls) -"JQ" = ( -/obj/structure/alien/weeds, -/obj/item/crowbar/freeman, -/turf/open/floor/mineral/abductor, -/area/awaymission/mothership_astrum/halls) "JR" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/peppermill{ @@ -38786,7 +38781,7 @@ On ad AZ TY -JQ +ud bV bV bV diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index 416db742a51..8f237eb6964 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -6722,15 +6722,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron/dark, /area/station/security/office) -"bpw" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/item/clothing/head/helmet/space/hev_suit, -/obj/structure/alien/weeds/xen, -/obj/structure/flora/lunar_plant/style_3, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "bpA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -18678,12 +18669,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/eva) -"dAd" = ( -/obj/item/weldingtool, -/obj/structure/lattice, -/obj/structure/spacevine/xen, -/turf/open/space/basic, -/area/space/nearstation) "dAg" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -20228,14 +20213,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"dOT" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/obj/structure/flora/lunar_plant/style_2, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "dOX" = ( /obj/structure/disposalpipe/trunk/multiz{ dir = 1 @@ -21851,6 +21828,13 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/science/central) +"egv" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/food/grown/mushroom/glowshroom, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "egB" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -27250,6 +27234,28 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/hallway/primary/port) +"feu" = ( +/obj/structure/rack/wooden, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, +/obj/item/clothing/suit/koreacoat{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/clothing/suit/modern_winter{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/item/clothing/suit/jacket/delta{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/clothing/suit/jacket/puffer{ + pixel_x = -3; + pixel_y = -6 + }, +/turf/open/floor/wood/parquet, +/area/station/common/tailoring) "fey" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/bot, @@ -37993,14 +37999,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron/dark, /area/station/security/brig) -"hlr" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/obj/effect/spawner/random/bioluminescent_plant, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "hls" = ( /obj/effect/turf_decal/stripes{ dir = 9 @@ -38714,28 +38712,6 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/freezer, /area/station/science/breakroom) -"hth" = ( -/obj/structure/rack/wooden, -/obj/machinery/light/directional/east, -/obj/machinery/status_display/evac/directional/east, -/obj/item/clothing/suit/koreacoat{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/clothing/suit/modern_winter{ - pixel_y = -3; - pixel_x = 7 - }, -/obj/item/clothing/suit/jacket/delta{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/clothing/suit/jacket/puffer{ - pixel_x = -3; - pixel_y = -6 - }, -/turf/open/floor/wood/parquet, -/area/station/common/tailoring) "htq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39750,6 +39726,12 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron/dark, /area/station/engineering/main) +"hDW" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "hDY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/water_source/puddle, @@ -45612,6 +45594,9 @@ /obj/effect/spawner/random/trash/graffiti, /turf/closed/wall, /area/station/maintenance/central) +"iKs" = ( +/turf/closed/mineral/asteroid, +/area/space/nearstation) "iKw" = ( /obj/structure/closet, /obj/effect/turf_decal/delivery, @@ -50981,6 +50966,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"jLo" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/seeds/liberty, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "jLp" = ( /obj/structure/barricade/wooden/crude, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52271,12 +52263,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"jVZ" = ( -/obj/item/stack/ore/glass, -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "jWd" = ( /obj/item/tank/jetpack/carbondioxide{ pixel_x = 3; @@ -57346,14 +57332,6 @@ /obj/structure/sign/departments/medbay/alt/directional/north, /turf/open/floor/iron/dark, /area/station/security/brig) -"kTL" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/obj/item/storage/box/hecu_rations, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "kTV" = ( /turf/closed/wall, /area/station/common/cryopods) @@ -57949,10 +57927,6 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"laQ" = ( -/obj/structure/spacevine/xen, -/turf/closed/mineral/random/high_chance, -/area/space/nearstation) "laT" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Ward Maintenance" @@ -59164,14 +59138,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/cargo/lobby) -"lmu" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/mob/living/simple_animal/hostile/blackmesa/xen/bullsquid, -/obj/structure/alien/weeds/xen, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "lmz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60836,13 +60802,6 @@ }, /turf/open/floor/engine, /area/station/science/ordnance) -"lDy" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "lDB" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; @@ -62831,27 +62790,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"lXc" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/structure/closet/crate/secure/engineering{ - name = "surplus equipment crate" - }, -/obj/item/flatpacked_machine/co2_cracker, -/obj/item/flatpacked_machine/fuel_generator, -/obj/item/flatpacked_machine/large_station_battery, -/obj/item/flatpacked_machine/recycler, -/obj/item/flatpacked_machine/rtg, -/obj/item/flatpacked_machine/stirling_generator, -/obj/item/flatpacked_machine/thermomachine, -/obj/item/circuitboard/machine/circulator, -/obj/item/circuitboard/machine/circulator, -/obj/item/circuitboard/machine/thermoelectric_generator, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/station/engineering/storage) "lXd" = ( /obj/machinery/atmospherics/components/tank/oxygen, /obj/effect/turf_decal/stripes{ @@ -67540,10 +67478,6 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) -"mSV" = ( -/obj/structure/spacevine/xen/thick, -/turf/closed/mineral/random/high_chance, -/area/space/nearstation) "mSZ" = ( /obj/effect/turf_decal/bot_blue, /obj/structure/rack, @@ -71388,6 +71322,13 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/catwalk_floor, /area/station/science/ordnance/testlab) +"nGs" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/seeds/ambrosia/deus, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "nGu" = ( /turf/closed/wall/r_wall, /area/station/maintenance/gamer_lair) @@ -77582,14 +77523,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"oMV" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/mob/living/simple_animal/hostile/blackmesa/xen/houndeye, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "oMZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -78917,10 +78850,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) -"pav" = ( -/obj/structure/spacevine/xen, -/turf/closed/wall/r_wall, -/area/space/nearstation) "pax" = ( /obj/structure/chair/sofa/bench, /obj/machinery/newscaster/directional/north, @@ -79162,14 +79091,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/power_station) -"pdF" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/xen_crystal, -/obj/structure/alien/weeds/xen, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "pdH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/layer_manifold/brown/visible, @@ -83629,14 +83550,6 @@ dir = 1 }, /area/station/security/prison/upper) -"pWI" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "pWK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -83704,6 +83617,13 @@ /obj/structure/flora/bush/sparsegrass, /turf/open/floor/grass, /area/station/service/chapel) +"pXm" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/reagent_containers/cup/bowl/soup/hotchili, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "pXp" = ( /obj/structure/bed/maint, /obj/item/bedsheet/grey{ @@ -87521,11 +87441,6 @@ dir = 1 }, /area/station/service/chapel) -"qGK" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "qGL" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -89301,6 +89216,13 @@ "qYv" = ( /turf/open/floor/iron, /area/station/hallway/primary/port) +"qYy" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/mob/living/basic/mining/goliath/ancient, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "qYC" = ( /obj/structure/chair/office{ dir = 1 @@ -90900,11 +90822,6 @@ }, /turf/open/floor/carpet, /area/station/service/theater) -"ron" = ( -/obj/item/stack/ore/iron, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "roA" = ( /obj/structure/flora/tree/jungle/small{ pixel_x = -30 @@ -91032,14 +90949,6 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/iron/dark, /area/station/security/brig) -"rpC" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "rpJ" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -99142,6 +99051,27 @@ }, /turf/open/floor/iron, /area/station/security/prison/mess) +"sSK" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/structure/closet/crate/secure/engineering{ + name = "surplus equipment crate" + }, +/obj/item/flatpacked_machine/co2_cracker, +/obj/item/flatpacked_machine/fuel_generator, +/obj/item/flatpacked_machine/large_station_battery, +/obj/item/flatpacked_machine/recycler, +/obj/item/flatpacked_machine/rtg, +/obj/item/flatpacked_machine/stirling_generator, +/obj/item/flatpacked_machine/thermomachine, +/obj/item/circuitboard/machine/circulator, +/obj/item/circuitboard/machine/circulator, +/obj/item/circuitboard/machine/thermoelectric_generator, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/engineering/storage) "sSP" = ( /turf/open/floor/iron, /area/station/security/prison/mess) @@ -99685,14 +99615,6 @@ }, /turf/open/space/basic, /area/space) -"sXO" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/obj/structure/xen_crystal, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "sXR" = ( /obj/machinery/door/airlock{ name = "Backstage" @@ -103969,6 +103891,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/security/detectives_office) +"tNu" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/mob/living/basic/mining/basilisk, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "tNx" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -106974,6 +106903,11 @@ "upX" = ( /turf/closed/wall, /area/station/service/barber) +"uqb" = ( +/obj/item/weldingtool, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "uqr" = ( /obj/structure/chair, /obj/effect/landmark/start/assistant, @@ -116780,6 +116714,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science/upper) +"whx" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/mob/living/basic/mining/hivelord, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "whz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -118159,6 +118100,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/security/prison/upper) +"wuF" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/clothing/under/rank/cargo/miner, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "wuI" = ( /obj/structure/table/glass, /obj/item/petri_dish{ @@ -121844,14 +121792,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/prison_upper) -"xfF" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/xen_pylon, -/obj/structure/alien/weeds/xen, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "xfK" = ( /obj/item/kirbyplants/random, /obj/structure/extinguisher_cabinet/directional/north, @@ -123927,11 +123867,6 @@ dir = 8 }, /area/station/security/prison) -"xAS" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "xAU" = ( /obj/effect/turf_decal/stripes, /obj/machinery/light/directional/south, @@ -126451,13 +126386,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"yar" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/spacevine/xen, -/turf/open/floor/plating/airless, -/area/space/nearstation) "yat" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 9 @@ -126885,14 +126813,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"ydI" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/alien/weeds/xen, -/obj/structure/flora/ocean/coral, -/turf/open/misc/asteroid/airless, -/area/space/nearstation) "ydK" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -147099,8 +147019,8 @@ fZI fZI fZI fZI -pav -pav +bsG +bsG qfL exN bsG @@ -147354,11 +147274,11 @@ fZI fZI fZI fZI -laQ -laQ -laQ -laQ -yar +iKs +iKs +iKs +iKs +tYr cyE ojX ojX @@ -147610,14 +147530,14 @@ fZI fZI fZI fZI -laQ -laQ -kTL -lDy -laQ -laQ -ron -xAS +iKs +iKs +pXm +egv +iKs +iKs +xsC +sJq fZI fZI svq @@ -147866,14 +147786,14 @@ fZI fZI fZI fZI -mSV -laQ -hlr -pdF -lmu -ydI -laQ -dAd +iKs +iKs +pXm +pXm +tNu +hDW +iKs +uqb brq hfg xUe @@ -148123,13 +148043,13 @@ fZI fZI fZI fZI -laQ -oMV -lDy -xfF -lDy -lDy -laQ +iKs +egv +hDW +qYy +jLo +egv +iKs fVE sJq wGn @@ -148380,15 +148300,15 @@ fZI fZI fZI fZI -laQ -ydI -rpC -lDy -sXO -dOT -laQ -jVZ -pWI +iKs +hDW +whx +hDW +wuF +nGs +iKs +vAF +xUe xsC tYr tkf @@ -148637,13 +148557,13 @@ fZI fZI fZI fZI -laQ -hlr -lDy -bpw -laQ -laQ -laQ +iKs +hDW +hDW +egv +iKs +iKs +iKs mjE mjE mjE @@ -148894,13 +148814,13 @@ fZI fZI fZI fZI -laQ -laQ -laQ -laQ -laQ +iKs +iKs +iKs +iKs +iKs fZI -qGK +exN mjE bba hLH @@ -149154,10 +149074,10 @@ fZI fZI fZI fZI -pav -pav +bsG +bsG fZI -xAS +sJq mjE euE inc @@ -149412,7 +149332,7 @@ fZI fZI fZI fZI -pav +bsG bsG mjE mjE @@ -151548,7 +151468,7 @@ hcn oyE aJl tUC -hth +feu bnk aZG wYH @@ -159833,7 +159753,7 @@ hMm gji mjw gbf -lXc +sSK oLA lsQ tUT diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index c70710e7cd7..c811290c85c 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -53,6 +53,16 @@ /obj/machinery/telecomms/processor/preset_one, /turf/open/floor/circuit/telecomms/server, /area/station/tcommsat/server) +"aaY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "abt" = ( /obj/machinery/shower/directional/west, /obj/structure/drain, @@ -158,6 +168,12 @@ dir = 1 }, /area/station/engineering/main) +"acT" = ( +/obj/structure/railing/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/dark/corner, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "acW" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -292,6 +308,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) +"aeH" = ( +/obj/structure/chair/sofa/corp/right{ + color = "#DE3A3A"; + dir = 4 + }, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "aeL" = ( /obj/machinery/status_display/evac, /turf/closed/wall/r_wall, @@ -343,16 +367,6 @@ /obj/effect/turf_decal/tile/red/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/office) -"afo" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/structure/closet/wardrobe/miner, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/smooth_corner{ - dir = 1 - }, -/area/station/cargo/miningdock) "aft" = ( /obj/effect/landmark/start/chaplain, /turf/open/floor/carpet/stellar, @@ -698,16 +712,6 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/science/xenobiology) -"ajR" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink/directional/west, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/cable, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "ajT" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -727,6 +731,27 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/fore) +"aka" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "mining" + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) +"akj" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/tile/dark/half, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/mid_joiner{ + dir = 1 + }, +/turf/open/floor/iron/half, +/area/station/service/hydroponics) "akq" = ( /obj/machinery/computer/scan_consolenew{ dir = 4 @@ -918,14 +943,6 @@ /obj/machinery/holopad, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"anI" = ( -/obj/structure/chair/sofa/corp/right{ - color = "#DE3A3A"; - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "anM" = ( /obj/machinery/door/airlock/cmo{ name = "Chief Medical Officer's Quarters" @@ -946,14 +963,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood/large, /area/station/command/heads_quarters/cmo) -"anP" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "anW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -1530,6 +1539,15 @@ }, /turf/open/floor/iron/small, /area/station/commons/dorms) +"awr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "awv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, @@ -2220,6 +2238,10 @@ "aFY" = ( /turf/closed/wall, /area/station/engineering/atmos/storage/gas) +"aGg" = ( +/obj/machinery/griddle, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "aGq" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -2457,6 +2479,19 @@ /obj/machinery/holopad/secure, /turf/open/floor/carpet, /area/station/security/courtroom) +"aLz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/chem_master/condimaster, +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "aLB" = ( /obj/structure/chair/sofa/corp/right, /obj/effect/turf_decal/tile/dark/opposingcorners{ @@ -3014,6 +3049,17 @@ "aSS" = ( /turf/closed/wall/r_wall, /area/station/engineering/power_room) +"aTk" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/landmark/start/bitrunner, +/obj/machinery/light/floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/cargo/bitrunning/den) "aTo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -3400,16 +3446,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"aXm" = ( -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "aXr" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -3905,16 +3941,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation) -"bdX" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/box, -/obj/item/radio/intercom/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "beb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -3975,6 +4001,18 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/smooth, /area/station/cargo/sorting) +"beU" = ( +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/machinery/light_switch/directional/west, +/obj/machinery/light/directional/west, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Service Hallway"; + name = "Service Fax Machine"; + pixel_y = 3 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "beY" = ( /obj/effect/landmark/start/cargo_technician, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -4176,6 +4214,12 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"bjI" = ( +/obj/machinery/camera/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) "bjJ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -4228,16 +4272,6 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"bkF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/filled/warning{ - dir = 9 - }, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/cargo/miningdock) "bkY" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ @@ -4312,16 +4346,6 @@ }, /turf/open/floor/carpet/black, /area/station/command/heads_quarters/qm) -"bmk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "bmt" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -4704,6 +4728,11 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/execution/transfer) +"bsF" = ( +/obj/effect/turf_decal/weather/snow, +/obj/structure/kitchenspike, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "bsI" = ( /turf/closed/wall/r_wall, /area/station/science/auxlab) @@ -4756,12 +4785,6 @@ dir = 4 }, /area/station/hallway/primary/central) -"btx" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/ferny, -/obj/structure/window/fulltile, -/turf/open/floor/grass, -/area/station/service/kitchen) "btY" = ( /obj/structure/table/glass, /obj/item/folder/white{ @@ -4836,6 +4859,16 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) +"bux" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "buz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -5141,6 +5174,19 @@ dir = 8 }, /area/station/hallway/secondary/construction) +"bzd" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/space) "bzg" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/window/spawner/directional/south, @@ -5589,6 +5635,16 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/storage) +"bIo" = ( +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/contraband/random/directional/east, +/turf/open/floor/iron/smooth, +/area/space) "bIs" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4 @@ -5875,19 +5931,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/science/xenobiology) -"bMB" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "bMJ" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -6006,6 +6049,21 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/science/lab) +"bNV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "bNZ" = ( /obj/machinery/door/airlock/external{ name = "External Solar Access" @@ -6075,19 +6133,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/construction/mining/aux_base) -"bOI" = ( -/obj/structure/table, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "bOJ" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, @@ -6135,14 +6180,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"bPG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "bPI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6274,19 +6311,6 @@ dir = 4 }, /area/station/engineering/atmos) -"bRS" = ( -/obj/structure/table, -/obj/machinery/requests_console/directional/west{ - department = "Kitchen"; - name = "Kitchen Requests Console" - }, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -2; - pixel_y = 5 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "bSd" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 8 @@ -6673,6 +6697,16 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/engineering/atmos/storage) +"bYX" = ( +/obj/structure/table, +/obj/item/storage/bag/tray{ + pixel_y = 3 + }, +/obj/item/food/dough{ + pixel_y = 5 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "bZi" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter) @@ -6832,10 +6866,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/security/checkpoint/engineering) -"cbP" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "cbV" = ( /obj/effect/landmark/start/hangover, /obj/machinery/camera/directional/west{ @@ -7615,39 +7645,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/security/office) -"coC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) -"coJ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/storage/box/donkpockets/donkpocketpizza{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/donkpockets/donkpocketteriyaki{ - pixel_x = 5; - pixel_y = 9 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "coN" = ( /obj/structure/table, /obj/item/reagent_containers/cup/glass/mug/britcup{ @@ -8097,10 +8094,6 @@ /obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab, /turf/open/floor/iron/white/diagonal, /area/station/science/research) -"cvp" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "cvG" = ( /obj/structure/sign/warning/biohazard/directional/east, /turf/open/space/basic, @@ -8213,6 +8206,14 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/fore) +"cxP" = ( +/obj/effect/turf_decal/weather/snow, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "cxR" = ( /obj/effect/landmark/start/hangover, /obj/structure/cable, @@ -8296,6 +8297,13 @@ /obj/structure/chair/wood, /turf/open/floor/carpet/stellar, /area/station/service/chapel/funeral) +"cyI" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "cyL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/north, @@ -8626,6 +8634,13 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/central) +"cEq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "cEx" = ( /obj/machinery/power/tracker, /obj/structure/cable, @@ -9026,20 +9041,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) -"cIT" = ( -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 14 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/service/hydroponics) "cIZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9876,10 +9877,34 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/station/maintenance/aft/upper) +"cXP" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/structure/trash_pile, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/bitrunning/den) "cXX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) +"cYc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = 6; + pixel_y = 3 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "cYk" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -10367,6 +10392,13 @@ /obj/machinery/door/poddoor/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"dea" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "dec" = ( /obj/structure/weightmachine, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -10392,12 +10424,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/pumproom) -"deu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/cargo/bitrunning/den) "dex" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet, @@ -10481,6 +10507,14 @@ "dfF" = ( /turf/closed/wall, /area/station/medical/medbay/lobby) +"dfG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "dfM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, @@ -10675,6 +10709,13 @@ /obj/effect/landmark/start/captain, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain) +"din" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/structure/kitchenspike, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "dir" = ( /obj/structure/sign/departments/evac, /turf/closed/wall/r_wall, @@ -11161,14 +11202,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/freezerchamber) -"dpw" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/miningdock) "dpx" = ( /obj/structure/table/wood, /obj/item/storage/crayons, @@ -11814,16 +11847,6 @@ /mob/living/basic/pet/cat/cak, /turf/open/floor/iron/smooth_large, /area/station/maintenance/starboard/greater) -"dzq" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/machinery/door/window/survival_pod{ - dir = 4; - name = "Fitness Ring" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/smooth_large, -/area/station/commons/fitness/recreation/entertainment) "dzx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -11896,16 +11919,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/crematorium, /turf/open/floor/catwalk_floor/iron_dark, /area/station/service/chapel/office) -"dAy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "dAz" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -11976,14 +11989,6 @@ }, /turf/open/floor/plating, /area/station/science/genetics) -"dAV" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/bitrunner, -/turf/open/floor/iron/dark/textured, -/area/station/cargo/bitrunning/den) "dAX" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -12860,6 +12865,10 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) +"dMh" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/office) "dMl" = ( /obj/structure/chair/sofa/left/brown{ dir = 8 @@ -13408,14 +13417,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"dTO" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, +"dUa" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/landmark/start/shaft_miner, +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/brown/filled/warning{ - dir = 5 + dir = 1 }, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/drone_bay) +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "dUf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13977,34 +13989,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/pod, /area/station/service/chapel/funeral) -"ebp" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/morphine, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 8 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = -5 - }, -/obj/item/reagent_containers/syringe/epinephrine, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "Pharmacy Shutters" - }, -/obj/machinery/door/window/right/directional/east{ - name = "Pharmacy Desk"; - req_access = list("pharmacy"); - safe = 4; - dir = 8 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/pharmacy) "ebz" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -14029,6 +14013,19 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"ecl" = ( +/obj/structure/table, +/obj/machinery/requests_console/directional/west{ + department = "Kitchen"; + name = "Kitchen Requests Console" + }, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -2; + pixel_y = 5 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ecq" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/shutters/radiation/preopen{ @@ -14241,17 +14238,6 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) -"eeS" = ( -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/machinery/status_display/ai/directional/west, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Service Hallway"; - name = "Service Fax Machine"; - pixel_y = 3 - }, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "eeX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -14550,11 +14536,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/pod/dark, /area/station/service/chapel) -"eil" = ( -/obj/machinery/chem_mass_spec, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/turf/open/floor/iron/freezer, -/area/station/medical/pharmacy) "ein" = ( /obj/structure/displaycase/forsale/kitchen{ pixel_y = 8 @@ -14734,10 +14715,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"ekG" = ( -/obj/structure/table, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "ekQ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -14811,15 +14788,6 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) -"ely" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/light/cold/directional/east, -/obj/machinery/gibber, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "elB" = ( /obj/effect/turf_decal/tile/dark/opposingcorners{ dir = 1 @@ -14916,20 +14884,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central/fore) -"emO" = ( -/obj/structure/rack, -/obj/item/circuitboard/machine/exoscanner{ - pixel_y = 3 - }, -/obj/item/circuitboard/machine/exoscanner, -/obj/item/circuitboard/machine/exoscanner{ - pixel_y = -3 - }, -/obj/machinery/requests_console/auto_name/directional/north, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/brown/filled, -/turf/open/floor/iron/smooth, -/area/station/cargo/drone_bay) "enl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14955,6 +14909,18 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/freezer, /area/station/medical/treatment_center) +"enw" = ( +/obj/machinery/bouldertech/brm, +/obj/machinery/conveyor{ + dir = 4; + id = "mining" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "enC" = ( /obj/structure/bed/double, /obj/item/bedsheet/random/double, @@ -15203,6 +15169,11 @@ }, /turf/open/floor/iron/large, /area/station/service/hydroponics) +"ern" = ( +/obj/effect/turf_decal/weather/snow, +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "err" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15300,23 +15271,6 @@ /obj/effect/turf_decal/tile/dark_blue/anticorner, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"esZ" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/service/general, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/service/glass{ - name = "Service Hall" - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/large, -/area/station/service/cafeteria) "etd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15944,6 +15898,11 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/power_room) +"eCV" = ( +/obj/structure/railing/corner, +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "eDh" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -15971,11 +15930,6 @@ "eDt" = ( /turf/closed/wall/r_wall, /area/station/science/research) -"eDx" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/checkpoint/supply) "eDF" = ( /obj/structure/chair/stool/directional/west, /obj/machinery/power/apc/auto_name/directional/south, @@ -16021,14 +15975,6 @@ /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/execution/transfer) -"eEd" = ( -/obj/structure/sign/poster/random/directional/north, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/large, -/area/station/hallway/secondary/service) "eEi" = ( /obj/effect/turf_decal/tile/dark_red/anticorner, /obj/structure/sign/poster/official/twelve_gauge/directional/east, @@ -16312,25 +16258,6 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/cargo/storage) -"eGy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/fake_stairs/directional/north, -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) -"eGT" = ( -/obj/effect/turf_decal/weather/snow, -/obj/machinery/firealarm/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/closet/secure_closet/freezer/fridge, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "eGZ" = ( /obj/structure/hedge, /obj/effect/turf_decal/trimline/green/arrow_cw{ @@ -16685,6 +16612,14 @@ }, /turf/open/floor/iron/small, /area/station/commons/dorms) +"eMf" = ( +/obj/machinery/door/window/left/directional/west{ + req_access = list("morgue") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/morgue) "eMr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -16736,6 +16671,19 @@ dir = 1 }, /area/station/engineering/atmos/storage) +"eNr" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/fake_stairs/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "eNs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -16762,6 +16710,19 @@ icon = 'modular_nova/modules/advanced_shuttles/icons/evac_shuttle.dmi' }, /area/space/nearstation) +"eNJ" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Service Hall"; + dir = 9; + name = "service camera" + }, +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, +/obj/machinery/modular_computer/preset/cargochat/service, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_large, +/area/station/hallway/secondary/service) "eNR" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/structure/cable, @@ -16796,6 +16757,25 @@ dir = 1 }, /area/station/commons/storage/primary) +"eOA" = ( +/obj/structure/table, +/obj/item/food/ready_donk/mac_n_cheese{ + pixel_y = 3; + pixel_x = 2 + }, +/obj/item/food/ready_donk/nachos_grandes{ + pixel_y = 7 + }, +/obj/item/food/ready_donk/donkhiladas{ + pixel_y = 11; + pixel_x = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/smooth, +/area/space) "eOF" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -16815,6 +16795,21 @@ /obj/effect/landmark/start/blueshield, /turf/open/floor/carpet/cyan, /area/station/command/heads_quarters/blueshield) +"ePd" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ePm" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -16925,6 +16920,10 @@ dir = 4 }, /area/station/engineering/power_room) +"eQw" = ( +/obj/machinery/quantum_server, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "eQx" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -17024,15 +17023,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) -"eSB" = ( -/obj/machinery/door/window{ - dir = 8; - req_access = list("morgue") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/morgue) "eSD" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/spawner/random/engineering/vending_restock, @@ -17155,6 +17145,41 @@ /obj/effect/landmark/navigate_destination/dockescpod3, /turf/open/floor/catwalk_floor, /area/station/security/execution/transfer) +"eUE" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/window/left/directional/north{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) "eUH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -17316,16 +17341,6 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/science/ordnance/testlab) -"eWX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "eXd" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17488,18 +17503,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) -"eYX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "eYY" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -17765,6 +17768,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"fdZ" = ( +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "feh" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -18375,18 +18383,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"foi" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "fok" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -18832,24 +18828,6 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/crew_quarters/bar) -"fva" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = 8; - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = 8; - pixel_y = 2 - }, -/obj/effect/spawner/random/food_or_drink/cake_ingredients, -/obj/item/kitchen/rollingpin{ - pixel_x = -4 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "fve" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -18902,6 +18880,18 @@ /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) +"fvY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "fwc" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -18998,18 +18988,6 @@ /obj/item/toy/cards/deck/tarot, /turf/open/floor/iron/grimy, /area/station/commons/lounge) -"fxo" = ( -/obj/structure/table, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/item/plate, -/obj/item/holosign_creator/robot_seat/restaurant, -/turf/open/floor/iron/large, -/area/station/service/kitchen) "fxD" = ( /obj/structure/sign/warning/chem_diamond/directional/north, /obj/structure/rack/shelf, @@ -19056,10 +19034,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/carpet/stellar, /area/station/service/chapel/funeral) -"fye" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/office) "fys" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -19723,12 +19697,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/wood/large, /area/station/hallway/secondary/exit/departure_lounge) -"fJV" = ( -/obj/machinery/door/window{ - dir = 8 - }, -/turf/open/floor/carpet/purple, -/area/station/common/night_club) "fKb" = ( /turf/open/floor/iron/smooth, /area/station/command/cc_dock) @@ -19869,21 +19837,6 @@ dir = 4 }, /area/station/cargo/storage) -"fMm" = ( -/obj/machinery/button/door/directional/south{ - id = "kitchen_counter"; - name = "Counter Shutters Control" - }, -/obj/structure/table, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/processor{ - pixel_y = 12 - }, -/obj/structure/railing, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "fMy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19905,6 +19858,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"fNg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "fNt" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper/crumpled/fluff{ @@ -19925,6 +19890,12 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/exit/departure_lounge) +"fNI" = ( +/obj/machinery/netpod, +/obj/machinery/light/small/blacklight/directional/west, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "fNL" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/vending/hydroseeds, @@ -19958,14 +19929,6 @@ }, /turf/open/floor/wood/large, /area/station/security/courtroom) -"fNX" = ( -/obj/machinery/bouldertech/refinery/smelter, -/obj/machinery/conveyor/inverted{ - dir = 5; - id = "mining" - }, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "fNY" = ( /obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/trimline/dark_green/filled/line{ @@ -20092,6 +20055,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/station/service/chapel) +"fPB" = ( +/obj/structure/cable, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "fPE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20309,6 +20277,11 @@ dir = 1 }, /area/station/engineering/atmos) +"fUb" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "fUc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20622,6 +20595,19 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"fYn" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/biogenerator, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "hydroponics_counter"; + name = "Hydroponics Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/window/spawner/directional/east, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/service/hydroponics) "fYs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -20647,21 +20633,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/maintenance/department/electrical) -"fZg" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, -/obj/machinery/computer/department_orders/service, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/hallway/secondary/service) "fZo" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 @@ -20897,6 +20868,15 @@ }, /turf/open/floor/iron/grimy, /area/station/commons/lounge) +"gcp" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/cold/directional/east, +/obj/machinery/gibber, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "gcr" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -21778,17 +21758,6 @@ /obj/structure/sign/poster/official/wtf_is_co2, /turf/closed/wall, /area/station/engineering/atmos) -"goP" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/cargo/bitrunning/den) "goS" = ( /turf/open/floor/iron/freezer, /area/station/medical/chemistry) @@ -22018,22 +21987,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"gsb" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 +"gsl" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 9 }, -/turf/open/floor/iron/smooth_edge{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/area/station/cargo/drone_bay) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 14 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/service/hydroponics) "gsL" = ( /obj/structure/showcase/cyborg/old{ dir = 8; @@ -22052,6 +22019,9 @@ "gsU" = ( /turf/closed/wall, /area/station/maintenance/disposal) +"gsZ" = ( +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "gta" = ( /obj/structure/sign/poster/official/periodic_table/directional/north, /turf/open/floor/iron/white/smooth_large, @@ -22135,18 +22105,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"gtJ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposaloutlet{ - dir = 4; - name = "Cargo Deliveries" - }, -/obj/structure/window/spawner/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/large, -/area/station/hallway/secondary/service) "gtM" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/closet/secure_closet/cytology, @@ -22296,6 +22254,14 @@ /obj/machinery/duct, /turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) +"gvO" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "gwc" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -22494,18 +22460,6 @@ /obj/structure/window/reinforced/plasma/spawner/directional/east, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) -"gyK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "gzn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22970,12 +22924,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/carpet, /area/station/service/library) -"gFG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/weather/snow, -/mob/living/basic/goat/pete, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "gFW" = ( /obj/effect/turf_decal/trimline/dark/filled/line{ dir = 1 @@ -23091,6 +23039,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/hidden, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/central) +"gHS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/weather/snow, +/obj/machinery/light_switch/directional/west{ + pixel_x = -24 + }, +/obj/structure/cable, +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "gHW" = ( /obj/structure/table/optable{ desc = "A cold, hard place for your final rest."; @@ -23180,14 +23138,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark/smooth_large, /area/station/security/brig) -"gIO" = ( -/obj/effect/turf_decal/weather/snow, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "gIT" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/barman_recipes, @@ -23243,6 +23193,12 @@ /obj/structure/chair/office, /turf/open/floor/iron/smooth_large, /area/station/cargo/drone_bay) +"gJt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "gJw" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/wood/large, @@ -23301,23 +23257,24 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"gKa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "gKl" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet/black, /area/station/service/chapel/office) -"gKB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "gKO" = ( /turf/open/floor/catwalk_floor/iron_smooth, /area/station/hallway/primary/aft) @@ -23731,6 +23688,17 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/pharmacy) +"gQp" = ( +/obj/machinery/bouldertech/refinery, +/obj/machinery/conveyor{ + dir = 4; + id = "mining" + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "gQq" = ( /obj/machinery/power/turbine/core_rotor{ mapping_id = "main_turbine" @@ -24179,13 +24147,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"gWT" = ( -/obj/machinery/computer/quantum_console{ - dir = 8 - }, -/obj/machinery/light/small/red/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/bitrunning/den) "gWV" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -24376,6 +24337,13 @@ /obj/machinery/oven/range, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"gZV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "gZX" = ( /obj/structure/trash_pile, /turf/open/floor/iron/smooth, @@ -24454,10 +24422,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) -"haV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningoffice) "hbb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -24503,17 +24467,6 @@ /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/showroomfloor, /area/station/medical/coldroom) -"hbG" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/door/window/right/directional/south{ - dir = 1; - name = "Jim Norton's Quebecois Coffee"; - req_one_access = list("service","maint_tunnels") - }, -/turf/open/floor/wood, -/area/station/hallway/secondary/entry) "hbJ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -25070,15 +25023,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/misc/beach/sand, /area/station/science/research) -"hjg" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table, -/obj/item/plate, -/obj/effect/spawner/random/trash/food_packaging, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/bitrunning/den) "hji" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -25202,6 +25146,18 @@ dir = 1 }, /area/station/cargo/miningdock) +"hkU" = ( +/obj/structure/table, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/item/plate, +/obj/item/holosign_creator/robot_seat/restaurant, +/turf/open/floor/iron/large, +/area/station/service/kitchen) "hkX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -25461,14 +25417,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"hqe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "hqf" = ( /obj/machinery/digital_clock, /turf/closed/wall/r_wall, @@ -25486,6 +25434,12 @@ dir = 8 }, /area/station/engineering/atmos/pumproom) +"hqp" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/smooth_large, +/area/station/commons/fitness/recreation/entertainment) "hqu" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -25614,6 +25568,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit, /area/station/command/teleporter) +"hsX" = ( +/obj/structure/chair/plastic, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/start/bitrunner, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/space) "htb" = ( /obj/machinery/status_display/evac/directional/south, /obj/structure/rack, @@ -25864,6 +25827,18 @@ /obj/structure/sign/departments/science/directional/north, /turf/open/floor/iron/white/smooth_edge, /area/station/hallway/primary/fore) +"hwE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/edge, +/area/station/service/hydroponics) "hwG" = ( /obj/structure/bed/double, /obj/item/bedsheet/cmo/double, @@ -26044,6 +26019,16 @@ }, /turf/open/floor/carpet/blue, /area/station/command/bridge) +"hyw" = ( +/obj/structure/chair/stool/directional/west{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/lounge) "hyx" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/delivery, @@ -26325,13 +26310,6 @@ }, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/hop) -"hBP" = ( -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/machinery/light_switch/directional/west, -/obj/machinery/light/directional/west, -/obj/machinery/icecream_vat, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "hBQ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -26404,6 +26382,23 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) +"hCJ" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/general, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/service/glass{ + name = "Service Hall" + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/large, +/area/station/service/cafeteria) "hCL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26630,22 +26625,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/glass/reinforced, /area/station/hallway/secondary/exit/departure_lounge) -"hFu" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Service - Service Hall"; - dir = 9; - name = "service camera" - }, -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, -/obj/machinery/modular_computer/preset/cargochat/service, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/hallway/secondary/service) "hFA" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 @@ -26716,6 +26695,30 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/smooth_large, /area/station/maintenance/disposal) +"hGX" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/left/directional/south{ + name = "Hydroponics Desk"; + req_access = list("hydroponics") + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "hydroponics_counter"; + name = "Hydroponics Counter Shutters" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/large, +/area/station/service/hydroponics) "hHg" = ( /obj/structure/table, /obj/item/tank/internals/emergency_oxygen{ @@ -26811,6 +26814,14 @@ }, /turf/open/floor/iron/smooth, /area/station/science/ordnance/storage) +"hIw" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/vending/dinnerware, +/obj/item/toy/figure/chef{ + pixel_y = 16 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "hIA" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) @@ -26818,15 +26829,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/pod/dark, /area/station/service/chapel) -"hJg" = ( -/obj/structure/table, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_y = 5; - pixel_x = 2 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/bitrunning/den) "hJx" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 4 @@ -26897,18 +26899,6 @@ dir = 8 }, /area/station/engineering/atmos) -"hKK" = ( -/obj/structure/chair/plastic{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 5 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/east, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/effect/landmark/start/bitrunner, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "hKP" = ( /obj/item/reagent_containers/cup/bucket, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -27064,6 +27054,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_large, /area/station/service/theater) +"hNB" = ( +/obj/effect/turf_decal/weather/snow, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "hND" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27362,13 +27359,6 @@ }, /turf/open/floor/iron/white, /area/station/hallway/primary/fore) -"hSf" = ( -/obj/effect/landmark/start/shaft_miner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "hSn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -27601,18 +27591,6 @@ dir = 1 }, /area/station/engineering/atmos) -"hUv" = ( -/obj/structure/chair/stool/directional/west{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "hUD" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ dir = 8 @@ -28075,6 +28053,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grimy, /area/station/service/library) +"ibR" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "ibV" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -28264,6 +28247,20 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) +"ige" = ( +/obj/structure/table, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 10 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "igk" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/landmark/start/chaplain, @@ -28352,15 +28349,6 @@ dir = 4 }, /area/station/medical/virology) -"ihS" = ( -/obj/machinery/light/directional/north, -/obj/machinery/bouldertech/refinery, -/obj/machinery/conveyor{ - id = "mining"; - dir = 8 - }, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "ihT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28812,22 +28800,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/hop, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) -"iog" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = 4; - pixel_y = 18 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = -8; - pixel_y = 4 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "iom" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 @@ -28910,6 +28882,17 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) +"ioX" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Service - Cafeteria Aft"; + name = "service camera" + }, +/obj/structure/chair/sofa/corp/left{ + color = "#DE3A3A"; + dir = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "ioZ" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -29035,6 +29018,17 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/science/lab) +"iqv" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/space) "iqx" = ( /obj/machinery/digital_clock, /turf/closed/wall/r_wall, @@ -29208,6 +29202,20 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/prison) +"isq" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/pollution_scrubber{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/structure/table, +/turf/open/floor/iron/large, +/area/station/service/kitchen) "isr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, @@ -29283,15 +29291,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"itf" = ( -/obj/structure/noticeboard/directional/north, -/obj/machinery/light_switch/directional/east, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/large, -/area/station/hallway/secondary/service) "iti" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -29450,6 +29449,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_large, /area/station/cargo/lobby) +"iva" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/computer/quantum_console{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "ivb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29490,6 +29497,18 @@ /obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/medical/virology) +"ivQ" = ( +/obj/machinery/computer/order_console/cook, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_large, +/area/station/hallway/secondary/service) "ivR" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -29519,19 +29538,6 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/command/heads_quarters/hos) -"ivZ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/fake_stairs/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "iwe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29995,10 +30001,15 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"iCW" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/command/heads_quarters/qm) +"iCU" = ( +/obj/structure/table, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/space) "iCZ" = ( /obj/machinery/computer/communications, /obj/machinery/keycard_auth{ @@ -30089,6 +30100,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/entry) +"iEJ" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/camera/directional/west{ + c_tag = "Service - Kitchen Coldroom"; + dir = 5; + name = "service camera" + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "iEL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external/glass{ @@ -30141,13 +30161,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/fore) -"iFV" = ( -/obj/machinery/conveyor{ - id = "mining"; - dir = 8 - }, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "iFY" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -30371,16 +30384,6 @@ dir = 1 }, /area/station/security/prison) -"iIG" = ( -/obj/item/radio/intercom/directional/east, -/obj/structure/table, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -2; - pixel_y = 5 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "iJg" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -30422,14 +30425,6 @@ dir = 8 }, /area/station/engineering/atmos) -"iJt" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/vending/dinnerware, -/obj/item/toy/figure/chef{ - pixel_y = 16 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "iJB" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -30481,6 +30476,12 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/storage) +"iKe" = ( +/obj/structure/sign/warning/vacuum/directional/north, +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "iKs" = ( /obj/structure/table, /obj/item/stack/sheet/cardboard{ @@ -30513,13 +30514,6 @@ dir = 8 }, /area/station/engineering/atmos/hfr_room) -"iLb" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured_edge, -/area/station/cargo/bitrunning/den) "iLH" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 4 @@ -30641,15 +30635,16 @@ dir = 1 }, /area/station/hallway/secondary/command) -"iNa" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo - Mining" +"iNb" = ( +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/station/cargo/miningdock) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "iNk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30866,6 +30861,12 @@ /obj/machinery/meter, /turf/open/floor/iron/smooth_large, /area/station/science/ordnance) +"iRi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "iRn" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -31481,6 +31482,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison) +"iYT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/machinery/status_display/ai/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "iYV" = ( /obj/structure/chair/comfy/brown{ color = "#D381C9"; @@ -31597,6 +31609,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) +"iZW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/cargo/miningfoundry) "jay" = ( /obj/structure/chair/sofa/right/brown{ dir = 8 @@ -31614,6 +31631,33 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"jaG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/storage/box/donkpockets/donkpocketpizza{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets/donkpocketteriyaki{ + pixel_x = 5; + pixel_y = 9 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "jbe" = ( /obj/structure/table/wood/fancy/royalblack, /obj/machinery/computer/records/medical/laptop, @@ -31783,16 +31827,6 @@ /obj/machinery/door/airlock/external, /turf/open/floor/catwalk_floor, /area/station/engineering/main) -"jdH" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/light/directional/north, -/obj/structure/table, -/obj/machinery/light_switch/directional/north{ - pixel_x = 13 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "jdN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/generic_maintenance_landmark, @@ -31891,6 +31925,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) +"jfx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/cargo/miningfoundry) "jfH" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -32083,20 +32124,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/smooth_edge, /area/station/hallway/primary/aft) -"jio" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/tile/dark/half, -/obj/effect/turf_decal/trimline/green/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/green/mid_joiner{ - dir = 1 - }, -/obj/machinery/door/window/survival_pod{ - dir = 1 - }, -/turf/open/floor/iron/half, -/area/station/service/hydroponics) "jir" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -32411,6 +32438,23 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"jnu" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/cargo/drone_bay) "jnF" = ( /obj/structure/railing{ dir = 8 @@ -32983,6 +33027,21 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) +"juG" = ( +/obj/structure/rack, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = -3 + }, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/structure/window/spawner/directional/west, +/obj/effect/turf_decal/trimline/brown/filled, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) "juO" = ( /obj/effect/spawner/random/maintenance/two, /obj/item/clothing/head/cone, @@ -33083,15 +33142,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/edge, /area/station/hallway/primary/central) -"jvw" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/landmark/start/bitrunner, -/turf/open/floor/iron/dark/textured_edge{ - dir = 8 - }, -/area/station/cargo/bitrunning/den) "jvx" = ( /obj/structure/table/wood, /obj/item/food/breadslice/plain, @@ -33120,6 +33170,18 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) +"jvC" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, +/obj/machinery/computer/department_orders/service, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_large, +/area/station/hallway/secondary/service) "jvJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -33421,15 +33483,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) -"jAS" = ( -/obj/machinery/bouldertech/brm, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ - id = "mining"; - dir = 1 - }, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "jBm" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -33716,19 +33769,17 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"jDI" = ( +/obj/structure/chair/sofa/corp/left{ + color = "#DE3A3A"; + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "jDS" = ( /obj/effect/spawner/random/trash/caution_sign, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) -"jDX" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/right/directional/west{ - name = "Kitchen Deliveries"; - req_access = list("kitchen") - }, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "jDY" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/suit_storage_unit/ce, @@ -33817,6 +33868,13 @@ /obj/structure/closet/radiation, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"jEP" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "jET" = ( /obj/structure/table/reinforced, /obj/machinery/camera/directional/west{ @@ -34862,23 +34920,6 @@ dir = 8 }, /area/station/command/gateway) -"jUL" = ( -/obj/machinery/light/warm/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Service - Cafeteria Fore"; - name = "service camera" - }, -/obj/machinery/firealarm/directional/north{ - pixel_x = 8 - }, -/obj/item/radio/intercom/directional/north{ - pixel_x = -6 - }, -/obj/structure/table, -/obj/item/plate, -/obj/item/food/sausage, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "jUZ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -34940,6 +34981,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/qm) +"jVW" = ( +/obj/structure/table, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "jWg" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 @@ -35182,6 +35227,10 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"jZq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "jZS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35291,13 +35340,6 @@ dir = 4 }, /area/station/engineering/storage) -"kbi" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/drone_bay) "kbj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -35464,14 +35506,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/warden) -"kdS" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "kek" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ dir = 1 @@ -35853,6 +35887,11 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) +"kjt" = ( +/obj/effect/landmark/start/shaft_miner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "kjz" = ( /obj/structure/table/reinforced, /obj/item/hfr_box/corner, @@ -35981,15 +36020,6 @@ }, /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) -"kkC" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/miningdock) "kkI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -36275,20 +36305,24 @@ }, /turf/open/space/basic, /area/space/nearstation) -"koZ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/machinery/pollution_scrubber{ - pixel_x = -7; - pixel_y = 1 +"kpe" = ( +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/structure/table, -/turf/open/floor/iron/large, -/area/station/service/kitchen) +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/utility/chefhat, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/lights/mixed, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "kpg" = ( /obj/effect/mapping_helpers/airlock/access/any/supply/shipping, /obj/structure/disposalpipe/segment{ @@ -36400,15 +36434,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/construction) -"krz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "krA" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -37548,15 +37573,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"kFL" = ( -/obj/effect/spawner/random/trash/grime, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/smooth_corner{ - dir = 4 - }, -/area/station/cargo/bitrunning/den) "kFS" = ( /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/door/airlock/rd/glass{ @@ -37795,6 +37811,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/bar) +"kIg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/freezer{ + critical_machine = 1; + name = "Coldroom" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/fans/tiny, +/obj/structure/cable, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "kIi" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -37939,14 +37967,17 @@ dir = 8 }, /area/station/science/xenobiology) -"kKA" = ( -/obj/structure/chair/sofa/corp/right{ - color = "#DE3A3A"; - dir = 4 +"kKa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 }, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) +/obj/structure/closet/secure_closet/chemical, +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/freezer, +/area/station/medical/pharmacy) "kKC" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/freezer{ @@ -38651,6 +38682,18 @@ dir = 1 }, /area/station/engineering/main) +"kVv" = ( +/obj/machinery/light/small/blacklight/directional/south, +/obj/machinery/conveyor{ + dir = 4; + id = "mining" + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "kVy" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -39043,6 +39086,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/primary/aft) +"laf" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/miningdock) "lai" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -39226,6 +39277,16 @@ dir = 4 }, /area/station/engineering/power_room) +"lcZ" = ( +/obj/structure/railing, +/obj/structure/table, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) "ldf" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -39308,11 +39369,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/power_room) -"ldU" = ( -/obj/machinery/netpod, -/obj/machinery/light/small/blacklight/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/bitrunning/den) "leb" = ( /obj/structure/cable, /turf/open/floor/iron/smooth_large, @@ -39335,11 +39391,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/crew_quarters/bar) -"leF" = ( -/obj/machinery/quantum_server, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/cargo/bitrunning/den) "leI" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 @@ -39629,11 +39680,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) -"liO" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "liS" = ( /obj/item/kirbyplants/random, /obj/structure/cable, @@ -39742,13 +39788,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) -"lkz" = ( -/obj/structure/chair/sofa/corp/left{ - color = "#DE3A3A"; - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "lkG" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/disposalpipe/segment, @@ -39759,10 +39798,6 @@ "lkJ" = ( /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"lkM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/sorting) "lkR" = ( /obj/effect/spawner/random/structure/table_fancy, /obj/item/flashlight/lamp/green{ @@ -39790,12 +39825,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/office) -"llf" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/cargo/miningdock) "llk" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -39819,6 +39848,12 @@ }, /turf/open/floor/iron/large, /area/station/service/hydroponics) +"llM" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "llR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39897,14 +39932,6 @@ dir = 1 }, /area/station/hallway/secondary/entry) -"lmY" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "mining"; - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "lnc" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 8 @@ -40024,6 +40051,17 @@ }, /turf/open/floor/iron/grimy, /area/station/commons/lounge) +"lnT" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/plasticflaps/opaque{ + name = "Kitchen Deliveries" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Kitchen" + }, +/turf/open/floor/iron/large, +/area/station/maintenance/starboard/greater) "lnU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40319,6 +40357,14 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison/mess) +"lsG" = ( +/obj/structure/chair/sofa/corp/right{ + color = "#DE3A3A"; + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "lsQ" = ( /obj/machinery/duct, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -40928,13 +40974,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/lockers) -"lBF" = ( -/obj/structure/chair/sofa/right/brown{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningoffice) "lBP" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -41117,6 +41156,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"lDU" = ( +/obj/structure/chair/sofa/corp/left{ + desc = "Looks like someone threw it out. Covered in donut crumbs."; + dir = 4; + name = "couch" + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/iron/smooth, +/area/space) "lDY" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/aft) @@ -41204,6 +41256,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint) +"lFv" = ( +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/drone_bay) "lFE" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -41377,12 +41438,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) -"lHd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "lHf" = ( /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 @@ -41737,6 +41792,12 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"lMt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "lMx" = ( /obj/machinery/door/airlock/maintenance{ critical_machine = 1; @@ -41888,6 +41949,13 @@ /obj/machinery/power/smes, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/starboard/aft) +"lOC" = ( +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "lOV" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -42073,6 +42141,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) +"lQG" = ( +/obj/structure/sign/poster/contraband/mothic_rations, +/turf/closed/wall, +/area/station/service/kitchen) "lQK" = ( /obj/structure/railing, /obj/structure/bed, @@ -42581,19 +42653,6 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) -"lWH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "lWL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, @@ -43018,6 +43077,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) +"mdF" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/door/window/right/directional/north{ + name = "Jim Norton's Quebecois Coffee"; + req_one_access = list("service","maint_tunnels") + }, +/turf/open/floor/wood, +/area/station/hallway/secondary/entry) "mdG" = ( /obj/structure/window/spawner/directional/north, /mob/living/basic/lizard/tegu/gus, @@ -43421,6 +43490,12 @@ dir = 8 }, /area/station/security/prison) +"mjC" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark/smooth_large, +/area/station/commons/fitness/recreation/entertainment) "mjG" = ( /obj/item/folder/blue{ pixel_y = 4 @@ -43561,18 +43636,6 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/hallway/primary/aft) -"mkD" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/edge, -/area/station/service/hydroponics) "mkK" = ( /obj/effect/turf_decal/trimline/dark_red/filled/corner{ dir = 8 @@ -43601,6 +43664,14 @@ "mlv" = ( /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"mlz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "mlP" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -44842,23 +44913,6 @@ /obj/structure/sign/poster/contraband/communist_state/directional/east, /turf/open/floor/wood, /area/station/maintenance/rus_gambling) -"mFX" = ( -/obj/structure/table, -/obj/item/plate/large, -/obj/item/plate, -/obj/item/plate/small{ - pixel_y = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 10; - pixel_y = 18 - }, -/obj/item/knife/butcher{ - pixel_x = 5 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "mGv" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -44868,6 +44922,11 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/port/aft) +"mGz" = ( +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "mGE" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 10 @@ -44925,6 +44984,11 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/grass, /area/station/service/chapel) +"mHC" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "mHR" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/delivery, @@ -45417,6 +45481,17 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/greater) +"mNK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/fake_stairs/directional/north, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "mNO" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, @@ -45431,6 +45506,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/pod, /area/station/service/chapel/office) +"mNX" = ( +/obj/machinery/netpod, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "mNY" = ( /obj/machinery/light/small/directional/west, /obj/machinery/light_switch/directional/west, @@ -45526,6 +45609,19 @@ /obj/item/radio/intercom/prison/directional/north, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/prison) +"mPf" = ( +/obj/structure/table, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "mPl" = ( /obj/item/radio/intercom/directional/south, /obj/structure/chair/comfy/brown{ @@ -45851,12 +45947,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/plating/airless, /area/space/nearstation) -"mTY" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark/textured, -/area/station/cargo/bitrunning/den) "mUp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/mess, @@ -45962,11 +46052,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"mVt" = ( -/obj/effect/turf_decal/weather/snow, -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "mVv" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -46595,6 +46680,19 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/smooth, /area/station/maintenance/aft) +"neg" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "nel" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, @@ -46633,6 +46731,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) +"neT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/cargo/miningfoundry) "nfr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46851,6 +46955,27 @@ dir = 8 }, /area/station/security/checkpoint/customs) +"nja" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/table, +/obj/item/serviette_pack{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "njb" = ( /obj/structure/cable, /obj/structure/chair/stool/directional/east, @@ -46932,42 +47057,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/interrogation) -"njQ" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters_south"; - name = "Pharmacy Shutters" - }, -/obj/machinery/door/window/left/directional/south{ - name = "Pharmacy Desk"; - req_access = list("pharmacy"); - dir = 4 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/pharmacy) "njV" = ( /obj/effect/turf_decal/trimline/dark_green/filled/line{ dir = 5 @@ -47474,15 +47563,6 @@ }, /turf/open/floor/wood/large, /area/station/hallway/primary/fore) -"nqU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/brown/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "nrb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48031,10 +48111,6 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) -"nyf" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/miningoffice) "nyh" = ( /obj/structure/window/reinforced/spawner/directional/west{ layer = 2.9 @@ -48090,11 +48166,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_edge, /area/station/engineering/atmos) -"nzv" = ( -/obj/structure/flora/bush/jungle, -/obj/structure/window/fulltile, -/turf/open/floor/grass, -/area/station/service/hydroponics) "nzw" = ( /obj/structure/rack, /obj/item/poster/random_contraband, @@ -48244,17 +48315,6 @@ }, /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) -"nBO" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/cargo/miningdock) "nCl" = ( /obj/structure/chair/office/light{ dir = 4 @@ -48386,6 +48446,22 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"nFa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/machinery/door/airlock/mining{ + name = "Mining Foundry" + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/cargo/miningfoundry) "nFg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/grille_or_waste, @@ -48530,19 +48606,6 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/science/research/abandoned) -"nGR" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/effect/landmark/start/bitrunner, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/cargo/bitrunning/den) "nGX" = ( /obj/structure/chair/sofa/right/brown{ dir = 8 @@ -48869,11 +48932,6 @@ /obj/effect/spawner/random/maintenance/eight, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) -"nMk" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "nMr" = ( /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) @@ -48987,10 +49045,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/cargo/drone_bay) -"nNS" = ( -/obj/machinery/deepfryer, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "nOq" = ( /obj/machinery/light/directional/south, /turf/open/floor/engine, @@ -49308,12 +49362,11 @@ }, /area/station/science/xenobiology) "nRy" = ( -/obj/effect/turf_decal/weather/snow, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningoffice) "nRz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -49379,6 +49432,22 @@ dir = 4 }, /area/station/science/xenobiology) +"nRS" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = 4; + pixel_y = 18 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "nRV" = ( /obj/structure/closet/secure_closet{ name = "contraband locker"; @@ -49534,16 +49603,6 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/commons/fitness/recreation/entertainment) -"nTI" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "nTS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49624,18 +49683,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) -"nUo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/freezer{ - critical_machine = 1; - name = "Coldroom" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/structure/fans/tiny, -/obj/structure/cable, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "nUy" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49959,21 +50006,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"nYG" = ( -/obj/machinery/computer/order_console/cook, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/mid_joiner, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/smooth_large, -/area/station/hallway/secondary/service) "nYI" = ( /obj/effect/landmark/secequipment, /obj/structure/sign/poster/official/random/directional/north, @@ -50028,6 +50060,16 @@ /obj/structure/cable, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain) +"nZU" = ( +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/box, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "nZW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50109,18 +50151,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood/large, /area/station/hallway/secondary/entry) -"obz" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/siding/green, -/obj/machinery/firealarm/directional/north{ - pixel_x = -6 - }, -/turf/open/floor/iron/edge, -/area/station/service/hydroponics) "ocb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -50191,16 +50221,6 @@ dir = 4 }, /area/station/medical/surgery) -"ocK" = ( -/obj/structure/table, -/obj/item/storage/bag/tray{ - pixel_y = 3 - }, -/obj/item/food/dough{ - pixel_y = 5 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "ocV" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -50480,6 +50500,15 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood/large, /area/station/commons/dorms) +"ogM" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/bitrunning/den) "ohd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50784,20 +50813,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/maintenance/port/greater) -"olm" = ( -/obj/structure/table, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = 7; - pixel_y = 10 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "olo" = ( /obj/structure/chair/office{ dir = 8 @@ -50829,11 +50844,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/parquet, /area/station/common/night_club) -"olG" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "olS" = ( /obj/structure/bodycontainer/crematorium{ id = "crematoriumChapel" @@ -51305,6 +51315,11 @@ dir = 8 }, /area/station/hallway/primary/fore) +"osx" = ( +/obj/structure/lattice, +/obj/machinery/firealarm/directional/west, +/turf/open/space/basic, +/area/space/nearstation) "osJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -51609,6 +51624,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) +"owG" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/sorting) "owP" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -51965,20 +51985,22 @@ "oCl" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) -"oCm" = ( -/obj/structure/sign/warning/vacuum/directional/north, -/obj/machinery/conveyor/inverted{ - dir = 6; - id = "mining" - }, -/turf/open/floor/plating, -/area/station/cargo/miningdock) "oCo" = ( /obj/structure/railing/corner{ dir = 4 }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) +"oCs" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/structure/closet/wardrobe/miner, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/cargo/miningdock) "oCM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52312,16 +52334,6 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark/small, /area/station/security/prison/garden) -"oGX" = ( -/obj/structure/table, -/obj/machinery/microwave, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 5 - }, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/contraband/random/directional/east, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "oHc" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52724,6 +52736,17 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/wood/large, /area/station/hallway/secondary/exit/departure_lounge) +"oNA" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/computer/security/mining, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/smooth_corner{ + dir = 8 + }, +/area/station/cargo/miningdock) "oNB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -53035,6 +53058,16 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/science/research/abandoned) +"oSm" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sink/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/cable, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "oSr" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -53178,11 +53211,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/circuit/green, /area/station/ai_monitored/command/nuke_storage) -"oUb" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/stairs, -/area/station/cargo/bitrunning/den) "oUl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53391,17 +53419,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"oWg" = ( -/obj/machinery/computer/security/mining{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "oWn" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -53968,6 +53985,21 @@ /obj/machinery/incident_display/delam, /turf/closed/wall/r_wall, /area/station/security/checkpoint/engineering) +"pdo" = ( +/obj/machinery/button/door/directional/south{ + id = "kitchen_counter"; + name = "Counter Shutters Control" + }, +/obj/structure/table, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/processor{ + pixel_y = 12 + }, +/obj/structure/railing, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "pdt" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/box, @@ -54027,10 +54059,6 @@ /obj/item/folder/white, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) -"pei" = ( -/obj/effect/landmark/start/cook, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "pep" = ( /obj/structure/table/glass, /obj/item/paper_bin{ @@ -54706,17 +54734,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/grimy, /area/station/service/library) -"pmM" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/box, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/cargo/miningdock) "pmS" = ( /obj/machinery/light/floor, /turf/open/floor/engine/plasma, @@ -54875,6 +54892,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"poE" = ( +/obj/machinery/door/window/left/directional/west, +/turf/open/floor/carpet/purple, +/area/station/common/night_club) "poP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54942,6 +54963,14 @@ /obj/machinery/door/airlock/maintenance/external/glass, /turf/open/floor/iron/dark/textured_large, /area/station/service/kitchen/abandoned) +"ppC" = ( +/obj/machinery/conveyor/inverted{ + dir = 10; + id = "mining" + }, +/obj/machinery/bouldertech/refinery/smelter, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "ppT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -54966,19 +54995,6 @@ "pqh" = ( /turf/closed/wall, /area/station/cargo/warehouse) -"pqk" = ( -/obj/structure/chair/sofa/corp/left{ - desc = "Looks like someone threw it out. Covered in donut crumbs."; - dir = 4; - name = "couch" - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/landmark/start/bitrunner, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "pql" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -55093,6 +55109,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation) +"psR" = ( +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/structure/table, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "psS" = ( /obj/machinery/computer/cryopod/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -55336,6 +55357,13 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"pvB" = ( +/obj/structure/table, +/obj/item/stack/conveyor/thirty, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "pvF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ dir = 4 @@ -55373,13 +55401,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"pws" = ( -/obj/effect/landmark/start/shaft_miner, -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "pwB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/radio{ @@ -55860,6 +55881,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_edge, /area/station/engineering/atmos/pumproom) +"pDj" = ( +/obj/machinery/light/warm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Cafeteria Fore"; + name = "service camera" + }, +/obj/machinery/firealarm/directional/north{ + pixel_x = 8 + }, +/obj/item/radio/intercom/directional/north{ + pixel_x = -6 + }, +/obj/structure/table, +/obj/item/plate, +/obj/item/food/sausage, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "pDk" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/utility/radiation, @@ -55999,15 +56037,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/storage/gas) -"pFJ" = ( -/obj/item/storage/cans/sixsoda, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/structure/railing, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "pGh" = ( /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) @@ -56518,6 +56547,18 @@ dir = 1 }, /area/station/medical/medbay/lobby) +"pNs" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/siding/green, +/obj/machinery/firealarm/directional/north{ + pixel_x = -6 + }, +/turf/open/floor/iron/edge, +/area/station/service/hydroponics) "pNw" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/beaker{ @@ -56532,6 +56573,13 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/white/herringbone, /area/station/medical/virology) +"pNx" = ( +/obj/effect/landmark/start/bitrunner, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/bitrunning/den) "pNy" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/bot, @@ -56952,6 +57000,14 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) +"pUM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/stairs{ + dir = 4 + }, +/area/station/cargo/bitrunning/den) "pVi" = ( /obj/structure/chair/stool/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -57023,6 +57079,14 @@ /obj/structure/table/reinforced/rglass, /turf/open/floor/wood/large, /area/station/command/heads_quarters/rd) +"pWe" = ( +/obj/structure/sign/poster/random/directional/north, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/service) "pWf" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -58079,13 +58143,6 @@ "qgT" = ( /turf/open/floor/iron/white, /area/station/hallway/primary/fore) -"qgY" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/structure/railing, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/cargo/bitrunning/den) "qhe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58411,6 +58468,11 @@ "qlN" = ( /turf/closed/wall/r_wall, /area/station/science/robotics/lab) +"qlR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "qlS" = ( /obj/machinery/door/airlock/research{ name = "Circuit Testing Lab" @@ -58587,29 +58649,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/lesser) -"qor" = ( -/obj/item/plate/oven_tray{ - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/plate/oven_tray{ - pixel_x = -2; - pixel_y = 3 - }, -/obj/item/clothing/suit/apron/chef{ - pixel_y = 11 - }, -/obj/item/book/manual/wiki/cooking_to_serve_man{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/structure/table, -/obj/item/knife/kitchen{ - pixel_x = -13; - pixel_y = 3 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "qoE" = ( /obj/machinery/digital_clock{ pixel_y = 5 @@ -58783,15 +58822,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) -"qpX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningdock) "qqa" = ( /obj/effect/spawner/random/structure/barricade, /turf/open/floor/iron/smooth, @@ -58964,17 +58994,6 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark/smooth_large, /area/station/security/execution/education) -"qtr" = ( -/obj/machinery/computer/shuttle/mining{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/window/spawner/directional/west, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/miningdock) "qts" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/item/kirbyplants/random, @@ -59018,6 +59037,15 @@ /obj/effect/turf_decal/siding/thinplating/dark/end, /turf/open/floor/iron/checker, /area/station/science/xenobiology) +"qtJ" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table, +/obj/item/plate, +/obj/effect/spawner/random/trash/food_packaging, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/smooth_edge, +/area/space) "qtL" = ( /turf/closed/mineral, /area/space/nearstation) @@ -59142,15 +59170,6 @@ }, /turf/open/floor/wood/parquet, /area/station/common/night_club) -"qwy" = ( -/obj/structure/chair/stool/directional/west{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "qwH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59436,13 +59455,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/fore) -"qAn" = ( -/obj/effect/turf_decal/weather/snow, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "qAt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -59620,6 +59632,15 @@ "qDk" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/morgue) +"qDl" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/right/directional/west{ + name = "Kitchen Deliveries"; + req_access = list("kitchen") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "qDp" = ( /obj/structure/chair/office/light, /obj/effect/turf_decal/trimline/neutral/filled/warning, @@ -60265,6 +60286,11 @@ }, /turf/open/floor/iron/small, /area/station/commons/dorms) +"qLC" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/office) "qLI" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/recharger, @@ -60510,6 +60536,29 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) +"qQn" = ( +/obj/item/kitchen/rollingpin{ + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 4 + }, +/obj/machinery/requests_console/directional/south{ + department = "Service Hall"; + name = "Service Hall Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/item/radio/headset/headset_srv{ + pixel_x = -11; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "qQu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -60637,6 +60686,23 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"qSs" = ( +/obj/structure/table, +/obj/item/plate/large, +/obj/item/plate, +/obj/item/plate/small{ + pixel_y = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 10; + pixel_y = 18 + }, +/obj/item/knife/butcher{ + pixel_x = 5 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "qSu" = ( /turf/open/floor/iron/large, /area/station/hallway/primary/fore) @@ -60811,16 +60877,6 @@ dir = 1 }, /area/station/engineering/atmos) -"qTS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/drone_bay) "qUl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -61060,6 +61116,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) +"qXo" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/qm) "qXq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61986,6 +62046,18 @@ }, /turf/open/floor/iron/smooth_large, /area/station/maintenance/disposal) +"rla" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposaloutlet{ + dir = 4; + name = "Cargo Deliveries" + }, +/obj/structure/window/spawner/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/service) "rli" = ( /turf/closed/wall, /area/station/cargo/office) @@ -62111,15 +62183,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/prison) -"rnb" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/structure/trash_pile, -/obj/structure/sign/poster/contraband/random/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/cargo/bitrunning/den) "rne" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -62538,6 +62601,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) +"rtG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/sorting) "rtS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62681,21 +62751,6 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) -"rvS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "rvY" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -63387,12 +63442,6 @@ }, /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/captain/private) -"rGx" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/dark/corner, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "rGH" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -63581,6 +63630,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) +"rJo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_edge, +/area/station/cargo/bitrunning/den) "rJK" = ( /obj/structure/flora/ocean/longseaweed, /obj/effect/spawner/liquids_spawner{ @@ -63639,6 +63697,14 @@ dir = 1 }, /area/station/hallway/primary/aft) +"rKL" = ( +/obj/structure/chair/sofa/corp/right{ + color = "#DE3A3A"; + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "rKM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -63784,6 +63850,16 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/medical/treatment_center) +"rMv" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "mining"; + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/cargo/miningfoundry) "rMB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64151,14 +64227,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port) -"rSO" = ( -/obj/structure/chair/sofa/corp/right{ - color = "#DE3A3A"; - dir = 8 +"rSX" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = 8; + pixel_y = 12 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = 8; + pixel_y = 2 + }, +/obj/effect/spawner/random/food_or_drink/cake_ingredients, +/obj/item/kitchen/rollingpin{ + pixel_x = -4 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "rSZ" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/west, @@ -64413,6 +64499,41 @@ dir = 8 }, /area/station/commons/storage/primary) +"rVm" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters_south"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) "rVq" = ( /obj/effect/turf_decal/plaque{ icon_state = "L2" @@ -64627,6 +64748,10 @@ /obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/engineering/power_room) +"rZz" = ( +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "rZI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64715,19 +64840,6 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) -"sbx" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/landmark/start/assistant, -/obj/machinery/light_switch/directional/north{ - pixel_x = 13 - }, -/obj/structure/window/spawner/directional/west, -/obj/structure/chair/sofa/corp/left{ - color = "#DE3A3A"; - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "sbH" = ( /obj/effect/turf_decal/nova_decals/enclave/bottom/middle{ color = "#52B4E9" @@ -64846,6 +64958,10 @@ }, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"sdl" = ( +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "sdt" = ( /obj/docking_port/stationary/laborcamp_home{ dir = 8 @@ -65031,6 +65147,10 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"sgl" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/miningoffice) "sgn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -65145,10 +65265,25 @@ }, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/central) +"shC" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/checkpoint/supply) "shE" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"shJ" = ( +/obj/machinery/door/airlock/mining{ + name = "Bitrunning Den" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/turf/open/floor/iron/smooth, +/area/station/cargo/drone_bay) "shM" = ( /obj/structure/closet/crate/bin, /turf/open/floor/vault, @@ -65731,18 +65866,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/engine/atmos) -"sqL" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/cargo/miningdock) "sqQ" = ( /obj/machinery/power/solar{ id = "aftport"; @@ -65760,6 +65883,32 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/hallway/secondary/command) +"sre" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 8 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = -5 + }, +/obj/item/reagent_containers/syringe/epinephrine, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "Pharmacy Shutters" + }, +/obj/machinery/door/window/right/directional/west{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/pharmacy) "srk" = ( /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/small, @@ -65836,14 +65985,6 @@ /obj/effect/landmark/navigate_destination/research, /turf/open/floor/iron/white/smooth_large, /area/station/science/research) -"ssw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/hydroponics/glass{ - name = "Hydroponics" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, -/turf/open/floor/iron/large, -/area/station/service/hydroponics) "ssL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -66299,6 +66440,10 @@ dir = 8 }, /area/station/engineering/power_room) +"sAi" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "sAk" = ( /obj/machinery/light/small/directional/west, /obj/structure/extinguisher_cabinet/directional/west, @@ -66453,42 +66598,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) -"sCO" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "chemistry_shutters"; - name = "Pharmacy Shutters" - }, -/obj/machinery/door/window/left/directional/south{ - name = "Pharmacy Desk"; - req_access = list("pharmacy"); - dir = 1 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/pharmacy) "sCQ" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -67100,13 +67209,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) -"sJb" = ( -/obj/effect/turf_decal/weather/snow, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/tlv_cold_room, -/obj/structure/kitchenspike, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "sJd" = ( /turf/closed/wall, /area/station/commons/vacant_room/office) @@ -67191,6 +67293,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_edge, /area/station/engineering/main) +"sJR" = ( +/obj/item/storage/bag/plants{ + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/watering_can{ + pixel_y = 3 + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "sKs" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/catwalk_floor/iron_smooth, @@ -67283,6 +67400,11 @@ /obj/machinery/light/directional/west, /turf/open/floor/noslip, /area/station/service/janitor) +"sLi" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/turf/open/floor/iron/smooth_corner, +/area/space) "sLk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -67446,6 +67568,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/nuke_storage) +"sMD" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/deck, +/obj/item/food/ready_donk/donkhiladas{ + pixel_y = 11; + pixel_x = 1 + }, +/obj/item/food/ready_donk/nachos_grandes{ + pixel_y = 7 + }, +/obj/item/food/ready_donk/mac_n_cheese{ + pixel_y = 3; + pixel_x = 2 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningoffice) "sMN" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -67759,6 +67897,9 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) +"sQJ" = ( +/turf/closed/wall, +/area/station/cargo/miningfoundry) "sQO" = ( /obj/structure/bookcase/random/religion, /obj/effect/turf_decal/siding/wood/corner{ @@ -67832,6 +67973,16 @@ }, /turf/open/floor/iron/smooth, /area/station/service/hydroponics/garden/abandoned) +"sSd" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/light/directional/north, +/obj/structure/table, +/obj/machinery/light_switch/directional/north{ + pixel_x = 13 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "sSf" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -67854,6 +68005,11 @@ /obj/structure/transit_tube/crossing, /turf/open/space/basic, /area/space/nearstation) +"sSm" = ( +/obj/structure/flora/bush/jungle/a/style_3, +/obj/structure/window/fulltile, +/turf/open/floor/grass, +/area/station/service/kitchen) "sSn" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/structure/table, @@ -68539,10 +68695,28 @@ dir = 8 }, /area/station/hallway/primary/fore) +"tbm" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/box, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/cargo/miningdock) "tbn" = ( /obj/structure/girder, /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/bar) +"tbp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "tbq" = ( /obj/structure/chair/pew/right, /obj/effect/turf_decal/siding/wood{ @@ -68697,6 +68871,18 @@ dir = 8 }, /area/station/medical/virology) +"tdG" = ( +/obj/structure/chair/stool/directional/west{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "tdL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -68704,30 +68890,6 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/port) -"tdO" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/left/directional/south{ - name = "Hydroponics Desk"; - req_access = list("hydroponics") - }, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "hydroponics_counter"; - name = "Hydroponics Counter Shutters" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/large, -/area/station/service/hydroponics) "tdY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69097,19 +69259,6 @@ dir = 8 }, /area/station/hallway/primary/central/aft) -"tiJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/biogenerator, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "hydroponics_counter"; - name = "Hydroponics Counter Shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/window/spawner/directional/east, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/large, -/area/station/service/hydroponics) "tiL" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -69149,16 +69298,6 @@ }, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation) -"tja" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/weather/snow, -/obj/machinery/light_switch/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable, -/obj/structure/closet/secure_closet/freezer/kitchen, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "tjr" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/hfr_room) @@ -69273,17 +69412,6 @@ /obj/structure/transit_tube/curved/flipped, /turf/open/space/basic, /area/space/nearstation) -"tlk" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/plasticflaps/opaque{ - name = "Kitchen Deliveries" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "Kitchen" - }, -/turf/open/floor/iron/large, -/area/station/maintenance/starboard/greater) "tlq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -69782,24 +69910,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/aft/greater) -"trR" = ( -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/cultivator, -/obj/item/clothing/head/utility/chefhat, -/obj/item/storage/box/lights/mixed, -/obj/effect/spawner/random/maintenance, -/obj/machinery/firealarm/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/item/storage/box/drinkingglasses, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "tsb" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -69994,6 +70104,15 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark/diagonal, /area/station/engineering/transit_tube) +"tuN" = ( +/obj/effect/spawner/random/trash/grime, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/smooth_corner{ + dir = 4 + }, +/area/space) "tuU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -70713,6 +70832,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"tDA" = ( +/obj/structure/table, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "tDI" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box, @@ -70814,25 +70938,6 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/cargo/storage) -"tEI" = ( -/obj/structure/table, -/obj/item/food/ready_donk/mac_n_cheese{ - pixel_y = 3; - pixel_x = 2 - }, -/obj/item/food/ready_donk/nachos_grandes{ - pixel_y = 7 - }, -/obj/item/food/ready_donk/donkhiladas{ - pixel_y = 11; - pixel_x = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/smooth, -/area/station/cargo/bitrunning/den) "tEK" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ dir = 10 @@ -70917,6 +71022,9 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/service/chapel/office) +"tFN" = ( +/turf/closed/wall, +/area/space) "tFW" = ( /obj/effect/turf_decal/trimline/dark_red/arrow_cw{ dir = 1 @@ -70984,10 +71092,6 @@ }, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/aisat/atmos) -"tGD" = ( -/obj/machinery/griddle, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "tGJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -71423,16 +71527,6 @@ /obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white/diagonal, /area/station/science/research) -"tNI" = ( -/obj/structure/chair/stool/directional/west{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/lounge) "tNN" = ( /obj/structure/window/spawner/directional/east, /turf/open/floor/grass, @@ -71446,15 +71540,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/central) -"tOa" = ( -/obj/structure/chair/plastic, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/start/bitrunner, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/bitrunning/den) "tOr" = ( /obj/effect/spawner/liquids_spawner, /obj/machinery/light/cold/directional/south, @@ -71660,6 +71745,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/medical/pharmacy) +"tRE" = ( +/obj/structure/cable, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "tRQ" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -71723,11 +71812,6 @@ dir = 4 }, /area/station/hallway/secondary/command) -"tSE" = ( -/obj/structure/flora/bush/jungle/a/style_3, -/obj/structure/window/fulltile, -/turf/open/floor/grass, -/area/station/service/kitchen) "tSH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/green{ @@ -71781,11 +71865,6 @@ "tTx" = ( /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"tTC" = ( -/obj/structure/railing/corner, -/obj/structure/sink/kitchen/directional/west, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "tTI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71850,15 +71929,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/kitchen, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/fore) -"tUw" = ( -/obj/effect/turf_decal/weather/snow, -/obj/machinery/camera/directional/west{ - c_tag = "Service - Kitchen Coldroom"; - dir = 5; - name = "service camera" - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "tUB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -71905,6 +71975,11 @@ }, /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) +"tVn" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/cargo/bitrunning/den) "tVB" = ( /obj/effect/turf_decal/delivery, /obj/machinery/space_heater, @@ -72048,6 +72123,11 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) +"tYp" = ( +/obj/machinery/chem_mass_spec, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron/freezer, +/area/station/medical/pharmacy) "tYr" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -72058,25 +72138,16 @@ }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) +"tZi" = ( +/obj/structure/noticeboard/directional/north, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/service) "tZj" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"tZu" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/box, -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "tZx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72523,11 +72594,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white/smooth_large, /area/station/science/auxlab) -"ueJ" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/deck, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/miningoffice) "ueO" = ( /obj/structure/closet/toolcloset, /obj/item/clothing/glasses/meson/engine, @@ -72638,6 +72704,15 @@ "ugz" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"ugC" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/drone_bay) "ugP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate_abandoned, @@ -72727,6 +72802,14 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/iron/large, /area/station/science/lab) +"uim" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningoffice) "uio" = ( /obj/machinery/button/door/incinerator_vent_atmos_aux{ pixel_x = -6; @@ -73240,6 +73323,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation/entertainment) +"upB" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/firealarm/directional/north, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "upF" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced/plasma, @@ -73604,6 +73695,12 @@ /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"utv" = ( +/obj/machinery/light/directional/north, +/obj/structure/closet/secure_closet/miner, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "utx" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 9 @@ -73986,6 +74083,21 @@ dir = 8 }, /area/station/medical/storage) +"uyc" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Mining" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/landmark/start/shaft_miner, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 9 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "uyk" = ( /turf/closed/wall, /area/station/medical/storage) @@ -74156,6 +74268,13 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"uzN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark/textured_large, +/area/station/cargo/bitrunning/den) "uzW" = ( /obj/effect/turf_decal/trimline/dark_red/arrow_ccw, /obj/structure/sign/poster/official/random/directional/south, @@ -74752,6 +74871,14 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +"uIn" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/computer/shuttle/mining, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/miningdock) "uIo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75059,29 +75186,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/wood/large, /area/station/command/heads_quarters/blueshield) -"uNs" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin{ - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_y = 4 - }, -/obj/machinery/requests_console/directional/south{ - department = "Service Hall"; - name = "Service Hall Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/item/radio/headset/headset_srv{ - pixel_x = -11; - pixel_y = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "uNu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -75343,11 +75447,6 @@ }, /turf/open/floor/iron/small, /area/station/hallway/primary/central) -"uQI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pod, -/turf/open/floor/wood, -/area/station/maintenance/rus_gambling) "uQV" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/service) @@ -75502,13 +75601,6 @@ }, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/ai_upload) -"uTk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/sorting) "uTs" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -75669,8 +75761,10 @@ }, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/aft) -"uVw" = ( -/obj/structure/trash_pile, +"uVp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/cargo/bitrunning/den) "uVG" = ( @@ -76015,21 +76109,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"vaJ" = ( -/obj/structure/table, -/obj/item/storage/bag/plants{ - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/watering_can{ - pixel_y = 3 - }, -/obj/machinery/newscaster/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "vaL" = ( /obj/structure/table/reinforced, /obj/structure/sign/calendar/directional/west, @@ -76302,6 +76381,14 @@ /obj/effect/turf_decal/stripes/end, /turf/open/floor/pod/dark, /area/station/engineering/storage/tech) +"vga" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hydroponics/glass{ + name = "Hydroponics" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/turf/open/floor/iron/large, +/area/station/service/hydroponics) "vgc" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -76365,6 +76452,11 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +"vhh" = ( +/obj/structure/flora/bush/jungle, +/obj/structure/window/fulltile, +/turf/open/floor/grass, +/area/station/service/hydroponics) "vhl" = ( /obj/machinery/door/airlock{ id_tag = "Toilet1"; @@ -76763,10 +76855,6 @@ dir = 4 }, /area/station/science/genetics) -"vmS" = ( -/obj/structure/sign/poster/contraband/mothic_rations, -/turf/closed/wall, -/area/station/service/kitchen) "vmX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock{ @@ -77084,14 +77172,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"vrL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/box, -/obj/machinery/rnd/production/techfab/department/service, -/turf/open/floor/iron/large, -/area/station/hallway/secondary/service) "vrU" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -77127,11 +77207,6 @@ /obj/machinery/space_heater, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos/lesser) -"vsK" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/office) "vsS" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -77154,22 +77229,6 @@ dir = 8 }, /area/station/hallway/primary/fore) -"vte" = ( -/obj/machinery/door/airlock/mining{ - name = "Bitrunning Den" - }, -/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/cargo/miningdock) "vti" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -77549,11 +77608,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"vxf" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/trimline/brown/filled/corner, -/turf/open/floor/iron/smooth_corner, -/area/station/cargo/bitrunning/den) "vxv" = ( /mob/living/basic/butterfly, /turf/closed/wall/mineral/iron, @@ -77604,16 +77658,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"vyb" = ( -/obj/machinery/light/warm/directional/east, -/obj/machinery/status_display/ai/directional/east, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/restaurant_portal/restaurant, -/turf/open/floor/iron/smooth_large, -/area/station/service/cafeteria) "vyc" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -78151,6 +78195,16 @@ /obj/structure/railing, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"vGV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/table, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "vHa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78767,6 +78821,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"vPl" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/icecream_vat, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "vPr" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -79120,11 +79183,6 @@ dir = 4 }, /area/station/engineering/atmos) -"vUt" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/cargo/sorting) "vUB" = ( /obj/machinery/incident_display/delam, /turf/closed/wall/r_wall, @@ -79493,10 +79551,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) -"vZc" = ( -/obj/structure/cable, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "vZk" = ( /obj/machinery/cryopod, /obj/effect/turf_decal/siding/white, @@ -80072,11 +80126,6 @@ /obj/structure/table/wood/fancy, /turf/open/floor/pod/dark, /area/station/service/chapel) -"whq" = ( -/obj/structure/table, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "whu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -80435,6 +80484,14 @@ }, /turf/open/floor/carpet/black, /area/station/service/chapel/office) +"wnd" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "wne" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/green/corner{ @@ -80507,27 +80564,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"woE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/table, -/obj/item/serviette_pack{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "woG" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -80662,6 +80698,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/smooth_large, /area/station/hallway/primary/aft) +"wpS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningfoundry) "wqd" = ( /turf/closed/wall, /area/station/service/kitchen/abandoned) @@ -80719,6 +80760,15 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/engine/atmos) +"wrn" = ( +/obj/structure/chair/stool/directional/west{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "wrA" = ( /obj/structure/rack, /obj/item/clothing/head/helmet/sec{ @@ -80902,6 +80952,16 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/cargo/lobby) +"wsQ" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/effect/landmark/start/shaft_miner, +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/miningdock) "wsR" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -81122,17 +81182,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) -"wwr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/structure/closet/secure_closet/chemical, -/obj/item/storage/box/syringes, -/obj/item/storage/box/beakers, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/freezer, -/area/station/medical/pharmacy) "wwA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -81560,6 +81609,16 @@ /obj/structure/cable, /turf/open/floor/iron/small, /area/station/commons/dorms) +"wBf" = ( +/obj/machinery/light/warm/directional/east, +/obj/machinery/status_display/ai/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/iron/smooth_large, +/area/station/service/cafeteria) "wBk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82390,6 +82449,29 @@ /obj/structure/sign/calendar/directional/west, /turf/open/floor/wood/large, /area/station/science/research) +"wMw" = ( +/obj/item/plate/oven_tray{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/plate/oven_tray{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/suit/apron/chef{ + pixel_y = 11 + }, +/obj/item/book/manual/wiki/cooking_to_serve_man{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/table, +/obj/item/knife/kitchen{ + pixel_x = -13; + pixel_y = 3 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "wMA" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -82698,17 +82780,21 @@ dir = 4 }, /area/station/service/hydroponics/garden) -"wQw" = ( -/obj/effect/turf_decal/weather/snow, -/obj/structure/kitchenspike, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/service/kitchen/coldroom) "wQx" = ( /obj/effect/turf_decal/tile/red/anticorner{ dir = 8 }, /turf/open/floor/pod/dark, /area/station/service/chapel/office) +"wQL" = ( +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/drone_bay) "wQU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -82969,6 +83055,10 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"wVD" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/sorting) "wVH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -83086,23 +83176,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/gateway) -"wYr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green/diagonal_centre, -/obj/machinery/status_display/ai/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/diagonal, -/area/station/hallway/secondary/service) "wYw" = ( /obj/structure/toilet{ color = "#d4af37"; @@ -83298,6 +83371,12 @@ /obj/effect/turf_decal/trimline/white/mid_joiner, /turf/open/floor/carpet/black, /area/station/commons/dorms) +"xcq" = ( +/obj/structure/flora/bush/fullgrass, +/obj/structure/flora/bush/ferny, +/obj/structure/window/fulltile, +/turf/open/floor/grass, +/area/station/service/kitchen) "xcD" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 @@ -83443,17 +83522,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) -"xgl" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Service - Cafeteria Aft"; - name = "service camera" - }, -/obj/structure/chair/sofa/corp/left{ - color = "#DE3A3A"; - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/service/cafeteria) "xgv" = ( /obj/machinery/smartfridge/chemistry/virology/preloaded, /obj/effect/turf_decal/trimline/dark_green/filled/line{ @@ -84028,6 +84096,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"xou" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "xoG" = ( /obj/machinery/biogenerator, /obj/item/reagent_containers/cup/beaker{ @@ -84272,16 +84345,6 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/hallway/secondary/exit/departure_lounge) -"xqM" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/miner, -/turf/open/floor/iron/smooth_corner{ - dir = 8 - }, -/area/station/cargo/miningdock) "xqO" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, @@ -84495,6 +84558,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) +"xtx" = ( +/obj/machinery/deepfryer, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "xtF" = ( /obj/machinery/atmospherics/components/binary/crystallizer{ dir = 4 @@ -84937,6 +85004,19 @@ "xAr" = ( /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"xAy" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/landmark/start/assistant, +/obj/machinery/light_switch/directional/north{ + pixel_x = 13 + }, +/obj/structure/window/spawner/directional/west, +/obj/structure/chair/sofa/corp/left{ + color = "#DE3A3A"; + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/cafeteria) "xAC" = ( /obj/structure/railing{ dir = 8 @@ -85089,19 +85169,6 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) -"xDK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/chem_master/condimaster, -/obj/structure/railing{ - dir = 6 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "xDL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -85267,6 +85334,16 @@ }, /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) +"xFW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/cargo/miningdock) "xGe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -85375,6 +85452,12 @@ dir = 8 }, /area/station/hallway/primary/fore) +"xHx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/weather/snow, +/mob/living/basic/goat/pete, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/service/kitchen/coldroom) "xHB" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -85809,6 +85892,18 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/tcommsat/computer) +"xPd" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 5 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/structure/sign/poster/contraband/random/directional/north, +/obj/effect/landmark/start/bitrunner, +/turf/open/floor/iron/smooth, +/area/space) "xPf" = ( /obj/structure/chair/wood, /obj/item/radio/intercom/chapel{ @@ -86254,16 +86349,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/morgue) -"xUG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/table, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "xUK" = ( /obj/structure/disposaloutlet{ dir = 1; @@ -86525,6 +86610,16 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/iron/smooth, /area/station/maintenance/department/medical/central) +"xYN" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/table, +/obj/machinery/microwave{ + desc = "Cooks and boils stuff, somehow."; + pixel_x = -2; + pixel_y = 5 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "xZa" = ( /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/edge{ @@ -86790,6 +86885,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/lab) +"ycB" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/rnd/production/techfab/department/service, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/large, +/area/station/hallway/secondary/service) "ycD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, @@ -86968,6 +87071,19 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/engine/atmos/lesser) +"yfa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green/diagonal_centre, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/iron/diagonal, +/area/station/hallway/secondary/service) "yfl" = ( /obj/effect/turf_decal/trimline/green/filled/warning, /obj/structure/cable, @@ -87143,6 +87259,10 @@ dir = 4 }, /area/station/hallway/secondary/command) +"yib" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/cargo/miningdock) "yis" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -87189,16 +87309,6 @@ dir = 1 }, /area/station/engineering/atmos) -"yjD" = ( -/obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/door/window/survival_pod{ - dir = 8; - name = "Fitness Ring" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/floor, -/turf/open/floor/iron/dark/smooth_large, -/area/station/commons/fitness/recreation/entertainment) "yjP" = ( /obj/machinery/requests_console/directional/east{ department = "Chemistry"; @@ -111132,7 +111242,7 @@ qCd eFq cSD lbX -hbG +mdF gOn gIW iTA @@ -114254,7 +114364,7 @@ aeg ljI ljI rIN -eSB +eMf nPN pdU xRR @@ -118828,7 +118938,7 @@ oUR lnS cHc waR -tNI +hyw nmm sgE pEL @@ -118868,7 +118978,7 @@ fDn aAN hns qZl -ebp +sre fDn fDn dof @@ -119638,9 +119748,9 @@ tJU ykT vVO twU -wwr +kKa mJB -eil +tYp pAK mAC nIJ @@ -119892,7 +120002,7 @@ gLN gLN ojZ cwM -sCO +eUE hGE gQm fft @@ -120156,7 +120266,7 @@ pKg nXW kgk fDn -njQ +rVm dPv eEq xkq @@ -121398,8 +121508,8 @@ qSu qSu rUj bPZ -sbx -kKA +xAy +aeH lxC cnA rUb @@ -121655,8 +121765,8 @@ qSu gYN dqJ bPZ -jUL -ekG +pDj +jVW kLz cnA rUb @@ -121912,13 +122022,13 @@ wAA mDP cau cau -qwy -qwy -qwy -hUv -eYX -lkz -anI +wrn +wrn +wrn +tdG +fNg +jDI +rKL rUb qQh fVT @@ -122167,16 +122277,16 @@ vDG qAl jSC jSC -btx -koZ +xcq +isq tdn -xUG -fxo -olm -gyK -woE +vGV +hkU +ige +gKa +nja gOt -vyb +wBf kPh ooa hZp @@ -122214,7 +122324,7 @@ uDE xcg xyf mEL -yjD +mjC ieO ieO tcz @@ -122423,16 +122533,16 @@ dcg pzr lcT bnA -bRS -qor -nNS -pei +ecl +wMw +xtx +sdl xFd -tTC -bOI -bMB -rSO -xgl +eCV +mPf +neg +lsG +ioX fLp oie oRJ @@ -122680,18 +122790,18 @@ gzn tUt lkG wrT -coJ -coC +jaG +iRi xRG xRG -liO -fMm +fUb +pdo jSC -esZ +hCJ bPZ bPZ fLp -cIT +gsl hhJ pep udR @@ -122937,18 +123047,18 @@ hvD uKp eGd jSC -jdH +sSd ibK xFd -ocK -rGx -xDK +bYX +acT +aLz bnA -aXm -hBP -eeS -nzv -mkD +iNb +beU +nZU +vhh +hwE fuP roz wne @@ -122988,7 +123098,7 @@ hsq ptW uDd uDd -dzq +hqp cFx uAx jfo @@ -123194,23 +123304,23 @@ hvD hUS eGd bnA -tGD +aGg puH xFd gZD -anP -eGy +gvO +mNK ogb -dAy -nTI -olG -tiJ +aaY +cyI +lOC +fYn wQo jGl -jio +akj hzT mqk -jio +akj qaD fLp nhJ @@ -123451,23 +123561,23 @@ jrX hUS eGd bnA -tGD -vZc -nMk +aGg +tRE +xou gZD -hqe -ivZ +dfG +eNr cbf -dAy -eWX +aaY +cEq vOZ -ssw +vga bmN jGl -jio +akj hzT mqk -jio +akj rMh fLp tzs @@ -123707,18 +123817,18 @@ wzH hRr fba cUM -vmS -whq +lQG +tDA orv xFd -iog -foi -tZu -tSE -lWH -gKB -ajR -tdO +nRS +fvY +ePd +sSm +aaY +bux +oSm +hGX slL qEr bKI @@ -123965,18 +124075,18 @@ hvD hUS eGd bnA -fva -lHd +rSX +lMt pow pow tgy jSC jSC -wYr -vrL +iYT +ycB fLp fLp -obz +pNs jru qKf nGh @@ -124222,15 +124332,15 @@ hvD hUS eGd bnA -iIG -mFX +xYN +qSs bLx ehn -iJt +hIw jSC -nYG -rvS -vaJ +ivQ +bNV +sJR fLp hnJ cCw @@ -124481,21 +124591,21 @@ slJ hfU hfU hfU -nUo +kIg hfU hfU jSC -hFu +eNJ ctf -uNs +qQn fLp pKd wxX mqk -jio +akj llF mqk -jio +akj jCH fLp uuO @@ -124736,23 +124846,23 @@ hvD dSe hzx hfU -eGT -tja -nRy -mVt +upB +gHS +hNB +ern hfU -gtJ -fZg +rla +jvC koq -trR +vPl fLp fNL wxX mqk -jio +akj llF mqk -jio +akj grQ fLp rjf @@ -124993,15 +125103,15 @@ hvD hUS eGd hfU -sJb -gFG -gIO -tUw +din +xHx +cxP +iEJ hfU -eEd -bPG -ctf -bdX +pWe +mlz +yfa +kpe fLp qEC iAM @@ -125250,13 +125360,13 @@ nJH hUS fyP hfU -wQw -qAn -ely -jDX +bsF +jEP +gcp +qDl hfU -itf -bmk +tZi +gZV dIM rMB fLp @@ -125510,7 +125620,7 @@ iNV iNV qzy iNV -tlk +lnT iNV iNV mNF @@ -125831,7 +125941,7 @@ pnL txh fTO gjv -vUt +owG ssQ vIF ekf @@ -126345,7 +126455,7 @@ pXL uTI djy rop -lkM +wVD wsP szj aqJ @@ -127115,7 +127225,7 @@ vXh jTg nLC qni -lkM +wVD cfZ tjR eiX @@ -127374,9 +127484,9 @@ hne mth rop rli -fye +dMh vuu -fye +dMh uzc qid rli @@ -127629,7 +127739,7 @@ rop gSW xGe sSn -lkM +wVD jLQ ukJ nTB @@ -127886,14 +127996,14 @@ cRU joy bey dGK -lkM +wVD rRS uLe bmS tkn gjm wJg -fye +dMh pgc gwM mGO @@ -128097,7 +128207,7 @@ tDO wkm gDf djz -uQI +iAj ykh wtQ yep @@ -128129,7 +128239,7 @@ izK mgS onP ofb -iCW +qXo onP pqh vCX @@ -128138,11 +128248,11 @@ vCX nvF pqh pqh -uTk +rtG rop rop pOV -lkM +wVD rop nUi xaD @@ -128150,7 +128260,7 @@ ltN xHW uLe kMM -fye +dMh pgc lxc gpK @@ -128407,7 +128517,7 @@ dNV uSX wjH wMS -vsK +qLC umD jgI rKH @@ -128664,7 +128774,7 @@ lCU eSk leb eEz -vsK +qLC mnf tWE rbW @@ -129157,8 +129267,8 @@ xud xud xud xdZ -nyf -nyf +sgl +yaj yaj wuW sFi @@ -129175,9 +129285,9 @@ sFi sFi sFi oLo -eDx -eDx -eDx +shC +shC +shC oLo sUo rzr @@ -129406,16 +129516,16 @@ xMq xMq xMq oXI -fNX -iNa -bkF +mGz +uyc +xFW hQq qBe odX ipj ekQ bNu -lBF +uim yaj xMq sFi @@ -129431,7 +129541,7 @@ xTN git uho cHk -eDx +shC mqJ kBs nnr @@ -129663,17 +129773,17 @@ odJ xqO xMq oXI -ihS -cvp -nqU +utv +wsQ +tbp bcW njG xCF xCF xXC -ueJ +sMD gjq -nyf +sgl gZb wuW wVQ @@ -129692,7 +129802,7 @@ oLo nGM lGO pHC -eDx +shC dsj idx fsd @@ -129920,17 +130030,17 @@ ttw odJ xMq oXI -iFV -lmY -krz +mGz +dUa +tbp lon -cbP +yib szk -haV +nRy xXC jay dMl -nyf +sgl cKl wuW eGw @@ -129949,7 +130059,7 @@ sSV lKg npI oyG -eDx +shC hDf vNs mvz @@ -130177,10 +130287,10 @@ ttw odJ xMq oXI -oCm -jAS -krz -pmM +iKe +wsQ +tbp +tbm oXI pjT pjT @@ -130431,16 +130541,16 @@ ttw ttw ttw ttw -cbP -cbP -cbP -qtr -oWg -qpX +yib +yib +yib +laf +llM +tbp lFU oXI jBq -gsb +jnu efH ouL aUA @@ -130503,7 +130613,7 @@ wIM eWs kLc unI -fJV +poE mRm mRm rgt @@ -130697,7 +130807,7 @@ ucK hkN oXI mXQ -qTS +ugC nNB ens cRT @@ -130945,16 +131055,16 @@ ttw ttw ttw ttw -cbP -cbP -cbP -dpw -pws +yib +yib +yib +uIn +kjt ucK hwL oXI hwR -kbi +lFv kVH gJs jXN @@ -131205,13 +131315,13 @@ ttw odJ xMq oXI -kkC -pws -hSf -llf +oNA +dea +awr +oCs oXI -emO -dTO +juG +wQL wyB iVW coN @@ -131462,13 +131572,13 @@ ttw odJ xMq oXI -xqM -sqL -nBO -afo +yib +yib +nFa +oXI oXI pjT -pjT +shJ pjT pjT pjT @@ -131718,18 +131828,18 @@ odJ odJ xqO xMq -oXI -oXI -oXI -vte -oXI -oXI -qBt -ldU +sQJ +pvB +mHC +neT +enw +sQJ +lcZ +pUM +mNX +fNI qBt cBk -ttw -ttw xMq xqO ltB @@ -131975,19 +132085,19 @@ xMq xMq xMq xMq -cBk -pqk -nGR -goP -kdS -oUb -dAV +sQJ +cYc +wpS +jfx +kVv +sQJ +bjI +uVp +pNx ksB oxn wYd xMq -xMq -xMq odJ ttw ttw @@ -132232,18 +132342,18 @@ ttw ttw ttw xMq -cBk -hjg -hJg -tOa -qgY +sQJ +fdZ +qlR +iZW +gQp +sQJ fth -iLb -deu +gJt +rJo +uzN oky wYd -ttw -ttw xMq odJ ttw @@ -132489,18 +132599,18 @@ ttw kUb ttw xMq -cBk -hKK -kFL -vxf -pFJ +sQJ +jZq +gsZ +rMv +aka +sQJ qhU -mTY -jvw -rnb +fPB +ogM +aTk +cXP wYd -ttw -ttw xMq odJ ttw @@ -132746,18 +132856,18 @@ ttw kUb ttw xMq +sQJ +sAi +rZz +wnd +ppC +sQJ +eQw +iva +ibR +tVn +psR cBk -cBk -oGX -tEI -cBk -uVw -leF -gWT -cBk -cBk -xMq -xMq xMq odJ ttw @@ -133003,18 +133113,18 @@ xMq kUb xMq xMq -xMq -cBk +sQJ +sQJ +sQJ +sQJ +sQJ +sQJ cBk cBk cBk cBk cBk cBk -cBk -xMq -ttw -ttw xMq odJ ttw @@ -133263,7 +133373,7 @@ ttw xMq xMq xMq -xMq +osx xMq xMq xMq @@ -135320,10 +135430,10 @@ ttw ttw ttw ttw -ttw -ttw -ttw -ttw +tFN +lDU +bzd +iqv ttw ttw ttw @@ -135577,10 +135687,10 @@ ttw ttw ttw ttw -ttw -ttw -ttw -ttw +tFN +qtJ +iCU +hsX ttw ttw ttw @@ -135834,10 +135944,10 @@ ttw ttw ttw ttw -ttw -ttw -ttw -ttw +tFN +xPd +tuN +sLi ttw ttw ttw @@ -136091,10 +136201,10 @@ ttw ttw ttw ttw -ttw -ttw -ttw -ttw +tFN +tFN +bIo +eOA ttw ttw ttw @@ -136348,10 +136458,10 @@ ttw ttw ttw ttw -ttw -ttw -ttw -ttw +kXK +tFN +tFN +tFN ttw ttw ttw diff --git a/_maps/shuttles/nova/pirate_nri_raider.dmm b/_maps/shuttles/nova/pirate_nri_raider.dmm index 1fa7bc5c469..d6cede8e5d5 100644 --- a/_maps/shuttles/nova/pirate_nri_raider.dmm +++ b/_maps/shuttles/nova/pirate_nri_raider.dmm @@ -599,9 +599,6 @@ }, /turf/open/floor/plating, /area/shuttle/pirate/nri) -"wb" = ( -/turf/open/floor/pod/light, -/area/shuttle/pirate/nri) "wh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -890,10 +887,13 @@ /area/shuttle/pirate/nri) "Gh" = ( /obj/effect/turf_decal/stripes/line, -/obj/item/storage/box/ammo_box/shotgun_12g, -/obj/item/storage/box/ammo_box/shotgun_12g, -/obj/item/storage/box/ammo_box/shotgun_12g, /obj/structure/rack/shelf, +/obj/item/ammo_box/advanced/s12gauge/bean, +/obj/item/ammo_box/advanced/s12gauge/bean, +/obj/item/ammo_box/advanced/s12gauge/magnum, +/obj/item/ammo_box/advanced/s12gauge/magnum, +/obj/item/ammo_box/advanced/s12gauge/rubber, +/obj/item/ammo_box/advanced/s12gauge/rubber, /turf/open/floor/pod/light, /area/shuttle/pirate/nri) "GO" = ( @@ -1259,12 +1259,6 @@ }, /turf/closed/wall/mineral/titanium/spaceship/nodiagonal, /area/shuttle/pirate/nri) -"Ui" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/pod/dark, -/area/shuttle/pirate/nri) "UO" = ( /obj/structure/closet/crate/freezer/blood{ anchored = 1 @@ -1546,7 +1540,7 @@ iC iC IY Hz -Ui +HV kQ rp sK @@ -1611,8 +1605,8 @@ Hz (12,1,1) = {" Hz Gh -wb -wb +qp +qp wM kb wQ @@ -1621,14 +1615,14 @@ Nu IT HO IT -wb -wb +qp +qp Hz "} (13,1,1) = {" Hz fB -wb +qp JB Hz rd @@ -1638,14 +1632,14 @@ wT be Hz Bw -wb +qp DL Hz "} (14,1,1) = {" Hz Hh -wb +qp Ci Hz tk @@ -1655,7 +1649,7 @@ od tk Hz bE -wb +qp pg Hz "} @@ -1735,7 +1729,7 @@ xp Hz zJ xX -wb +qp qz Qg Hz @@ -1752,7 +1746,7 @@ IT Hz LA ui -wb +qp VN mJ Hz diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 3a4c5faa28e..b38dd983988 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -146,7 +146,6 @@ #define ANNOUNCER_SPOOKY "announcer_spooky" #define ANNOUNCER_ERTYES "announcer_ertyes" #define ANNOUNCER_MUTANTS "announcer_mutants" -#define ANNOUNCER_KLAXON "announcer_klaxon" #define ANNOUNCER_NRI_RAIDERS "announcer_nri_raiders" #define ANNOUNCER_OUTBREAK6 "announcer_outbreak6" #define ANNOUNCER_DEPARTMENTAL "announcer_departmental" @@ -193,7 +192,6 @@ GLOBAL_LIST_INIT(announcer_keys, list( ANNOUNCER_SPOOKY, ANNOUNCER_ERTYES, ANNOUNCER_MUTANTS, - ANNOUNCER_KLAXON, ANNOUNCER_NRI_RAIDERS, ANNOUNCER_OUTBREAK6, //NOVA EDIT END diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index f47fc72fbf3..a8d7e62f756 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -95,28 +95,6 @@ //MODULAR SKYRAT ENTRIES //PLEASE REFACTOR THESE AS YOU CAN /mob/living/simple_animal/hostile/bigcrab, - /mob/living/simple_animal/hostile/blackmesa, - /mob/living/simple_animal/hostile/blackmesa/blackops, - /mob/living/simple_animal/hostile/blackmesa/blackops/ranged, - /mob/living/simple_animal/hostile/blackmesa/hecu, - /mob/living/simple_animal/hostile/blackmesa/hecu/ranged, - /mob/living/simple_animal/hostile/blackmesa/hecu/ranged/smg, - /mob/living/simple_animal/hostile/blackmesa/sec, - /mob/living/simple_animal/hostile/blackmesa/sec/ranged, - /mob/living/simple_animal/hostile/blackmesa/xen, - /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab/fast, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hecu, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/scientist, - /mob/living/simple_animal/hostile/blackmesa/xen/houndeye, - /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth, - /mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt, - /mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave, /mob/living/simple_animal/hostile/cazador, /mob/living/simple_animal/hostile/cult, /mob/living/simple_animal/hostile/cult/assassin, diff --git a/modular_nova/master_files/code/game/objects/effects/decals/remains.dm b/modular_nova/master_files/code/game/objects/effects/decals/remains.dm index 559bfec759f..3dc421d40be 100644 --- a/modular_nova/master_files/code/game/objects/effects/decals/remains.dm +++ b/modular_nova/master_files/code/game/objects/effects/decals/remains.dm @@ -1,2 +1,2 @@ /obj/effect/decal/remains/NeverShouldHaveComeHere(turf/here_turf) - return !islava(here_turf) && !(istype(here_turf, /turf/open/water/beach/xen) || istype(here_turf, /turf/open/misc/beach/coastline_t) || istype(here_turf, /turf/open/water/xen_acid)) && ..() + return !islava(here_turf) && ..() diff --git a/modular_nova/master_files/code/game/sound.dm b/modular_nova/master_files/code/game/sound.dm index 24bfca732d8..b2842468319 100644 --- a/modular_nova/master_files/code/game/sound.dm +++ b/modular_nova/master_files/code/game/sound.dm @@ -97,13 +97,11 @@ soundin = pick('modular_nova/master_files/sound/weapons/punch1.ogg', 'modular_nova/master_files/sound/weapons/punch3.ogg') if ("explosion") soundin = pick( - 'modular_nova/modules/black_mesa/sound/explosions/explode1.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode2.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode3.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode4.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode5.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode6.ogg', - 'modular_nova/modules/black_mesa/sound/explosions/explode7.ogg', + 'sound/effects/explosion1.ogg', + 'sound/effects/explosion2.ogg', + 'sound/effects/explosion3.ogg', + 'sound/effects/explosioncreak1.ogg', + 'sound/effects/explosioncreak2.ogg', ) return soundin diff --git a/modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi b/modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi index 5be3dd72671..0b22f2bd2c4 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi and b/modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi differ diff --git a/modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi b/modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi index 61388a6acfb..2b6864d72ea 100644 Binary files a/modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi and b/modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/head/helmet.dmi b/modular_nova/master_files/icons/obj/clothing/head/helmet.dmi index 8b68aa90330..29734b04958 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/head/helmet.dmi and b/modular_nova/master_files/icons/obj/clothing/head/helmet.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/suits.dmi b/modular_nova/master_files/icons/obj/clothing/suits.dmi index 79f62422efc..77bc57a7ebd 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/suits.dmi and b/modular_nova/master_files/icons/obj/clothing/suits.dmi differ diff --git a/modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi b/modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi index 0032f1f7011..1e2a035cb2d 100644 Binary files a/modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi and b/modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi differ diff --git a/modular_nova/modules/aesthetics/flag/code/signs_flags.dm b/modular_nova/modules/aesthetics/flag/code/signs_flags.dm index 28fa6627c93..a327c5f80a2 100644 --- a/modular_nova/modules/aesthetics/flag/code/signs_flags.dm +++ b/modular_nova/modules/aesthetics/flag/code/signs_flags.dm @@ -81,15 +81,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/nri, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/azulea, 32) -/// Please, for the love of God, use this in Black Mesa ONLY. NOWHERE ELSE. It's the only reason it was allowed in the game. -/obj/structure/sign/flag/usa - name = "flag of the United States of America" - desc = "'Stars and Stripes', the flag of the United States of America. Its red color represents endurance and valor; blue one shows diligence, vigilance and justice, and the white one signs at pureness. Its thirteen red-and-white stripes show the initial thirteen founding colonies, and fifty stars designate the current fifty states." - icon_state = "flag_usa" - item_flag = /obj/item/sign/flag/usa - -MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/usa, 32) - /obj/structure/sign/flag/syndicate name = "flag of the Syndicate" desc = "The flag of the Sothran Syndicate. Previously used by the Sothran people as a way of declaring opposition against the Nanotrasen, now it became an intergalactic symbol of the same, yet way more skewed purpose, as more groups of interest have joined the rebellion's side for their own gain." @@ -173,13 +164,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/interdyne, 32) icon_state = "folded_azulea" sign_path = /obj/structure/sign/flag/azulea -/// Please, for the love of God, use this in Black Mesa ONLY. NOWHERE ELSE. It's the only reason it was allowed in the game. -/obj/item/sign/flag/usa - name = "folded flag of the United States of America" - desc = "The folded flag of the United States of America." - icon_state = "folded_usa" - sign_path = /obj/structure/sign/flag/usa - /obj/item/sign/flag/syndicate name = "folded flag of the Syndicate" desc = "The folded flag of the Sothran Syndicate." diff --git a/modular_nova/modules/aesthetics/flag/icons/flags.dmi b/modular_nova/modules/aesthetics/flag/icons/flags.dmi index 4d2c7bd471a..d2844fc2484 100644 Binary files a/modular_nova/modules/aesthetics/flag/icons/flags.dmi and b/modular_nova/modules/aesthetics/flag/icons/flags.dmi differ diff --git a/modular_nova/modules/alerts/code/default_announcer.dm b/modular_nova/modules/alerts/code/default_announcer.dm index fb56fe10edc..8fd3afa8ee4 100644 --- a/modular_nova/modules/alerts/code/default_announcer.dm +++ b/modular_nova/modules/alerts/code/default_announcer.dm @@ -40,7 +40,6 @@ ANNOUNCER_SPOOKY = 'modular_nova/modules/alerts/sound/misc/admin_horror_music.ogg', ANNOUNCER_ERTYES = 'modular_nova/modules/alerts/sound/alerts/yesert.ogg', ANNOUNCER_MUTANTS = 'modular_nova/modules/alerts/sound/alerts/hazdet.ogg', - ANNOUNCER_KLAXON = 'modular_nova/modules/black_mesa/sound/siren1_long.ogg', ANNOUNCER_NRI_RAIDERS = 'modular_nova/modules/encounters/sounds/morse.ogg', ANNOUNCER_DEPARTMENTAL = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg', ANNOUNCER_SHUTTLE = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg', diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm index d37988d9443..643cda53280 100644 --- a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm +++ b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm @@ -13,7 +13,7 @@ /mob/living/basic/trooper/cin_soldier/melee r_hand = /obj/item/melee/energy/sword/saber/purple - l_hand = /obj/item/shield/riot/pointman/hecu + l_hand = /obj/item/shield/energy var/projectile_deflect_chance = 20 /mob/living/basic/trooper/cin_soldier/melee/bullet_act(obj/projectile/projectile) diff --git a/modular_nova/modules/black_mesa/code/armaments/__armament_bodyarmor.dm b/modular_nova/modules/black_mesa/code/armaments/__armament_bodyarmor.dm deleted file mode 100644 index f4175728e65..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/__armament_bodyarmor.dm +++ /dev/null @@ -1,45 +0,0 @@ - -/datum/armament_entry/hecu/bodyarmor - category = "Armor Kit" - category_item_limit = 4 - -/datum/armament_entry/hecu/bodyarmor/normal - name = "Basic Armor Kit" - description = "Contains a set of two basic armor pieces, meant to decently protect your body against everything." - item_type = /obj/item/storage/box/armor_set/normal - max_purchase = 4 - cost = 6 - -/datum/armament_entry/hecu/bodyarmor/pcv - name = "PCV Kit" - description = "Contains a set of two hazardous environment armor pieces. This armor gives you a robust all-around protection, as well as mild regeneration." - item_type = /obj/item/storage/box/armor_set/pcv - max_purchase = 4 - cost = 20 - -/obj/item/storage/box/armor_set - name = "box of armor" - desc = "Box full of armor. Amazing." - icon_state = "box" - illustration = null - -/obj/item/storage/box/armor_set/Initialize(mapload) - . = ..() - atom_storage.set_holdable(list(/obj/item/clothing/suit/armor,/obj/item/clothing/suit/space/hev_suit/pcv,/obj/item/clothing/head/helmet)) - atom_storage.max_slots = 2 - -/obj/item/storage/box/armor_set/normal - name = "combat armor set" - desc = "Box containing a damage-resistant armor vest and helmet." - -/obj/item/storage/box/armor_set/normal/PopulateContents() - new /obj/item/clothing/suit/armor/vest/hecu(src) - new /obj/item/clothing/head/helmet/hecu(src) - -/obj/item/storage/box/armor_set/pcv - name = "PCV Mk. II armor set" - desc = "Box containing a PCV Mark II armor vest and helmet." - -/obj/item/storage/box/armor_set/pcv/PopulateContents() - new /obj/item/clothing/suit/space/hev_suit/pcv(src) - new /obj/item/clothing/head/helmet/space/hev_suit/pcv(src) diff --git a/modular_nova/modules/black_mesa/code/armaments/_armament_primary.dm b/modular_nova/modules/black_mesa/code/armaments/_armament_primary.dm deleted file mode 100644 index 4ef7c1e2c11..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/_armament_primary.dm +++ /dev/null @@ -1,76 +0,0 @@ -/datum/armament_entry/hecu/primary - category = ARMAMENT_CATEGORY_PRIMARY - category_item_limit = 4 - slot_to_equip = ITEM_SLOT_SUITSTORE - cost = 10 - -/datum/armament_entry/hecu/primary/submachinegun - subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN - mags_to_spawn = 4 - -/datum/armament_entry/hecu/primary/submachinegun/sindano - item_type = /obj/item/gun/ballistic/automatic/sol_smg - max_purchase = 4 - cost = 7 - -/datum/armament_entry/hecu/primary/submachinegun/bogseo - item_type = /obj/item/gun/ballistic/automatic/xhihao_smg - max_purchase = 2 - cost = 8 - -/datum/armament_entry/hecu/primary/assaultrifle - subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE - mags_to_spawn = 3 - -/datum/armament_entry/hecu/primary/assaultrifle/infanteria - item_type = /obj/item/gun/ballistic/automatic/sol_rifle - max_purchase = 2 - cost = 11 - magazine = /obj/item/ammo_box/magazine/c40sol_rifle/standard - -/datum/armament_entry/hecu/primary/shotgun - subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN - mags_to_spawn = 1 - magazine = /obj/item/storage/box/ammo_box/shotgun_12g - magazine_cost = 4 - -/datum/armament_entry/hecu/primary/shotgun/shotgun_highcap - item_type = /obj/item/gun/ballistic/shotgun/riot/sol - max_purchase = 2 - cost = 5 - -/datum/armament_entry/hecu/primary/shotgun/autoshotgun_pump - item_type = /obj/item/gun/ballistic/shotgun/automatic/as2 - max_purchase = 1 - cost = 7 - -/datum/armament_entry/hecu/primary/special - subcategory = ARMAMENT_SUBCATEGORY_SPECIAL - mags_to_spawn = 2 - -/datum/armament_entry/hecu/primary/special/sniper_rifle - item_type = /obj/item/gun/ballistic/automatic/sol_rifle/marksman - max_purchase = 1 - cost = 16 - -/datum/armament_entry/hecu/primary/special/hmg - item_type = /obj/item/mounted_machine_gun_folded - max_purchase = 1 - cost = 20 - magazine = /obj/item/ammo_box/magazine/mmg_box - mags_to_spawn = 1 - magazine_cost = 2 - -/obj/item/storage/box/ammo_box/shotgun_12g - -/obj/item/storage/box/ammo_box/shotgun_12g/PopulateContents() - var/funshell = pick( - /obj/item/ammo_box/advanced/s12gauge/incendiary, - /obj/item/ammo_box/advanced/s12gauge/flechette, - /obj/item/ammo_box/advanced/s12gauge/beehive, - /obj/item/ammo_box/advanced/s12gauge/antitide, - /obj/item/ammo_box/advanced/s12gauge/express, - ) - new /obj/item/ammo_box/advanced/s12gauge/magnum(src) - new /obj/item/ammo_box/advanced/s12gauge(src) - new funshell(src) diff --git a/modular_nova/modules/black_mesa/code/armaments/_armaments_secondary.dm b/modular_nova/modules/black_mesa/code/armaments/_armaments_secondary.dm deleted file mode 100644 index 2098c72a718..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/_armaments_secondary.dm +++ /dev/null @@ -1,37 +0,0 @@ -// SECONDARY WEAPONS -/datum/armament_entry/hecu/secondary - category = ARMAMENT_CATEGORY_SECONDARY - category_item_limit = 4 - cost = 5 - mags_to_spawn = 2 - -/datum/armament_entry/hecu/secondary/pistol - subcategory = ARMAMENT_SUBCATEGORY_PISTOL - -/datum/armament_entry/hecu/secondary/pistol/m1911 - item_type = /obj/item/gun/ballistic/automatic/pistol/m1911 - max_purchase = 4 - -/datum/armament_entry/hecu/secondary/pistol/pistol - item_type = /obj/item/gun/ballistic/automatic/pistol/sol - max_purchase = 4 - mags_to_spawn = 3 - -/datum/armament_entry/hecu/secondary/pistol/revolver - item_type = /obj/item/gun/ballistic/revolver/c38/detective - max_purchase = 4 - cost = 3 - mags_to_spawn = 0 - magazine = /obj/item/storage/box/ammo_box/revolver - magazine_cost = 4 - -/obj/item/storage/box/ammo_box/revolver - -/obj/item/storage/box/ammo_box/revolver/PopulateContents() - new /obj/item/ammo_box/c38(src) - new /obj/item/ammo_box/c38(src) - new /obj/item/ammo_box/c38(src) - new /obj/item/ammo_box/c38(src) - new /obj/item/ammo_box/c38/dumdum(src) - new /obj/item/ammo_box/c38/dumdum(src) - new /obj/item/ammo_box/c38/match(src) diff --git a/modular_nova/modules/black_mesa/code/armaments/armament_explosives.dm b/modular_nova/modules/black_mesa/code/armaments/armament_explosives.dm deleted file mode 100644 index d9c94ffdb4d..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/armament_explosives.dm +++ /dev/null @@ -1,37 +0,0 @@ -#define ARMAMENT_CATEGORY_EXPLOSIVES "Explosives" - -/datum/armament_entry/hecu/explosives - category = ARMAMENT_CATEGORY_EXPLOSIVES - category_item_limit = 8 - -/datum/armament_entry/hecu/explosives/frag - item_type = /obj/item/grenade/frag - max_purchase = 8 - cost = 3 - -/datum/armament_entry/hecu/explosives/high_explosive - item_type = /obj/item/grenade/syndieminibomb/concussion - max_purchase = 8 - cost = 3 - -/datum/armament_entry/hecu/explosives/flashbang - item_type = /obj/item/grenade/flashbang - max_purchase = 8 - cost = 2 - -/datum/armament_entry/hecu/explosives/smoke - item_type = /obj/item/grenade/smokebomb - max_purchase = 8 - cost = 1 - -/datum/armament_entry/hecu/explosives/mine - item_type = /obj/item/minespawner/explosive - max_purchase = 8 - cost = 1 - -/datum/armament_entry/hecu/explosives/c4 - item_type = /obj/item/grenade/c4 - max_purchase = 3 - cost = 3 - -#undef ARMAMENT_CATEGORY_EXPLOSIVES diff --git a/modular_nova/modules/black_mesa/code/armaments/armament_medical.dm b/modular_nova/modules/black_mesa/code/armaments/armament_medical.dm deleted file mode 100644 index a7266b655b9..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/armament_medical.dm +++ /dev/null @@ -1,79 +0,0 @@ -/datum/armament_entry/hecu/medical - category = ARMAMENT_CATEGORY_MEDICAL - category_item_limit = 20 - -/datum/armament_entry/hecu/medical/defib - item_type = /obj/item/defibrillator/loaded - max_purchase = 1 - cost = 4 - -/datum/armament_entry/hecu/medical/medkit - subcategory = ARMAMENT_SUBCATEGORY_MEDKIT - -/datum/armament_entry/hecu/medical/medkit/basic - item_type = /obj/item/storage/medkit/regular - max_purchase = 3 - cost = 3 - -/datum/armament_entry/hecu/medical/medkit/brute - item_type = /obj/item/storage/medkit/brute - max_purchase = 2 - cost = 3 - -/datum/armament_entry/hecu/medical/medkit/toxin - item_type = /obj/item/storage/medkit/toxin - max_purchase = 1 - cost = 2 - -/datum/armament_entry/hecu/medical/medkit/fire - item_type = /obj/item/storage/medkit/fire - max_purchase = 1 - cost = 3 - -/datum/armament_entry/hecu/medical/medkit/o2 - item_type = /obj/item/storage/medkit/o2 - max_purchase = 1 - cost = 2 - -/datum/armament_entry/hecu/medical/medkit/advanced - item_type = /obj/item/storage/medkit/advanced - max_purchase = 1 - cost = 4 - -/datum/armament_entry/hecu/medical/medkit/expeditionary - item_type = /obj/item/storage/medkit/expeditionary - max_purchase = 1 - cost = 5 - -/datum/armament_entry/hecu/medical/injector - subcategory = ARMAMENT_SUBCATEGORY_INJECTOR - -/datum/armament_entry/hecu/medical/injector/bloodloss - item_type = /obj/item/reagent_containers/hypospray/medipen/blood_loss - max_purchase = 4 - cost = 1 - -/datum/armament_entry/hecu/medical/injector/atropine - item_type = /obj/item/reagent_containers/hypospray/medipen/atropine - max_purchase = 4 - cost = 1 - -/datum/armament_entry/hecu/medical/injector/salacid - item_type = /obj/item/reagent_containers/hypospray/medipen/salacid - max_purchase = 4 - cost = 1 - -/datum/armament_entry/hecu/medical/injector/oxandrolone - item_type = /obj/item/reagent_containers/hypospray/medipen/oxandrolone - max_purchase = 4 - cost = 1 - -/datum/armament_entry/hecu/medical/injector/stimulant - item_type = /obj/item/reagent_containers/hypospray/medipen/stimulants - max_purchase = 2 - cost = 4 - -/datum/armament_entry/hecu/medical/injector/bag - item_type = /obj/item/storage/medkit/civil_defense/stocked - max_purchase = 2 - cost = 5 diff --git a/modular_nova/modules/black_mesa/code/armaments/armament_melee.dm b/modular_nova/modules/black_mesa/code/armaments/armament_melee.dm deleted file mode 100644 index 52bbc0c2ccc..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/armament_melee.dm +++ /dev/null @@ -1,28 +0,0 @@ -/datum/armament_entry/hecu/melee - category = ARMAMENT_CATEGORY_MELEE - category_item_limit = 4 - -/datum/armament_entry/hecu/melee/lethal - subcategory = ARMAMENT_SUBCATEGORY_MELEE_LETHAL - -/datum/armament_entry/hecu/melee/lethal/combat_knife - item_type = /obj/item/knife/combat - max_purchase = 4 - cost = 3 - -/datum/armament_entry/hecu/melee/lethal/tomahawk - item_type = /obj/item/melee/tomahawk - max_purchase = 4 - cost = 5 - -/datum/armament_entry/hecu/melee/nonlethal - subcategory = ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL - -/datum/armament_entry/hecu/melee/nonlethal/baton - item_type = /obj/item/melee/baton - max_purchase = 4 - cost = 5 - -/datum/armament_entry/hecu/melee/nonlethal/kravmaga - item_type = /obj/item/clothing/gloves/krav_maga/combatglovesplus - cost = 10 diff --git a/modular_nova/modules/black_mesa/code/armaments/armament_miscellaneous.dm b/modular_nova/modules/black_mesa/code/armaments/armament_miscellaneous.dm deleted file mode 100644 index 896cb212fac..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/armament_miscellaneous.dm +++ /dev/null @@ -1,63 +0,0 @@ -/datum/armament_entry/hecu/misc - category = "Misc. Equipment" - category_item_limit = 24 - -/datum/armament_entry/hecu/misc/cigarettes - item_type = /obj/item/storage/fancy/cigarettes/cigpack_syndicate - max_purchase = 2 - cost = 1 - -/datum/armament_entry/hecu/misc/zippo - item_type = /obj/item/lighter - max_purchase = 1 - cost = 1 - -/datum/armament_entry/hecu/misc/rollie - item_type = /obj/item/clothing/mask/cigarette/rollie/cannabis - max_purchase = 8 - cost = 1 - -/datum/armament_entry/hecu/misc/mre - item_type = /obj/item/storage/box/hecu_rations - max_purchase = 6 - cost = 1 - -/datum/armament_entry/hecu/misc/pizza - item_type = /obj/item/pizzabox/random - max_purchase = 3 - cost = 2 - -/datum/armament_entry/hecu/misc/guitar - item_type = /obj/item/instrument/guitar - max_purchase = 1 - cost = 1 - -/datum/armament_entry/hecu/misc/cards - item_type = /obj/item/toy/cards/deck - max_purchase = 1 - cost = 1 - -/datum/armament_entry/hecu/misc/dosh - item_type = /obj/item/stack/spacecash/c1000 - max_purchase = 16 - cost = 1 - -/datum/armament_entry/hecu/misc/whiskey - item_type = /obj/item/reagent_containers/cup/glass/bottle/whiskey - max_purchase = 2 - cost = 1 - -/datum/armament_entry/hecu/misc/balaclava - item_type = /obj/item/clothing/mask/balaclavaadjust - max_purchase = 6 - cost = 1 - -/datum/armament_entry/hecu/misc/uniform - item_type = /obj/item/clothing/under/rank/security/officer/hecu - max_purchase = 6 - cost = 1 - -/datum/armament_entry/hecu/misc/hudglasses - item_type = /obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper - max_purchase = 6 - cost = 2 diff --git a/modular_nova/modules/black_mesa/code/armaments/armament_utility.dm b/modular_nova/modules/black_mesa/code/armaments/armament_utility.dm deleted file mode 100644 index 90a1f8159cd..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/armament_utility.dm +++ /dev/null @@ -1,74 +0,0 @@ -#define ARMAMENT_CATEGORY_UTILITY "Utility" - -/datum/armament_entry/hecu/utility - category = ARMAMENT_CATEGORY_UTILITY - category_item_limit = 20 - -/datum/armament_entry/hecu/utility/survival_pack - item_type = /obj/item/storage/box/nri_survival_pack - max_purchase = 4 - cost = 3 - -/datum/armament_entry/hecu/utility/pouch - item_type = /obj/item/storage/pouch/ammo - max_purchase = 8 - cost = 1 - -/datum/armament_entry/hecu/utility/pouch_knives - item_type = /obj/item/storage/pouch/ammo/marksman - max_purchase = 4 - cost = 3 - -/datum/armament_entry/hecu/utility/basic_tools - item_type = /obj/item/storage/toolbox/mechanical - max_purchase = 2 - cost = 1 - -/datum/armament_entry/hecu/utility/advanced_tools - name = "Powertoolbelt" - description = "Tool belt full of power-ful tools." - item_type = /obj/item/storage/belt/utility/full/powertools - max_purchase = 1 - cost = 4 - -/datum/armament_entry/hecu/utility/light_device - item_type = /obj/item/construction/rld/mini - max_purchase = 2 - cost = 3 - -/datum/armament_entry/hecu/utility/compact_shield - item_type = /obj/item/shield/riot/tele - max_purchase = 1 - cost = 5 - -/datum/armament_entry/hecu/utility/flash_shield - item_type = /obj/item/shield/riot/flash - max_purchase = 1 - cost = 10 - -/datum/armament_entry/hecu/utility/combat_shield - item_type = /obj/item/shield/riot/pointman/hecu - max_purchase = 1 - cost = 20 - -/datum/armament_entry/hecu/utility/zipties - item_type = /obj/item/storage/box/zipties - max_purchase = 2 - cost = 1 - -/datum/armament_entry/hecu/utility/suppressor - item_type = /obj/item/suppressor/standard - max_purchase = 4 - cost = 2 - -/datum/armament_entry/hecu/utility/bowman - item_type = /obj/item/radio/headset/headset_faction/bowman - max_purchase = 3 - cost = 4 - -/datum/armament_entry/hecu/utility/breaching_hammer //Mesa more like R6S amirite - item_type = /obj/item/melee/breaching_hammer - max_purchase = 1 - cost = 4 - -#undef ARMAMENT_CATEGORY_UTILITY diff --git a/modular_nova/modules/black_mesa/code/armaments/hecu_armament_station.dm b/modular_nova/modules/black_mesa/code/armaments/hecu_armament_station.dm deleted file mode 100644 index e6839d93d26..00000000000 --- a/modular_nova/modules/black_mesa/code/armaments/hecu_armament_station.dm +++ /dev/null @@ -1,24 +0,0 @@ -// VENDOR -/obj/machinery/armament_station/hecu - required_access = list(ACCESS_AWAY_SEC) - - armament_type = /datum/armament_entry/hecu - -// POINTS CARDS - -/obj/item/armament_points_card/hecu - points = 35 - -// ARMAMENT ENTRIES - -/datum/armament_entry/hecu - var/mags_to_spawn = 5 - -/datum/armament_entry/hecu/after_equip(turf/safe_drop_location, obj/item/item_to_equip) - if(istype(item_to_equip, /obj/item/gun/ballistic)) - var/obj/item/gun/ballistic/spawned_ballistic_gun = item_to_equip - if(spawned_ballistic_gun.magazine && !istype(spawned_ballistic_gun.magazine, /obj/item/ammo_box/magazine/internal)) - var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location) - spawned_box.name = "ammo box - [spawned_ballistic_gun.name]" - for(var/i in 1 to mags_to_spawn) - new spawned_ballistic_gun.spawn_magazine_type (spawned_box) diff --git a/modular_nova/modules/black_mesa/code/armor.dm b/modular_nova/modules/black_mesa/code/armor.dm deleted file mode 100644 index a376b929f3d..00000000000 --- a/modular_nova/modules/black_mesa/code/armor.dm +++ /dev/null @@ -1,75 +0,0 @@ -/obj/item/clothing/suit/armor/vest/hecu - name = "combat vest" - desc = "Vest designed to take heavy beating and probably keep the user alive in the process." - armor_type = /datum/armor/vest_hecu - icon_state = "ceramic_vest" - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_digi.dmi' - uses_advanced_reskins = TRUE - unique_reskin = list( - "Basic" = list( - RESKIN_ICON_STATE = "ceramic_vest", - RESKIN_WORN_ICON_STATE = "ceramic_vest" - ), - "Corpsman" = list( - RESKIN_ICON_STATE = "ceramic_vest_medic", - RESKIN_WORN_ICON_STATE = "ceramic_vest_medic" - ), - "Basic Black" = list( - RESKIN_ICON_STATE = "ceramic_vest_black", - RESKIN_WORN_ICON_STATE = "ceramic_vest_black" - ), - "Corpsman Black" = list( - RESKIN_ICON_STATE = "ceramic_vest_medic_black", - RESKIN_WORN_ICON_STATE = "ceramic_vest_medic_black" - ), - ) - -/datum/armor/vest_hecu - melee = 40 - bullet = 40 - laser = 40 - energy = 40 - bomb = 40 - fire = 80 - acid = 100 - wound = 30 - -/obj/item/clothing/head/helmet/hecu - name = "combat helmet" - desc = "Helmet designed to take heavy beating and probably keep the user alive in the process." - armor_type = /datum/armor/helmet_hecu - icon_state = "ceramic_helmet" - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_muzzled.dmi' - uses_advanced_reskins = TRUE - unique_reskin = list( - "Basic" = list( - RESKIN_ICON_STATE = "ceramic_helmet", - RESKIN_WORN_ICON_STATE = "ceramic_helmet" - ), - "Corpsman" = list( - RESKIN_ICON_STATE = "ceramic_helmet_medic", - RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic" - ), - "Basic Black" = list( - RESKIN_ICON_STATE = "ceramic_helmet_black", - RESKIN_WORN_ICON_STATE = "ceramic_helmet_black" - ), - "Corpsman Black" = list( - RESKIN_ICON_STATE = "ceramic_helmet_medic_black", - RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic_black" - ), - ) - -/datum/armor/helmet_hecu - melee = 30 - bullet = 30 - laser = 30 - energy = 30 - bomb = 30 - fire = 80 - acid = 100 - wound = 30 diff --git a/modular_nova/modules/black_mesa/code/bump_teleporter.dm b/modular_nova/modules/black_mesa/code/bump_teleporter.dm deleted file mode 100644 index 2d6f92ce2cb..00000000000 --- a/modular_nova/modules/black_mesa/code/bump_teleporter.dm +++ /dev/null @@ -1,17 +0,0 @@ -/obj/effect/bump_teleporter/Bumped(atom/movable/bumper) - if(!validate_setup(bumper)) - return - - // Extend original bump_teleporter functionality to randomly pick one of the matching teleporters, - // instead of the first one. - var/list/compatable_teleporters = list() - for(var/obj/effect/bump_teleporter/teleporter in AllTeleporters) - if(teleporter.id == id_target) - compatable_teleporters += teleporter - - if(!LAZYLEN(compatable_teleporters)) - stack_trace("Bump_teleporter [src] could not find a teleporter with id [id_target]!") - return - - var/obj/picked_teleporter = pick(compatable_teleporters) - teleport_action(bumper, get_turf(picked_teleporter)) //Teleport to location with correct id. diff --git a/modular_nova/modules/black_mesa/code/drops.dm b/modular_nova/modules/black_mesa/code/drops.dm deleted file mode 100644 index 30ab8bf0cf0..00000000000 --- a/modular_nova/modules/black_mesa/code/drops.dm +++ /dev/null @@ -1,19 +0,0 @@ -/obj/effect/spawner/random/hecu_smg - name = "HECU SMG drops" - spawn_all_loot = FALSE - loot = list(/obj/item/gun/ballistic/automatic/sol_smg = 15, - /obj/item/ammo_box/magazine/c35sol_pistol/stendo = 25, - /obj/item/clothing/mask/gas/hecu2 = 15, - /obj/item/clothing/head/helmet = 15, - /obj/item/clothing/suit/armor/vest = 15, - /obj/item/clothing/shoes/combat = 15) - -/obj/effect/spawner/random/hecu_deagle - name = "HECU Deagle drops" - spawn_all_loot = FALSE - loot = list(/obj/item/gun/ballistic/automatic/pistol/deagle = 15, - /obj/item/ammo_box/magazine/m50 = 25, - /obj/item/clothing/mask/gas/hecu2 = 15, - /obj/item/clothing/head/helmet = 15, - /obj/item/clothing/suit/armor/vest = 15, - /obj/item/clothing/shoes/combat = 15) diff --git a/modular_nova/modules/black_mesa/code/fluff.dm b/modular_nova/modules/black_mesa/code/fluff.dm deleted file mode 100644 index b0fd93f3bd7..00000000000 --- a/modular_nova/modules/black_mesa/code/fluff.dm +++ /dev/null @@ -1,181 +0,0 @@ -///I couldn't do this via radios. I'll do this via tapes. -///Various announcements and radio transmissions I've copypasted from the Black Mesa, to make the away mission feel more a u t h e n t i c . -///Three EASes for the Vanguard and BMST, three HECU-related ones to tell them they're fucked. - -/obj/item/tape/ruins/black_mesa/first_eas //First EAS record, the local disaster. - icon_state = "tape_blue" - desc = "The tape with some signs of date. Probably used by some aspiring wave listener." - - used_capacity = 240 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "EAS Announcer blares, \"The following message is transmitted at the request of local authorities.\"", - 3 = "EAS Announcer states, \"At 9:47 AM, Mountain Time, a disaster of unknown type has occurred at the Black Mesa Research Facility causing significant damage and failure to various power and communication systems in the surrounding areas.\"", - 4 = "EAS Announcer clarifies, \"An immediate evacuation order has been issued for all residents within a 75 mile radius of the facility, and on-site military has been dispatched to provide assistance.\"", - 5 = "EAS Announcer echoes, \"Make sure to bring an emergency supply of food, water, clothing, first aid kit, flashlights with extra batteries, and battery powered radios.\"", - 6 = "EAS Announcer states, \"Follow local evacuation routes which have been marked by local authorities and only use one vehicle.\"", - 7 = "EAS Announcer warns, \"Do not return to the warning area until the all clear has been given.\"", - 8 = "EAS Announcer announces, \"If you are not in the evacuation zone stay where you are.\"", - 9 = "EAS Announcer announces, \"If you are within the evacuation area and have no transportation locate your nearest police department or military officer.\"", - 10 = "EAS Announcer announces, \"Do not use telephones or cell phones except in the case of emergencies.\"", - 11 = "EAS Announcer announces, \"Stay tuned to local news media outlets for further details and information on this situation.\"", - 12 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 20, - 3 = 40, - 4 = 80, - 5 = 100, - 6 = 120, - 7 = 140, - 8 = 160, - 9 = 180, - 10 = 200, - 11 = 220, - 12 = 240, - ) - -/obj/item/tape/ruins/black_mesa/second_eas //Second EAS record, the local disaster. - icon_state = "tape_white" - desc = "The tape with some markings of blood. Probably used by some (now deceased) radio enthusiast." - - used_capacity = 240 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "EAS Announcer blares, \"The following message is transmitted at the request of the New Mexico Department of Emergency Services.\"", - 3 = "EAS Announcer states, \"At 9:47 AM, Mountain Standard Time, a disaster of unknown type has occurred at the Black Mesa Research Facility causing significant damage and failure to various power and communication systems in the surrounding areas.\"", - 4 = "EAS Announcer clarifies, \"This message replaces the previous alert, which expires at 10:01 PM Mountain Standard Time, this afternoon.\"", - 5 = "EAS Announcer echoes, \"A full quarantine has been issued for the Black Mesa area. In the interest of public safety, all residents withing a 150-mile radius of Black Mesa, New Mexico, are advised to evacuate the area immediately.\"", - 6 = "EAS Announcer states, \"Take only essential supplies, and a battery-powered radio. Do not use more than one vehicle for traveling.\"", - 7 = "EAS Announcer warns, \"Follow local evacuation routes which have been marked by local authorities.\"", - 8 = "EAS Announcer announces, \"If you are within the evacuation area and have no transportation locate your nearest police department.\"", - 9 = "EAS Announcer states, \"If you begin experiencing a fever, coughing, nausea, dizziness, muscle ache, pneumonia, hair loss, or any such similar ailments...\"", - 10 = "EAS Announcer blares, \"...please contact your nearest Disease Control Center immediately, as these symptoms may be related to recent events.\"", - 11 = "EAS Announcer echoes, \"Stay tuned to local media outlets for further information on this ongoing emergency.\"", - 12 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 20, - 3 = 40, - 4 = 80, - 5 = 100, - 6 = 120, - 7 = 140, - 8 = 160, - 9 = 180, - 10 = 200, - 11 = 220, - 12 = 240, - ) - -/obj/item/tape/ruins/black_mesa/third_eas //Third EAS record, the global disaster. - icon_state = "tape_purple" - desc = "The tape with some... weird vines faintly growing through. Probably used by some alien." - - used_capacity = 260 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "EAS Announcer blares, \"The following message is transmitted at the request of the United Stated Department of Defense. This is not a test.\"", - 3 = "EAS Announcer states, \"Today, at 4:16 PM Mountain Time, a state of emergency was declared by the President of the United States.\"", - 4 = "EAS Announcer clarifies, \"An unknown hostile force was declared present at the Black Mesa Research Facility, and several other locations in the surronding areas of Black Mesa, New Mexico.\"", - 5 = "EAS Announcer echoes, \"As of 5:42 PM Mountain Time, the President issued executive orders to withdrawl all grounds forces...\"", - 6 = "EAS Announcer states, \"...and begind immediate airstrikes over the Black Mesa Research Facility and surrounding areas, beginning no later than 6:42 PM this evening.\"", - 7 = "EAS Announcer warns, \"For your own safety, an immediate evacuation order has been issued to the entire state of New Mexico.\"", - 8 = "EAS Announcer announces, \"To all residents of New Mexico and surrounding areas, leave all your personal belongings. Take a battery-powered radio, and only essential supplies with you.\"", - 9 = "EAS Announcer states, \"Do not remain in your homes. Seek shelter at your nearest militarized zone outside the state of New Mexico, and awaiy further instructions.\"", - 10 = "EAS Announcer blares, \"If you cannot find your nearest evacuation route, seek assistance from local authorities immediately.\"", - 11 = "EAS Announcer echoes, \"If you have military training, firearms training, or any similar weapons training, contract your nearest military officer immediately.\"", - 12 = "EAS Announcer clarifies, \"Stay tuned to frequency 740 AM for further updates on this emergency.\"", - 13 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 20, - 3 = 40, - 4 = 80, - 5 = 100, - 6 = 120, - 7 = 140, - 8 = 160, - 9 = 180, - 10 = 200, - 11 = 220, - 12 = 240, - 13 = 260, - ) - -/obj/item/tape/ruins/black_mesa/first_hecu //First HECU record, the "You are abandoned" kinda one; meant to be added to SL so they're, you know, informed. And depressed. - icon_state = "tape_purple" - desc = "Freshly-recorded tape, it isn't even signed." - - used_capacity = 100 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "High Command blares, \"Come in officer, do you copy? Officer, do you read me?\"", - 3 = "High Command states, \"Forget about Freeman! We're abandoning the base!\"", - 4 = "High Command clarifies, \"We are cutting our losses and pulling out! Anyone left down there now is on his own!\"", - 5 = "High Command clarifies, \"Repeat, if you weren't already evacuated, then you are on your own!\"", - 6 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 20, - 3 = 40, - 4 = 60, - 5 = 80, - 6 = 100, - ) - -/obj/item/tape/ruins/black_mesa/second_hecu //Second HECU record, for Vanguard to know that there's military nearby. - icon_state = "tape_red" - desc = "Relatively freshly-recorded taped, signed as \"radio transmission number XX XX.XX.200X\". Date and serial numbers have been scratched beyond recognition. How convenient." - - used_capacity = 140 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "Echo-5 Bravo blares, \"Any station, any station, this is Echo-5 Bravo! Are there any ground assets able to provide support in Sector 8?\"", - 3 = "Echo-5 Bravo states, \"Any station, any station, this is Echo-5 Bravo! Are there any ground assets able to provide support in Sector 8? Is anyone reading this?\"", - 4 = "Echo-5 Yankee states, \"This is Echo-5 Yankee! No longer in a position to assist. We are moving to LZ Finch!\"", - 5 = "Echo-5 Bravo clarifies, \"The hell are you saying? We are freaking surrounded over here!\"", - 6 = "Echo-5 Yankee clarifies, \"Push out the the nearest LZ and await further instructions!\"", - 7 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 20, - 3 = 40, - 4 = 80, - 5 = 100, - 6 = 120, - 7 = 140, - ) - -/obj/item/tape/ruins/black_mesa/third_hecu //Third HECU record, because it's s a d . - icon_state = "tape_blue" - desc = "Blood-covered tape. That's pretty much it." - - used_capacity = 120 - storedinfo = list( - 1 = "The universal recorder says, \"Recording started.\"", - 2 = "Echo-3 Juliet blares, \"Any station, any station, this is Echo-3 Juliet... My team ambushed... I am unjred... I'm losing a lot of blood here. Left leg.\"", - 3 = "Echo-5 Romeo states, \"Echo-3 Juliet, this is Echo-5 Romeo. I need you to tie a tourniquet at hand's length above the wound. Get one of your IFAK now.\"", - 4 = "Echo-3 Juliet states, \"IFAK's gone.\"", - 5 = "Echo-5 Romeo clarifies, \"Say again?\"", - 6 = "Echo-3 Juliet clarifies, \"My IFAK's gone... I'm, uhh... *clear falling sounds*\"", - 7 = "Echo-5 Romeo clarifies, \"Okay, you're gonna need to find another pack and get a tourniquet out of it.\"", - 8 = "Echo-5 Romeo clarifies, \"Are you still there? Echo-3 Juliet, can you hear me?\"", - 9 = "The universal recorder says, \"Recording stopped.\"", - ) - timestamp = list( - 1 = 0, - 2 = 10, - 3 = 30, - 4 = 40, - 5 = 50, - 6 = 70, - 7 = 90, - 8 = 110, - 9 = 120, - ) diff --git a/modular_nova/modules/black_mesa/code/follow_component.dm b/modular_nova/modules/black_mesa/code/follow_component.dm deleted file mode 100644 index cd579f41661..00000000000 --- a/modular_nova/modules/black_mesa/code/follow_component.dm +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Follow component - * - * A simple component that allows hostile mobs to follow another mob in their faction. - * Default behaviour is alt click. - * - * @author Gandalf2k15 - */ -/datum/component/follow - /// Sounds we play when the mob starts following. - var/list/follow_sounds - /// Sounds we play when the mob stops following via alt click. - var/list/unfollow_sounds - /// The speed at which we follow the user. - var/follow_speed = 2 - /// The distance we keep from the user. - var/follow_distance = 1 - /// Are we currently following? Used for playing sounds. - var/following = FALSE - /// Our parent mob. - var/mob/living/simple_animal/hostile/parent_mob - -/datum/component/follow/Initialize(_follow_sounds, _unfollow_sounds, _follow_distance = 1, _follow_speed = 2) - if(!ishostile(parent)) - return COMPONENT_INCOMPATIBLE - if(_follow_sounds) - follow_sounds = _follow_sounds - if(_unfollow_sounds) - unfollow_sounds = _unfollow_sounds - if(_follow_distance) - follow_distance = _follow_distance - if(_follow_speed) - follow_speed = _follow_speed - RegisterSignal(parent, COMSIG_HOSTILE_MOB_LOST_TARGET, PROC_REF(lost_target)) - RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(toggle_follow)) - RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) - parent_mob = parent - -/datum/component/follow/Destroy(force) - UnregisterSignal(parent, COMSIG_HOSTILE_MOB_LOST_TARGET) - UnregisterSignal(parent, COMSIG_CLICK_ALT) - parent_mob = null - return ..() - -/datum/component/follow/proc/lost_target() - SIGNAL_HANDLER - following = FALSE - -/datum/component/follow/proc/toggle_follow(datum/source, mob/living/living_user) - SIGNAL_HANDLER - if(!istype(living_user) || !living_user.can_perform_action(parent_mob)) - return - following = !following - if(following) - if(follow_sounds) - playsound(parent_mob, pick(follow_sounds), 100) - INVOKE_ASYNC(parent_mob, TYPE_PROC_REF(/atom/movable, say), "Following you!") - parent_mob.Goto(living_user, follow_speed, follow_distance) - else - if(unfollow_sounds) - playsound(parent_mob, pick(unfollow_sounds), 100) - INVOKE_ASYNC(parent_mob, TYPE_PROC_REF(/atom/movable, say), "No longer following!") - parent_mob.LoseTarget() - -/datum/component/follow/proc/on_examine(datum/source, mob/examiner, list/examine_text) - examine_text += "Alt-click to make them follow you!" diff --git a/modular_nova/modules/black_mesa/code/gateway.dm b/modular_nova/modules/black_mesa/code/gateway.dm deleted file mode 100644 index 21b63e6df0e..00000000000 --- a/modular_nova/modules/black_mesa/code/gateway.dm +++ /dev/null @@ -1,2 +0,0 @@ -/obj/machinery/gateway/away/required_key - requires_key = TRUE diff --git a/modular_nova/modules/black_mesa/code/ghost_spawners.dm b/modular_nova/modules/black_mesa/code/ghost_spawners.dm deleted file mode 100644 index 1adc72bd81c..00000000000 --- a/modular_nova/modules/black_mesa/code/ghost_spawners.dm +++ /dev/null @@ -1,216 +0,0 @@ -/obj/effect/mob_spawn/ghost_role/human/black_mesa - name = "Research Facility Science Team" - prompt_name = "a research facility scientist" - icon = 'icons/obj/machines/sleeper.dmi' - icon_state = "sleeper_s" - outfit = /datum/outfit/science_team - you_are_text = "You are a scientist in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within." - flavour_text = "You are a scientist near the Ground Zero of a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within." - important_text = "Do not try to explore the level unless an expedition crew is already present and close to you, and even then, wait at least 20 minutes before leaving your area." - restricted_species = list(/datum/species/human) - random_appearance = FALSE - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/special(mob/living/carbon/human/spawned_human) - . = ..() - spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) - -/datum/outfit/science_team - name = "Scientist" - uniform = /obj/item/clothing/under/rank/rnd/scientist/nova/hlscience - suit = /obj/item/clothing/suit/toggle/labcoat - shoes = /obj/item/clothing/shoes/laceup - back = /obj/item/storage/backpack - backpack_contents = list(/obj/item/radio, - /obj/item/reagent_containers/cup/beaker, - ) - id = /obj/item/card/id - id_trim = /datum/id_trim/science_team - -/datum/outfit/science_team/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) - . = ..() - equipped_human.faction |= FACTION_BLACKMESA - -/datum/id_trim/science_team - assignment = "Science Team Scientist" - trim_state = "trim_scientist" - access = list(ACCESS_SCIENCE) - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/guard - name = "Research Facility Security Guard" - prompt_name = "a research facility guard" - outfit = /datum/outfit/security_guard - you_are_text = "You are a security guard in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within." - flavour_text = "You are a security guard near the Ground Zero of a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within." - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/guard/special(mob/living/carbon/human/spawned_human) - . = ..() - spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) - -/datum/outfit/security_guard - name = "Security Guard" - uniform = /obj/item/clothing/under/rank/security/officer/blueshirt - head = /obj/item/clothing/head/helmet/blueshirt - gloves = /obj/item/clothing/gloves/color/black - suit = /obj/item/clothing/suit/armor/vest/blueshirt - shoes = /obj/item/clothing/shoes/jackboots - belt = /obj/item/storage/belt/security/full - back = /obj/item/storage/backpack - backpack_contents = list(/obj/item/radio, - /obj/item/gun/ballistic/automatic/pistol/sol, - /obj/item/ammo_box/magazine/c35sol_pistol, - /obj/item/ammo_box/magazine/c35sol_pistol, - ) - id = /obj/item/card/id - id_trim = /datum/id_trim/security_guard - -/datum/outfit/security_guard/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) - . = ..() - equipped_human.faction |= FACTION_BLACKMESA - -/datum/id_trim/security_guard - assignment = "Security Guard" - trim_state = "trim_securityofficer" - access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC) - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu - name = "HECU" - prompt_name = "a tactical squad member" - outfit = /datum/outfit/hecu - you_are_text = "You are an elite tactical squad deployed into the research facility to contain the infestation." - flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. \ - You haven't heard much from the north-west post, except for the sounds of gunshots, and their radios went silent. \ - On top of that, your escape helicopter was shot down mid-flight, and another one won't arrive so soon; \ - with your machinegunner being shot down with a precise headshot by something, or SOMEONE. You are likely on your own, at least for now." - important_text = "Do not try to explore the level unless the expedition crew is dead or cooperative. Stay around your area." - restricted_species = list(/datum/species/human) - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/special(mob/living/carbon/human/spawned_human) - . = ..() - spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) - -/obj/item/clothing/under/rank/security/officer/hecu //Subtype of security for armor (and because I dont want to repath it) - name = "urban camouflage BDU" - desc = "A baggy military camouflage uniform with an ERDL pattern. The range of whites and greys proves useful in urban environments." - icon = 'modular_nova/master_files/icons/obj/clothing/under/syndicate.dmi' //Camo goes into the syndicate.dmi - worn_icon = 'modular_nova/master_files/icons/mob/clothing/under/syndicate.dmi' - icon_state = "urban_camo" - inhand_icon_state = "w_suit" - uses_advanced_reskins = FALSE - unique_reskin = null - -/obj/item/storage/backpack/ert/odst/hecu - name = "hecu backpack" - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_digi.dmi' - icon_state = "hecu_pack" - worn_icon_state = "hecu_pack" - uses_advanced_reskins = TRUE - unique_reskin = list( - "Olive" = list( - RESKIN_ICON_STATE = "hecu_pack", - RESKIN_WORN_ICON_STATE = "hecu_pack" - ), - "Black" = list( - RESKIN_ICON_STATE = "hecu_pack_black", - RESKIN_WORN_ICON_STATE = "hecu_pack_black" - ), - ) - -/obj/item/storage/belt/military/assault/hecu - name = "hecu warbelt" - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_digi.dmi' - icon_state = "hecu_belt" - worn_icon_state = "hecu_belt" - uses_advanced_reskins = TRUE - unique_reskin = list( - "Olive" = list( - RESKIN_ICON_STATE = "hecu_belt", - RESKIN_WORN_ICON_STATE = "hecu_belt" - ), - "Black" = list( - RESKIN_ICON_STATE = "hecu_belt_black", - RESKIN_WORN_ICON_STATE = "hecu_belt_black" - ), - ) - -/datum/outfit/hecu - name = "HECU Grunt" - uniform = /obj/item/clothing/under/rank/security/officer/hecu - mask = /obj/item/clothing/mask/gas/hecu2 - gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/military/assault/hecu - ears = /obj/item/radio/headset/headset_faction - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/storage/belt/bowie_sheath - r_pocket = /obj/item/flashlight/flare - back = /obj/item/storage/backpack/ert/odst/hecu - backpack_contents = list( - /obj/item/storage/box/survival/radio, - /obj/item/storage/medkit/emergency, - /obj/item/armament_points_card/hecu, - ) - id = /obj/item/card/id - id_trim = /datum/id_trim/hecu - -/datum/outfit/hecu/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) - . = ..() - equipped_human.faction |= FACTION_HECU - -/datum/id_trim/hecu - assignment = "HECU Marine" - trim_state = "trim_securityofficer" - access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC) - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader - name = "HECU Squad Leader" - prompt_name = "a tactical squad's leader" - outfit = /datum/outfit/hecu/leader - you_are_text = "You are an elite tactical squad's leader deployed into the research facility to contain the infestation." - flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. \ - Due to the lack of any real briefing, and your briefing officer's death during the landing, you have no clue as to what your objective is, \ - so you and your group have set up a camp here. You haven't heard much from the north-west post, except for the sounds of gunshots, and their radios went silent. \ - On top of that, your escape helicopter was shot down mid-flight, and another one won't arrive so soon; \ - with your machinegunner being shot down with a precise headshot by something, or SOMEONE. You are likely on your own, at least for now." - important_text = "Keep and sustain marines' morale and discipline. Delegate responsibilities at the best of your abilities. \ - Do not try to explore the level unless the expedition crew is dead or cooperative. Stay around your area." - restricted_species = list(/datum/species/human) - -/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader/special(mob/living/carbon/human/spawned_human) - . = ..() - spawned_human.grant_language(/datum/language/uncommon, source = LANGUAGE_SPAWNER) - spawned_human.grant_language(/datum/language/panslavic, source = LANGUAGE_SPAWNER) - spawned_human.grant_language(/datum/language/yangyu, source = LANGUAGE_SPAWNER) - -/datum/outfit/hecu/leader - name = "HECU Captain" - uniform = /obj/item/clothing/under/rank/security/officer/hecu - head = /obj/item/clothing/head/beret/sec - mask = /obj/item/clothing/mask/gas/hecu2 - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - belt = /obj/item/storage/belt/military/assault/hecu - ears = /obj/item/radio/headset/headset_faction/bowman/captain - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/storage/belt/bowie_sheath - r_pocket = /obj/item/binoculars - back = /obj/item/storage/backpack/ert/odst/hecu - backpack_contents = list( - /obj/item/storage/box/survival/radio, - /obj/item/storage/medkit/emergency, - /obj/item/armament_points_card/hecu, - /obj/item/book/granter/martial/cqc, - /obj/item/grenade/smokebomb, - ) - id = /obj/item/card/id - id_trim = /datum/id_trim/hecu_leader - -/datum/outfit/hecu/leader/post_equip(mob/living/carbon/human/equipped_human, visualsOnly) - . = ..() - equipped_human.faction |= FACTION_HECU - -/datum/id_trim/hecu_leader - assignment = "HECU Captain" - trim_state = "trim_securityofficer" - access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC) diff --git a/modular_nova/modules/black_mesa/code/guns.dm b/modular_nova/modules/black_mesa/code/guns.dm deleted file mode 100644 index 0d46c86bec5..00000000000 --- a/modular_nova/modules/black_mesa/code/guns.dm +++ /dev/null @@ -1,35 +0,0 @@ -/obj/item/gun/ballistic/automatic/laser/marksman // Cheap replacement for a gauss rifle. - name = "designated marksman rifle" - desc = "A special laser beam sniper rifle designed by a certain now defunct research facility." - icon_state = "ctfmarksman" - inhand_icon_state = "ctfmarksman" - accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/marksman - force = 15 - weapon_weight = WEAPON_HEAVY - fire_delay = 4 SECONDS - fire_sound = 'modular_nova/modules/sec_haul/sound/chaingun_fire.ogg' - -/obj/item/gun/ballistic/automatic/laser/marksman/Initialize(mapload) - . = ..() - AddComponent(/datum/component/scope, range_modifier = 1.5) - -/obj/item/ammo_box/magazine/recharge/marksman - ammo_type = /obj/item/ammo_casing/laser/marksman - max_ammo = 5 - -/obj/item/ammo_casing/laser/marksman - projectile_type = /obj/projectile/beam/marksman - -/obj/item/ammo_casing/laser/marksman/Initialize(mapload) - . = ..() - AddElement(/datum/element/delete_on_drop) - -/obj/projectile/beam/marksman - name = "laser beam" - damage = 70 - armour_penetration = 30 - hitscan = TRUE - icon_state = "gaussstrong" - tracer_type = /obj/effect/projectile/tracer/solar - muzzle_type = /obj/effect/projectile/muzzle/solar - impact_type = /obj/effect/projectile/impact/solar diff --git a/modular_nova/modules/black_mesa/code/healing_puddle.dm b/modular_nova/modules/black_mesa/code/healing_puddle.dm deleted file mode 100644 index 2aa2c36a414..00000000000 --- a/modular_nova/modules/black_mesa/code/healing_puddle.dm +++ /dev/null @@ -1,18 +0,0 @@ -/obj/structure/water_source/puddle/healing - name = "healing puddle" - desc = "By some otherworldy power, this puddle of water seems to slowly regenerate things!" - color = "#71ffff" - light_range = 3 - light_color = "#71ffff" - /// How much do we heal the current person? - var/heal_amount = 2 - -/obj/structure/water_source/puddle/healing/Initialize(mapload) - . = ..() - START_PROCESSING(SSobj, src) - -/obj/structure/water_source/puddle/healing/process(seconds_per_tick) - for(var/mob/living/iterating_mob in loc) - iterating_mob.heal_overall_damage(heal_amount, heal_amount) - playsound(src, 'modular_nova/modules/emotes/sound/emotes/jelly_scream.ogg', 100) - diff --git a/modular_nova/modules/black_mesa/code/lambda_teleporter.dm b/modular_nova/modules/black_mesa/code/lambda_teleporter.dm deleted file mode 100644 index 554fa7bc8a6..00000000000 --- a/modular_nova/modules/black_mesa/code/lambda_teleporter.dm +++ /dev/null @@ -1,44 +0,0 @@ - -/datum/looping_sound/lambda - mid_sounds = list('modular_nova/modules/black_mesa/sound/lc_mainbeam.ogg' = 1) - mid_length = 8.1 SECONDS - volume = 100 - -/obj/effect/bump_teleporter/lambda - name = "\improper Lambda Teleporter" - desc = "A super powerful teleporter capable of transporting you across dimensions." - icon = 'icons/obj/machines/engine/energy_ball.dmi' - icon_state = "energy_ball" - pixel_x = -32 - pixel_y = -32 - invisibility = 0 - light_range = 6 - color = COLOR_CYAN - var/datum/looping_sound/lambda/looping_sound - var/atom/movable/warp_effect/effect - -/obj/effect/bump_teleporter/lambda/Initialize(mapload) - . = ..() - looping_sound = new(src, TRUE) - effect = new(src) - vis_contents += effect - -/obj/effect/bump_teleporter/lambda/Destroy() - QDEL_NULL(looping_sound) - vis_contents -= effect - QDEL_NULL(effect) - return ..() - -/obj/effect/bump_teleporter/lambda/teleport_action(atom/movable/target, turf/destination) - // Play sound before moving. - playsound(src, 'modular_nova/modules/black_mesa/sound/lc_teleport.ogg', 100) - - . = ..() - - if(isliving(target)) - var/mob/living/teleporting_mob = target - teleporting_mob.flash_act(10, 1, 1, /atom/movable/screen/fullscreen/flash/lambda, length = 3 SECONDS) - teleporting_mob.Unconscious(15 SECONDS) - -/atom/movable/screen/fullscreen/flash/lambda - color = COLOR_GREEN diff --git a/modular_nova/modules/black_mesa/code/mapping_fluff.dm b/modular_nova/modules/black_mesa/code/mapping_fluff.dm deleted file mode 100644 index c886da17934..00000000000 --- a/modular_nova/modules/black_mesa/code/mapping_fluff.dm +++ /dev/null @@ -1,67 +0,0 @@ -/obj/structure/alien/weeds/xen - name = "xen weeds" - desc = "A thick vine-like surface covers the floor." - color = "#ac3b06" - -/obj/structure/spacevine/xen - name = "xen vines" - color = "#ac3b06" - -/obj/structure/spacevine/xen/Initialize(mapload) - . = ..() - add_atom_colour("#ac3b06", FIXED_COLOUR_PRIORITY) - -/obj/structure/spacevine/xen/thick - name = "thick xen vines" - color = "#ac3b06" - opacity = TRUE - -/obj/structure/mineral_door/xen - name = "organic door" - color = "#ff8d58" - icon = 'modular_nova/modules/black_mesa/icons/xen_door.dmi' - icon_state = "resin" - openSound = 'modular_nova/modules/black_mesa/sound/xen_door.ogg' - closeSound = 'modular_nova/modules/black_mesa/sound/xen_door.ogg' - -/obj/machinery/door/puzzle/keycard/xen - name = "locktight organic door" - desc = "An oddly robust organic looking door." - icon = 'modular_nova/modules/black_mesa/icons/xen_door.dmi' - icon_state = "resin" - puzzle_id = "xen" - -/obj/item/keycard/xen - name = "xen keycard" - desc = "A xen keycard." - color = "#ac3b06" - puzzle_id = "xen" - -/obj/machinery/conveyor/inverted/auto - processing_flags = START_PROCESSING_ON_INIT - -/obj/machinery/conveyor/inverted/auto/Initialize(mapload, newdir) - . = ..() - set_operating(TRUE) - -/obj/machinery/conveyor/inverted/auto/update() - . = ..() - if(.) - set_operating(TRUE) - -/obj/structure/marker_beacon/green - picked_color = "Lime" - // set icon_state to make it clear for mappers - icon_state = "markerlime-on" - -/obj/structure/pod - name = "supply pod" - desc = "Someone must have sent this a long way." - icon = 'modular_nova/modules/black_mesa/icons/structures.dmi' - icon_state = "pod" - pixel_x = SUPPLYPOD_X_OFFSET - anchored = TRUE - -/obj/structure/closet/secure_closet/security/black_mesa - req_access = list(ACCESS_AWAY_SEC) - diff --git a/modular_nova/modules/black_mesa/code/mobs/bullsquid.dm b/modular_nova/modules/black_mesa/code/mobs/bullsquid.dm deleted file mode 100644 index 33aeb889c29..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/bullsquid.dm +++ /dev/null @@ -1,50 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/bullsquid - name = "bullsquid" - desc = "Some highly aggressive alien creature. Thrives in toxic environments." - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "bullsquid" - icon_living = "bullsquid" - icon_dead = "bullsquid_dead" - icon_gib = null - mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) - environment_smash = ENVIRONMENT_SMASH_STRUCTURES - speak_chance = 1 - speak_emote = list("growls") - emote_taunt = list("growls", "snarls", "grumbles") - taunt_chance = 100 - turns_per_move = 7 - maxHealth = 110 - health = 110 - obj_damage = 50 - harm_intent_damage = 15 - melee_damage_lower = 15 - melee_damage_upper = 15 - ranged = TRUE - retreat_distance = 4 - minimum_distance = 4 - dodging = TRUE - projectiletype = /obj/projectile/bullsquid - projectilesound = 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg' - melee_damage_upper = 18 - attack_sound = 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/attack1.ogg' - gold_core_spawnable = HOSTILE_SPAWN - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect1.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect2.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect3.ogg' - ) - -/obj/projectile/bullsquid - name = "nasty ball of ooze" - icon_state = "neurotoxin" - damage = 5 - damage_type = BURN - knockdown = 20 - armor_flag = BIO - impact_effect_type = /obj/effect/temp_visual/impact_effect/neurotoxin - hitsound = 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/splat1.ogg' - hitsound_wall = 'modular_nova/modules/black_mesa/sound/mobs/bullsquid/splat1.ogg' - -/obj/projectile/bullsquid/on_hit(atom/target, blocked = 0, pierce_hit) - new /obj/effect/decal/cleanable/greenglow(target.loc) - return ..() diff --git a/modular_nova/modules/black_mesa/code/mobs/gordon_freeman.dm b/modular_nova/modules/black_mesa/code/mobs/gordon_freeman.dm deleted file mode 100644 index 641ec6f2cc4..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/gordon_freeman.dm +++ /dev/null @@ -1,115 +0,0 @@ -/** - * Gordon Freeman - Xen boss - * - * This boss uses crystal pylons to supply a shield that is not penetrable until these pylons are destroyed. - * - * Once destroyed, the shield falls, and the mob can be killed. - */ - - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman - name = "\improper Gordon Freeman" - desc = "Gordon Freeman in the flesh. Or in the zombified form, it seems." - icon_state = "gordon_freeman" - speed = -2 - environment_smash = ENVIRONMENT_SMASH_RWALLS - health = 1000 - maxHealth = 1000 - melee_damage_lower = 45 - melee_damage_upper = 45 - wander = FALSE - attack_sound = 'modular_nova/master_files/sound/weapons/crowbar2.ogg' - loot = list(/obj/item/crowbar/freeman/ultimate, /obj/item/keycard/freeman_boss_exit) - gold_core_spawnable = NO_SPAWN - -/obj/structure/xen_pylon/freeman - shield_range = 30 - max_integrity = 300 - -/obj/structure/xen_pylon/freeman/register_mob(mob/living/simple_animal/hostile/blackmesa/xen/mob_to_register) - if(!istype(mob_to_register, /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman)) - return - if(mob_to_register in shielded_mobs) - return - shielded_mobs += mob_to_register - mob_to_register.shielded = TRUE - mob_to_register.shield_count++ - mob_to_register.update_appearance() - var/datum/beam/created_beam = Beam(mob_to_register, icon_state = "red_lightning", time = 10 MINUTES, maxdistance = shield_range) - shielded_mobs[mob_to_register] = created_beam - RegisterSignal(created_beam, COMSIG_QDELETING, PROC_REF(beam_died)) - RegisterSignal(mob_to_register, COMSIG_QDELETING, PROC_REF(mob_died)) - -/obj/machinery/door/puzzle/keycard/xen/freeman_boss_entry - name = "entry door" - desc = "Complete the puzzle to open this door." - icon = 'modular_nova/modules/black_mesa/icons/xen_door.dmi' - icon_state = "resin" - puzzle_id = "freeman_entry" - -/obj/item/keycard/freeman_boss_entry - name = "entry keycard" - color = "#1100ff" - puzzle_id = "freeman_entry" - -/obj/machinery/door/puzzle/keycard/xen/freeman_boss_exit - name = "exit door" - desc = "You must defeat him." - icon = 'modular_nova/modules/black_mesa/icons/xen_door.dmi' - icon_state = "resin" - puzzle_id = "freeman_exit" - -/obj/item/keycard/freeman_boss_exit - name = "\improper Freeman's ID card" - desc = "How could you do it? HOW?!!" - color = "#fffb00" - puzzle_id = "freeman_exit" - -/obj/effect/sliding_puzzle/freeman - reward_type = /obj/item/keycard/freeman_boss_entry - -/obj/effect/freeman_blocker - name = "freeman blocker" - -/obj/effect/freeman_blocker/CanPass(atom/blocker, movement_dir, blocker_opinion) - . = ..() - if(istype(blocker, /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman)) - return FALSE - return TRUE - -/datum/outfit/gordon_freeman - name = "Gordon Freeman" - uniform = /obj/item/clothing/under/rank/rnd/scientist/nova/hlscience - head = /obj/item/clothing/head/helmet/space/hev_suit - ears = /obj/item/radio/headset/headset_cent/commander - belt = /obj/item/storage/belt/utility/full - neck = /obj/item/clothing/neck/tie/horrible - shoes = /obj/item/clothing/shoes/combat - - suit = /obj/item/clothing/suit/space/hev_suit - suit_store = /obj/item/tank/internals/oxygen - - back = /obj/item/storage/backpack - - backpack_contents = list(/obj/item/gun/ballistic/revolver/mateba, /obj/item/ammo_box/a357 = 5) - - l_hand = /obj/item/crowbar/freeman - - id = /obj/item/card/id/advanced/centcom - id_trim = /datum/id_trim/gordon_freeman - -/datum/outfit/gordon_freeman/post_equip(mob/living/carbon/human/our_human, visualsOnly) - . = ..() - var/obj/item/card/id/id_card = our_human.wear_id - if(istype(id_card)) - id_card.registered_name = our_human.real_name - id_card.update_label() - id_card.update_icon() - -/datum/id_trim/gordon_freeman - trim_state = "trim_scientist" - assignment = "Theoretical Physicist" - -/datum/id_trim/gordon_freeman/New() - . = ..() - access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION)) diff --git a/modular_nova/modules/black_mesa/code/mobs/headcrab.dm b/modular_nova/modules/black_mesa/code/mobs/headcrab.dm deleted file mode 100644 index fc19cfa526a..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/headcrab.dm +++ /dev/null @@ -1,136 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab - name = "headcrab" - desc = "Don't let it latch onto your hea-... hey, that's kinda cool." - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "headcrab" - icon_living = "headcrab" - icon_dead = "headcrab_dead" - icon_gib = null - mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) - speak_chance = 1 - speak_emote = list("growls") - speed = 1 - emote_taunt = list("growls", "snarls", "grumbles") - ranged_message = "jumps" - taunt_chance = 100 - turns_per_move = 7 - maxHealth = 50 - health = 50 - speed = 3 - ranged = TRUE - dodging = TRUE - ranged_cooldown_time = 4 SECONDS - harm_intent_damage = 15 - melee_damage_lower = 5 - melee_damage_upper = 5 - retreat_distance = 5 - minimum_distance = 5 - attack_sound = 'sound/weapons/bite.ogg' - gold_core_spawnable = HOSTILE_SPAWN - loot = list(/obj/item/stack/sheet/bone) - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/headcrab/alert1.ogg' - ) - var/is_zombie = FALSE - var/mob/living/carbon/human/oldguy - /// Charging ability - var/datum/action/cooldown/mob_cooldown/charge/basic_charge/charge - var/throw_at_range = 10 - var/throw_at_speed = 2 - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/Initialize(mapload) - . = ..() - charge = new(src) - charge.Grant(src) - charge.cooldown_time = 0 - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/Shoot(atom/targeted_atom) - throw_at(targeted_atom, throw_at_range, throw_at_speed) - playsound( - src, - pick('modular_nova/modules/black_mesa/sound/mobs/headcrab/attack1.ogg', 'modular_nova/modules/black_mesa/sound/mobs/headcrab/attack2.ogg', 'modular_nova/modules/black_mesa/sound/mobs/headcrab/attack3.ogg'), - 100 - ) - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/death(gibbed) - . = ..() - playsound(src, pick(list( - 'modular_nova/modules/black_mesa/sound/mobs/headcrab/die1.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/headcrab/die2.ogg' - )), 100) - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) - . = ..() - if(!hit_atom || stat == DEAD) - return - if(!isliving(hit_atom)) - return - playsound(src, 'modular_nova/modules/black_mesa/sound/mobs/headcrab/headbite.ogg', 100) - var/mob/living/hit_mob = hit_atom - hit_mob.apply_damage(melee_damage_upper, BRUTE) - if(!ishuman(hit_atom)) - return - var/mob/living/carbon/human/human_to_dunk = hit_atom - if(!human_to_dunk.get_item_by_slot(ITEM_SLOT_HEAD) && prob(50) && zombify(human_to_dunk)) - to_chat(human_to_dunk, span_userdanger("[src] latches onto your head as it pierces your skull, instantly killing you!")) - human_to_dunk.investigate_log("was headcrab latched by [src].", INVESTIGATE_DEATHS) - human_to_dunk.death(FALSE) - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/proc/zombify(mob/living/carbon/human/zombified_human) - if(is_zombie) - return FALSE - is_zombie = TRUE - if(zombified_human.wear_suit) - var/obj/item/clothing/suit/armor/zombie_suit = zombified_human.wear_suit - maxHealth += zombie_suit.get_armor_rating(MELEE) //That zombie's got armor, I want armor! - maxHealth += 40 - health = maxHealth - name = "zombie" - desc = "A shambling corpse animated by a headcrab!" - mob_biotypes |= MOB_HUMANOID - melee_damage_lower += 8 - melee_damage_upper += 11 - obj_damage = 21 //now that it has a corpse to puppet, it can properly attack structures - ranged = FALSE - dodging = FALSE - retreat_distance = 0 - minimum_distance = 0 - AddElement(/datum/element/wall_smasher, strength_flag = ENVIRONMENT_SMASH_STRUCTURES) - movement_type = GROUND - icon_state = "" - zombified_human.set_hairstyle(null, update = FALSE) - zombified_human.update_body_parts() - zombified_human.forceMove(src) - oldguy = zombified_human - update_appearance() - visible_message(span_warning("The corpse of [zombified_human.name] suddenly rises!")) - return TRUE - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/Destroy() - if(oldguy) - oldguy.forceMove(get_turf(src)) - oldguy = null - return ..() - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/death(gibbed) - . = ..() - if(oldguy) - oldguy.forceMove(loc) - oldguy = null - if(is_zombie) - if(prob(30)) - new /mob/living/simple_animal/hostile/blackmesa/xen/headcrab(loc) //OOOO it unlached! - qdel(src) - return - cut_overlays() - update_appearance() - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/update_overlays() - . = ..() - if(is_zombie) - copy_overlays(oldguy, TRUE) - var/mutable_appearance/blob_head_overlay = mutable_appearance('modular_nova/modules/black_mesa/icons/mobs.dmi', "headcrab_zombie") - add_overlay(blob_head_overlay) - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/fast - speed = -2 diff --git a/modular_nova/modules/black_mesa/code/mobs/headcrab_zombie.dm b/modular_nova/modules/black_mesa/code/mobs/headcrab_zombie.dm deleted file mode 100644 index d66d874b80c..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/headcrab_zombie.dm +++ /dev/null @@ -1,89 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie - name = "headcrab zombie" - desc = "This unlucky person has had a headcrab latch onto their head. Ouch." - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "zombie" - icon_living = "zombie" - maxHealth = 110 - health = 110 - icon_gib = null - icon_dead = "zombie_dead" - speak_chance = 1 - speak_emote = list("growls") - speed = 1 - emote_taunt = list("growls", "snarls", "grumbles") - taunt_chance = 100 - melee_damage_lower = 21 - melee_damage_upper = 21 - attack_sound = 'modular_nova/modules/black_mesa/sound/mobs/zombies/claw_strike.ogg' - gold_core_spawnable = HOSTILE_SPAWN - alert_cooldown_time = 8 SECONDS - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert1.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert2.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert3.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert4.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert5.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/alert6.ogg', - ) - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/death(gibbed) - new /obj/effect/gibspawner/human(get_turf(src)) - return ..() - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/scientist - name = "zombified scientist" - desc = "Even after death, I still have to wear this horrible tie!" - icon_state = "scientist_zombie" - icon_living = "scientist_zombie" - loot = list(/obj/effect/mob_spawn/corpse/human/scientist_zombie) - del_on_death = 1 - - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard - name = "zombified guard" - desc = "About that brain I owed ya!" - icon_state = "security_zombie" - icon_living = "security_zombie" - maxHealth = 140 // Armor! - health = 140 - loot = list(/obj/effect/mob_spawn/corpse/human/guard_zombie) - del_on_death = 1 - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hecu - name = "zombified marine" - desc = "MY. ASS. IS. DEAD." - icon_state = "hecu_zombie" - icon_living = "hecu_zombie" - maxHealth = 190 // More armor! - health = 190 - loot = list(/obj/effect/mob_spawn/corpse/human/hecu_zombie) - del_on_death = 1 - -/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev - name = "zombified hazardous environment specialist" - desc = "User death... surpassed." - icon_state = "hev_zombie" - icon_living = "hev_zombie" - maxHealth = 250 - health = 250 - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv1.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv2.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv3.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv4.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv5.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv6.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv7.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv8.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv9.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv10.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv11.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv12.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv13.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/zombies/hzv14.ogg', - ) - - - - diff --git a/modular_nova/modules/black_mesa/code/mobs/houndeye.dm b/modular_nova/modules/black_mesa/code/mobs/houndeye.dm deleted file mode 100644 index f563ac8018b..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/houndeye.dm +++ /dev/null @@ -1,52 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/houndeye - name = "houndeye" - desc = "Some highly aggressive alien creature. Thrives in toxic environments." - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "houndeye" - icon_living = "houndeye" - icon_dead = "houndeye_dead" - icon_gib = null - mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) - environment_smash = ENVIRONMENT_SMASH_STRUCTURES - speak_chance = 1 - speak_emote = list("growls") - speed = 1 - emote_taunt = list("growls", "snarls", "grumbles") - taunt_chance = 100 - turns_per_move = 7 - maxHealth = 100 - health = 100 - obj_damage = 50 - harm_intent_damage = 10 - melee_damage_lower = 20 - melee_damage_upper = 20 - attack_sound = 'sound/weapons/bite.ogg' - gold_core_spawnable = HOSTILE_SPAWN - //Since those can survive on Xen, I'm pretty sure they can thrive on any atmosphere - - minbodytemp = 0 - maxbodytemp = 1500 - loot = list(/obj/item/stack/sheet/bluespace_crystal) - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert1.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert2.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert3.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert4.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert5.ogg' - ) - /// Charging ability - var/datum/action/cooldown/mob_cooldown/charge/basic_charge/charge - -/mob/living/simple_animal/hostile/blackmesa/xen/houndeye/Initialize(mapload) - . = ..() - charge = new(src) - charge.Grant(src) - -/mob/living/simple_animal/hostile/blackmesa/xen/houndeye/Destroy() - charge = null - return ..() - -/mob/living/simple_animal/hostile/blackmesa/xen/houndeye/OpenFire() - if(client) - return - charge.Trigger(target) diff --git a/modular_nova/modules/black_mesa/code/mobs/human_mobs.dm b/modular_nova/modules/black_mesa/code/mobs/human_mobs.dm deleted file mode 100644 index aa21f2779d7..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/human_mobs.dm +++ /dev/null @@ -1,226 +0,0 @@ -/* -* HECU -*/ - -/mob/living/simple_animal/hostile/blackmesa/hecu - name = "HECU Grunt" - desc = "I didn't sign on for this shit. Monsters, sure, but civilians? Who ordered this operation anyway?" - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "hecu_melee" - icon_living = "hecu_melee" - icon_dead = "hecu_dead" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID - sentience_type = SENTIENCE_HUMANOID - speak_chance = 10 - speak = list("Stop right there!") - turns_per_move = 5 - speed = 0 - stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 150 - health = 150 - harm_intent_damage = 5 - melee_damage_lower = 10 - melee_damage_upper = 10 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - combat_mode = TRUE - loot = list(/obj/effect/gibspawner/human, /obj/item/melee/baton) - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 7.5 - faction = list(FACTION_HECU) - check_friendly_fire = 1 - status_flags = CANPUSH - del_on_death = 1 - dodging = TRUE - rapid_melee = 2 - footstep_type = FOOTSTEP_MOB_SHOE - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert06.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert07.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert08.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert10.ogg' - ) - - -/mob/living/simple_animal/hostile/blackmesa/hecu/ranged - ranged = TRUE - retreat_distance = 5 - minimum_distance = 5 - icon_state = "hecu_ranged" - icon_living = "hecu_ranged" - casingtype = /obj/item/ammo_casing/a50ae - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' - loot = list(/obj/effect/gibspawner/human, /obj/effect/spawner/random/hecu_deagle) - dodging = TRUE - rapid_melee = 1 - -/mob/living/simple_animal/hostile/blackmesa/hecu/ranged/smg - rapid = 3 - icon_state = "hecu_ranged_smg" - icon_living = "hecu_ranged_smg" - casingtype = /obj/item/ammo_casing/c34 - projectilesound = 'sound/weapons/gun/smg/shot.ogg' - loot = list(/obj/effect/gibspawner/human, /obj/effect/spawner/random/hecu_smg) - -/mob/living/simple_animal/hostile/blackmesa/sec - name = "Security Guard" - desc = "About that beer I owe'd ya!" - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "security_guard_melee" - icon_living = "security_guard_melee" - icon_dead = "security_guard_dead" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID - sentience_type = SENTIENCE_HUMANOID - turns_per_move = 5 - speed = 0 - stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 100 - health = 100 - harm_intent_damage = 5 - melee_damage_lower = 7 - melee_damage_upper = 7 - attack_verb_continuous = "punches" - attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' - loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt) - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 7.5 - faction = list(FACTION_STATION, FACTION_NEUTRAL) - check_friendly_fire = 1 - status_flags = CANPUSH - del_on_death = TRUE - combat_mode = TRUE - dodging = TRUE - rapid_melee = 2 - footstep_type = FOOTSTEP_MOB_SHOE - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance06.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance07.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance08.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance09.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance10.ogg' - ) - var/list/follow_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway06.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway07.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway08.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo03.ogg', - ) - var/list/unfollow_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg', - ) - var/follow_speed = 2 - var/follow_distance = 2 - -/mob/living/simple_animal/hostile/blackmesa/sec/Initialize(mapload) - . = ..() - AddComponent(/datum/component/follow, follow_sounds, unfollow_sounds, follow_distance, follow_speed) - - -/mob/living/simple_animal/hostile/blackmesa/sec/ranged - ranged = TRUE - retreat_distance = 5 - minimum_distance = 5 - icon_state = "security_guard_ranged" - icon_living = "security_guard_ranged" - casingtype = /obj/item/ammo_casing/c9mm - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' - loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/sol) - rapid_melee = 1 - -/mob/living/simple_animal/hostile/blackmesa/blackops - name = "black operative" - desc = "Why do we always have to clean up a mess the grunts can't handle?" - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "blackops" - icon_living = "blackops" - icon_dead = "blackops" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_HUMANOID - sentience_type = SENTIENCE_HUMANOID - speak_chance = 10 - speak = list("Got a visual!") - turns_per_move = 5 - speed = 0 - stat_attack = HARD_CRIT - robust_searching = 1 - maxHealth = 200 - health = 200 - harm_intent_damage = 25 - melee_damage_lower = 30 - melee_damage_upper = 30 - attack_verb_continuous = "strikes" - attack_verb_simple = "strikes" - attack_sound = 'sound/effects/woodhit.ogg' - combat_mode = TRUE - loot = list(/obj/effect/gibspawner/human) - atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) - unsuitable_atmos_damage = 7.5 - faction = list(FACTION_BLACKOPS) - check_friendly_fire = 1 - status_flags = CANPUSH - del_on_death = 1 - dodging = TRUE - rapid_melee = 2 - footstep_type = FOOTSTEP_MOB_SHOE - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert06.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert07.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert08.ogg' - ) - - -/mob/living/simple_animal/hostile/blackmesa/blackops/ranged - ranged = TRUE - rapid = 2 - retreat_distance = 5 - minimum_distance = 5 - icon_state = "blackops_ranged" - icon_living = "blackops_ranged" - casingtype = /obj/item/ammo_casing/c40sol - projectilesound = 'modular_nova/modules/modular_weapons/sounds/rifle_heavy.ogg' - attack_sound = 'sound/weapons/punch1.ogg' - loot = list(/obj/effect/gibspawner/human, /obj/item/ammo_box/magazine/c40sol_rifle/standard) - rapid_melee = 1 diff --git a/modular_nova/modules/black_mesa/code/mobs/mob_spawners.dm b/modular_nova/modules/black_mesa/code/mobs/mob_spawners.dm deleted file mode 100644 index 7a173a80c74..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/mob_spawners.dm +++ /dev/null @@ -1,138 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa - var/list/alert_sounds - var/alert_cooldown = 3 SECONDS - var/alert_cooldown_time - -/mob/living/simple_animal/hostile/blackmesa/xen - faction = list(FACTION_XEN) - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - minbodytemp = 0 - maxbodytemp = 1500 - -/mob/living/simple_animal/hostile/blackmesa/Aggro() - if(alert_sounds) - if(!(world.time <= alert_cooldown_time)) - playsound(src, pick(alert_sounds), 70) - alert_cooldown_time = world.time + alert_cooldown - - -#define MOB_PLACER_RANGE 16 // One more tile than the biggest viewrange we have. - -/obj/effect/random_mob_placer - name = "mob placer" - icon = 'modular_nova/modules/black_mesa/icons/mapping_helpers.dmi' - icon_state = "mobspawner" - var/list/possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab) - -/obj/effect/random_mob_placer/Initialize(mapload) - . = ..() - for(var/turf/iterating_turf in range(MOB_PLACER_RANGE, src)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(trigger)) - -/obj/effect/random_mob_placer/proc/trigger(datum/source, atom/movable/entered_atom) - SIGNAL_HANDLER - if(!isliving(entered_atom)) - return - var/mob/living/entered_mob = entered_atom - - if(!entered_mob.client) - return - - var/mob/picked_mob = pick(possible_mobs) - new picked_mob(loc) - qdel(src) - -#undef MOB_PLACER_RANGE - -/obj/effect/random_mob_placer/xen - icon_state = "spawn_xen" - possible_mobs = list( - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab, - /mob/living/simple_animal/hostile/blackmesa/xen/houndeye, - /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid, - ) - -/obj/effect/random_mob_placer/xen/zombie - icon_state = "spawn_zombie" - possible_mobs = list( - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/scientist, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard, - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hecu, - ) - -/obj/effect/random_mob_placer/blackops - icon_state = "spawn_blackops" - possible_mobs = list( - /mob/living/simple_animal/hostile/blackmesa/blackops, - /mob/living/simple_animal/hostile/blackmesa/blackops/ranged, - ) - -/obj/effect/random_mob_placer/hev_zombie - icon_state = "spawn_hev" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev) - -/obj/effect/random_mob_placer/scientist_zombie - icon_state = "spawn_zombiescientist" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/scientist) - -/obj/effect/random_mob_placer/scientist_zombie - icon_state = "spawn_zombiesec" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard) - -/obj/effect/random_mob_placer/security_guard - icon_state = "spawn_guard" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/sec, /mob/living/simple_animal/hostile/blackmesa/sec/ranged) - -/obj/effect/random_mob_placer/vortigaunt_hostile - icon_state = "spawn_vortigaunt_slave" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave) - -/obj/effect/random_mob_placer/vortigaunt - icon_state = "spawn_vortigaunt" - possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt) - -/obj/effect/mob_spawn/corpse/human/hecu_zombie - name = "HECU" - outfit = /datum/outfit/hecucorpse - icon_state = "corpsebartender" /// It 'vaguely' looks like HECU - brute_damage = 1000 - -/datum/outfit/hecucorpse - name = "BMRF HECU Corpse" - uniform = /obj/item/clothing/under/rank/security/officer/hecu - head = /obj/item/clothing/head/helmet - suit = /obj/item/clothing/suit/armor/vest - mask = /obj/item/clothing/mask/gas/hecu2 - gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/military/assault/hecu - shoes = /obj/item/clothing/shoes/combat - l_pocket = /obj/item/storage/belt/bowie_sheath - r_pocket = /obj/item/flashlight/flare - -/obj/effect/mob_spawn/corpse/human/scientist_zombie - name = "Science Team" - outfit = /datum/outfit/sciteamcorpse - icon_state = "corpsescientist" - brute_damage = 1000 - -/datum/outfit/sciteamcorpse - name = "BMRF Science Team Corpse" - uniform = /obj/item/clothing/under/rank/rnd/scientist/nova/hlscience - suit = /obj/item/clothing/suit/toggle/labcoat - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/latex - -/obj/effect/mob_spawn/corpse/human/guard_zombie - name = "Security Guard" - outfit = /datum/outfit/barneycorpse - icon_state = "corpsedoctor" /// It 'vaguely' looks like the guard - brute_damage = 1000 - -/datum/outfit/barneycorpse - name = "BMRF Security Guard Corpse" - uniform = /obj/item/clothing/under/rank/security/officer/blueshirt - head = /obj/item/clothing/head/helmet/blueshirt - suit = /obj/item/clothing/suit/armor/vest/blueshirt - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/color/black - belt = /obj/item/storage/belt/security diff --git a/modular_nova/modules/black_mesa/code/mobs/nihilanth.dm b/modular_nova/modules/black_mesa/code/mobs/nihilanth.dm deleted file mode 100644 index fabda7e4c0e..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/nihilanth.dm +++ /dev/null @@ -1,67 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth - name = "nihilanth" - desc = "Holy shit." - icon = 'modular_nova/modules/black_mesa/icons/nihilanth.dmi' - icon_state = "nihilanth" - icon_living = "nihilanth" - SET_BASE_PIXEL(-32, -32) - speed = 3 - bound_height = 64 - bound_width = 64 - icon_dead = "bullsquid_dead" - maxHealth = 3000 - health = 3000 - atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) - projectilesound = 'sound/weapons/lasercannonfire.ogg' - projectiletype = /obj/projectile/nihilanth - ranged = TRUE - rapid = 3 - alert_cooldown = 2 MINUTES - harm_intent_damage = 50 - melee_damage_lower = 30 - melee_damage_upper = 40 - attack_verb_continuous = "lathes" - attack_verb_simple = "lathe" - attack_sound = 'sound/weapons/punch1.ogg' - status_flags = NONE - del_on_death = TRUE - wander = TRUE - loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/sheet/bluespace_crystal/fifty, /obj/item/key/gateway, /obj/item/uber_teleporter) - movement_type = FLYING - -/obj/item/stack/sheet/bluespace_crystal/fifty - amount = 50 - -/obj/projectile/nihilanth - name = "portal energy" - icon_state = "seedling" - damage = 20 - damage_type = BURN - light_range = 2 - armor_flag = ENERGY - light_color = LIGHT_COLOR_BRIGHT_YELLOW - hitsound = 'sound/weapons/sear.ogg' - hitsound_wall = 'sound/weapons/effects/searwall.ogg' - nondirectional_sprite = TRUE - -/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/Aggro() - . = ..() - if(!(world.time <= alert_cooldown_time)) - alert_cooldown_time = world.time + alert_cooldown - switch(health) - if(0 to 999) - playsound(src, pick(list('modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg', 'modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg')), 100) - if(1000 to 2999) - playsound(src, pick(list('modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg', 'modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg')), 100) - if(3000 to 6000) - playsound(src, pick(list('modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg', 'modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg')), 100) - else - playsound(src, pick(list('modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg', 'modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg')), 100) - set_combat_mode(TRUE) - -/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/death(gibbed) - . = ..() - -/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/LoseAggro() - . = ..() - set_combat_mode(FALSE) diff --git a/modular_nova/modules/black_mesa/code/mobs/vortigaunt.dm b/modular_nova/modules/black_mesa/code/mobs/vortigaunt.dm deleted file mode 100644 index 1fc62c86e32..00000000000 --- a/modular_nova/modules/black_mesa/code/mobs/vortigaunt.dm +++ /dev/null @@ -1,64 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt - name = "vortigaunt" - desc = "There is no distance between us. No false veils of time or space may intervene." - icon = 'modular_nova/modules/black_mesa/icons/mobs.dmi' - icon_state = "vortigaunt" - icon_living = "vortigaunt" - icon_dead = "vortigaunt_dead" - icon_gib = null - gender = MALE - faction = list(FACTION_STATION, FACTION_NEUTRAL) - mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) - speak_chance = 1 - speak_emote = list("galungs") - speed = 1 - emote_taunt = list("galalungas", "galungas", "gungs") - projectiletype = /obj/projectile/beam/emitter/hitscan - projectilesound = 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg' - ranged_cooldown_time = 5 SECONDS - ranged_message = "fires" - taunt_chance = 100 - turns_per_move = 7 - maxHealth = 130 - health = 130 - speed = 3 - ranged = TRUE - dodging = TRUE - harm_intent_damage = 15 - melee_damage_lower = 10 - melee_damage_upper = 10 - retreat_distance = 5 - minimum_distance = 5 - attack_sound = 'sound/weapons/bite.ogg' - gold_core_spawnable = FRIENDLY_SPAWN - loot = list(/obj/item/stack/sheet/bone) - alert_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01b.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert06.ogg', - ) - /// SOunds we play when asked to follow/unfollow. - var/list/follow_sounds = list( - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg', - 'modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg', - ) - var/follow_speed = 1 - var/follow_distance = 2 - -/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/Initialize(mapload) - . = ..() - AddComponent(/datum/component/follow, follow_sounds, follow_sounds, follow_distance, follow_speed) - -/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave - name = "slave vortigaunt" - desc = "Bound by the shackles of a sinister force. He does not want to hurt you." - icon_state = "vortigaunt_slave" - faction = list(FACTION_XEN) diff --git a/modular_nova/modules/black_mesa/code/objects.dm b/modular_nova/modules/black_mesa/code/objects.dm deleted file mode 100644 index b1c5b43479d..00000000000 --- a/modular_nova/modules/black_mesa/code/objects.dm +++ /dev/null @@ -1,25 +0,0 @@ -/obj/item/minespawner/explosive - name = "deactivated explosive landmine" - desc = "When activated, will deploy into a highly explosive mine after 3 seconds passes, perfect for lazy militarymen looking to cover their fortifications with no effort." - - mine_type = /obj/effect/mine/explosive - -/obj/item/minespawner/explosive/nri - - mine_type = /obj/effect/mine/explosive/nri - -/// A nerfed down version of a landmine I really should've done a long time ago but only did it now. -/obj/effect/mine/explosive/nri - name = "explosive mine" - range_devastation = 0 - range_heavy = 0 - range_light = 2 - range_flame = 1 - range_flash = 3 - /// Stun time after an activation. - var/stun_time = 100 - -/obj/effect/mine/explosive/nri/mineEffect(mob/living/victim) - explosion(src, range_devastation, range_heavy, range_light, range_flame, range_flash) - if(isliving(victim)) - victim.Paralyze(stun_time) diff --git a/modular_nova/modules/black_mesa/code/projectiles.dm b/modular_nova/modules/black_mesa/code/projectiles.dm deleted file mode 100644 index 2a0c77fa02e..00000000000 --- a/modular_nova/modules/black_mesa/code/projectiles.dm +++ /dev/null @@ -1,10 +0,0 @@ -/obj/projectile/bullet/a223/weak - name = "surplus .277 bullet" - damage = 25 - armour_penetration = 10 - wound_bonus = -40 - -/obj/item/ammo_casing/a223/weak - name = ".277 surplus bullet casing" - desc = "A .277 surplus bullet casing." - projectile_type = /obj/projectile/bullet/a223/weak diff --git a/modular_nova/modules/black_mesa/code/rationpacks.dm b/modular_nova/modules/black_mesa/code/rationpacks.dm deleted file mode 100644 index 7c939f1d66d..00000000000 --- a/modular_nova/modules/black_mesa/code/rationpacks.dm +++ /dev/null @@ -1,133 +0,0 @@ -/// Handpicked list of various pizzas and "pizzas" to make sure it's both 'safe' (human-edible) and doesn't spawn the base type like the bomb pizza can. -#define EDIBLE_PIZZA_LIST list( \ - /obj/item/food/pizza/margherita, \ - /obj/item/food/pizza/meat, \ - /obj/item/food/pizza/mushroom, \ - /obj/item/food/pizza/vegetable, \ - /obj/item/food/pizza/donkpocket, \ - /obj/item/food/pizza/dank, \ - /obj/item/food/pizza/sassysage, \ - /obj/item/food/pizza/pineapple, \ - /obj/item/food/pizza/mothic_margherita, \ - /obj/item/food/pizza/mothic_firecracker, \ - /obj/item/food/pizza/mothic_five_cheese, \ - /obj/item/food/pizza/mothic_white_pie, \ - /obj/item/food/pizza/mothic_pesto, \ - /obj/item/food/pizza/mothic_garlic, \ - /obj/item/food/pizza/flatbread/rustic, \ - /obj/item/food/pizza/flatbread/italic, \ - /obj/item/food/pizza/flatbread/zmorgast, \ - /obj/item/food/pizza/flatbread/fish, \ - /obj/item/food/pizza/flatbread/mushroom, \ - /obj/item/food/pizza/flatbread/nutty, \ -) - -/obj/item/food/mre_course - name = "undefined MRE course" - desc = "Something you shouldn't see. But it's edible." - icon = 'modular_nova/modules/awaymissions_nova/icons/courses.dmi' - icon_state = "main_course" - food_reagents = list(/datum/reagent/consumable/nutriment = 20) - tastes = list("crayon powder" = 1) - foodtypes = VEGETABLES | GRAIN - w_class = WEIGHT_CLASS_SMALL - -/obj/item/food/mre_course/main - name = "MRE main course" - desc = "Main course of the ancient military ration designed for ground troops. This one is NOTHING." - tastes = list("strawberry" = 1, "vanilla" = 1, "chocolate" = 1) - -/obj/item/food/mre_course/main/beans - name = "MRE main course - Pork and Beans" - desc = "Main course of the ancient military ration designed for ground troops. This one is pork and beans covered in some tomato sauce." - tastes = list("beans" = 1, "pork" = 1, "tomato sauce" = 1) - foodtypes = MEAT | VEGETABLES - -/obj/item/food/mre_course/main/macaroni - name = "MRE main course - Macaroni and Cheese" - desc = "Main course of the ancient military ration designed for ground troops. This one is preboiled macaroni covered in some federal reserve cheese." - tastes = list("cold macaroni" = 1, "bland cheese" = 1) - foodtypes = DAIRY | GRAIN - -/obj/item/food/mre_course/main/rice - name = "MRE main course - Rice and Beef" - desc = "Main course of the ancient military ration designed for ground troops. This one is rice with beef, covered in gravy." - tastes = list("dense rice" = 1, "bits of beef" = 1, "gravy" = 1) - foodtypes = GRAIN | MEAT - -/obj/item/food/mre_course/side - name = "MRE side course" - desc = "Side course of the ancient military ration designed for ground troops. This one is NOTHING." - icon_state = "side_dish" - -/obj/item/food/mre_course/side/bread - name = "MRE side course - Cornbread" - desc = "Side course of the ancient military ration designed for ground troops. This one is cornbread." - tastes = list("cornbread" = 1) - foodtypes = GRAIN - -/obj/item/food/mre_course/side/pie - name = "MRE side course - Meat Pie" - desc = "Side course of the ancient military ration designed for ground troops. This one is some meat pie." - tastes = list("pie dough" = 1, "ground meat" = 1, "Texas" = 1) - foodtypes = MEAT | GRAIN - -/obj/item/food/mre_course/side/chicken - name = "MRE side course - Sweet 'n Sour Chicken" - desc = "Side course of the ancient military ration designed for ground troops. This one is some undefined chicken-looking meat covered in cheap reddish sauce." - tastes = list("bits of chicken meat" = 1, "sweet and sour sauce" = 1, "salt" = 1) - foodtypes = MEAT | FRIED - -/obj/item/food/mre_course/dessert - name = "MRE dessert" - desc = "Dessert of the ancient military ration designed for ground troops. This one is NOTHING." - icon_state = "dessert" - -/obj/item/food/mre_course/dessert/cookie - name = "MRE dessert - Cookie" - desc = "Dessert of the ancient military ration designed for ground troops. This one is a big dry cookie." - tastes = list("dryness" = 1, "hard cookie" = 1, "chocolate chip" = 1) - foodtypes = GRAIN | SUGAR - -/obj/item/food/mre_course/dessert/cake - name = "MRE dessert - Apple Pie" - desc = "Dessert of the ancient military ration designed for ground troops. This one is an amorphous apple pie." - tastes = list("apple" = 1, "moist cake" = 1, "sugar" = 1) - foodtypes = GRAIN | SUGAR | FRUIT - -/obj/item/food/mre_course/dessert/chocolate - name = "MRE dessert - Dark Chocolate" - desc = "Dessert of the ancient military ration designed for ground troops. This one is a dark bar of chocolate." - tastes = list("vanilla" = 1, "artificial chocolate" = 1, "chemicals" = 1) - foodtypes = JUNKFOOD | SUGAR - -/obj/item/storage/box/hecu_rations - name = "Meal, Ready-to-Eat" - desc = "A box containing a few rations and some chewing gum, for keeping a starving crayon-eater going." - icon = 'modular_nova/modules/awaymissions_nova/icons/mre_hecu.dmi' - icon_state = "mre_package" - illustration = null - -/obj/item/storage/box/hecu_rations/Initialize(mapload) - . = ..() - atom_storage.max_slots = 5 - -/obj/item/storage/box/hecu_rations/PopulateContents() - var/main_course = pick(/obj/item/food/mre_course/main/beans, /obj/item/food/mre_course/main/macaroni, /obj/item/food/mre_course/main/rice) - var/side_dish = pick(/obj/item/food/mre_course/side/bread, /obj/item/food/mre_course/side/pie, /obj/item/food/mre_course/side/chicken) - var/dessert = pick(/obj/item/food/mre_course/dessert/cookie, /obj/item/food/mre_course/dessert/cake, /obj/item/food/mre_course/dessert/chocolate) - new main_course(src) - new side_dish(src) - new dessert(src) - new /obj/item/storage/box/gum(src) - new /obj/item/food/spacers_sidekick(src) - -/obj/item/pizzabox/random - boxtag = "Randy's Surprise" - boxtag_set = TRUE - -/obj/item/pizzabox/random/Initialize(mapload) - . = ..() - if(!pizza) - var/random_pizza = pick(EDIBLE_PIZZA_LIST) - pizza = new random_pizza(src) diff --git a/modular_nova/modules/black_mesa/code/shield_pylon.dm b/modular_nova/modules/black_mesa/code/shield_pylon.dm deleted file mode 100644 index 35b6e5b1bb1..00000000000 --- a/modular_nova/modules/black_mesa/code/shield_pylon.dm +++ /dev/null @@ -1,96 +0,0 @@ -/mob/living/simple_animal/hostile/blackmesa/xen - /// Can we be shielded by pylons? - var/can_be_shielded = TRUE - /// If we have support pylons, this is true. - var/shielded = FALSE - /// How many shields we have protecting us - var/shield_count = 0 - -/mob/living/simple_animal/hostile/blackmesa/xen/update_overlays() - . = ..() - if(shielded) - . += mutable_appearance('icons/effects/effects.dmi', "shield-yellow", MOB_SHIELD_LAYER) - -/mob/living/simple_animal/hostile/blackmesa/xen/proc/lose_shield() - shield_count-- - if(shield_count <= 0) - shielded = FALSE - update_appearance() - -/mob/living/simple_animal/hostile/blackmesa/xen/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE, wound_bonus = 0, bare_wound_bonus = 0, sharpness = NONE, attack_direction = null, attacking_item) - if(shielded) - balloon_alert_to_viewers("ineffective!") - return FALSE - return ..() - -/obj/structure/xen_pylon - name = "shield plant" - desc = "It seems to be some kind of force field generator." - icon = 'modular_nova/modules/black_mesa/icons/plants.dmi' - icon_state = "crystal_pylon" - max_integrity = 70 - density = TRUE - anchored = TRUE - /// The range at which we provide shield support to a mob. - var/shield_range = 8 - /// A list of mobs we are currently shielding with attached beams. - var/list/shielded_mobs = list() - -/obj/structure/xen_pylon/Initialize(mapload) - . = ..() - for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob in range(shield_range, src)) - if(!iterating_mob.can_be_shielded) - continue - register_mob(iterating_mob) - for(var/turf/iterating_turf in RANGE_TURFS(shield_range, src)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(mob_entered_range)) - -/obj/structure/xen_pylon/proc/mob_entered_range(datum/source, atom/movable/entered_atom) - SIGNAL_HANDLER - if(!isxenmob(entered_atom)) - return - var/mob/living/simple_animal/hostile/blackmesa/xen/entered_xen_mob = entered_atom - if(!entered_xen_mob.can_be_shielded) - return - register_mob(entered_xen_mob) - -/obj/structure/xen_pylon/proc/register_mob(mob/living/simple_animal/hostile/blackmesa/xen/mob_to_register) - if(mob_to_register in shielded_mobs) - return - if(!istype(mob_to_register)) - return - shielded_mobs += mob_to_register - mob_to_register.shielded = TRUE - mob_to_register.shield_count++ - mob_to_register.update_appearance() - var/datum/beam/created_beam = Beam(mob_to_register, icon_state = "red_lightning", time = 10 MINUTES, maxdistance = (shield_range - 1)) - shielded_mobs[mob_to_register] = created_beam - RegisterSignal(created_beam, COMSIG_QDELETING, PROC_REF(beam_died), override = TRUE) - RegisterSignal(mob_to_register, COMSIG_QDELETING, PROC_REF(mob_died), override = TRUE) - -/obj/structure/xen_pylon/proc/mob_died(atom/movable/source, force) - SIGNAL_HANDLER - var/datum/beam/beam = shielded_mobs[source] - QDEL_NULL(beam) - shielded_mobs[source] = null - shielded_mobs -= source - -/obj/structure/xen_pylon/proc/beam_died(datum/beam/beam_to_kill) - SIGNAL_HANDLER - for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob as anything in shielded_mobs) - if(shielded_mobs[iterating_mob] == beam_to_kill) - iterating_mob.lose_shield() - shielded_mobs[iterating_mob] = null - shielded_mobs -= iterating_mob - -/obj/structure/xen_pylon/Destroy() - for(var/mob/living/simple_animal/hostile/blackmesa/xen/iterating_mob as anything in shielded_mobs) - iterating_mob.lose_shield() - var/datum/beam/beam = shielded_mobs[iterating_mob] - QDEL_NULL(beam) - shielded_mobs[iterating_mob] = null - shielded_mobs -= iterating_mob - shielded_mobs = null - playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE) - new /obj/item/grenade/xen_crystal(get_turf(src)) - return ..() diff --git a/modular_nova/modules/black_mesa/code/shockplant.dm b/modular_nova/modules/black_mesa/code/shockplant.dm deleted file mode 100644 index 842b084b387..00000000000 --- a/modular_nova/modules/black_mesa/code/shockplant.dm +++ /dev/null @@ -1,41 +0,0 @@ - -/obj/structure/shockplant - name = "electrical plant" - desc = "It glows with a warm buzz." - icon = 'modular_nova/modules/black_mesa/icons/plants.dmi' - icon_state = "electric_plant" - density = TRUE - anchored = TRUE - max_integrity = 200 - light_range = 15 - light_power = 0.5 - light_color = "#53fafa" - /// Our faction - faction = list(FACTION_XEN) - /// Our range to shock folks in. - var/shock_range = 6 - /// Our cooldown on the shocking. - var/shock_cooldown = 3 SECONDS - /// The zap power - var/shock_power = 10000 - - COOLDOWN_DECLARE(shock_cooldown_timer) - -/obj/structure/shockplant/Initialize(mapload) - . = ..() - for(var/turf/open/iterating_turf as anything in circle_view_turfs(src, shock_range)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(trigger)) - -/obj/structure/shockplant/proc/trigger(datum/source, atom/movable/entered_atom) - SIGNAL_HANDLER - - if(!COOLDOWN_FINISHED(src, shock_cooldown_timer)) - return - - if(isliving(entered_atom)) - var/mob/living/entering_mob = entered_atom - if(faction_check_atom(entering_mob)) - return - tesla_zap(src, shock_range, shock_power, shocked_targets = list(entering_mob)) - playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE) - COOLDOWN_START(src, shock_cooldown_timer, shock_cooldown) diff --git a/modular_nova/modules/black_mesa/code/spawners.dm b/modular_nova/modules/black_mesa/code/spawners.dm deleted file mode 100644 index 0968e553d0e..00000000000 --- a/modular_nova/modules/black_mesa/code/spawners.dm +++ /dev/null @@ -1,17 +0,0 @@ -/obj/effect/spawner/random/bioluminescent_plant - name = "random bioluminescent plant" - icon_state = "plant" - loot = list( - /obj/structure/flora/biolumi/lamp, - /obj/structure/flora/biolumi/flower, - /obj/structure/flora/biolumi/mine, - ) - -/obj/effect/spawner/random/bioluminescent_plant/weak - name = "random weak bioluminescent plant" - icon_state = "plant" - loot = list( - /obj/structure/flora/biolumi/lamp/weaklight, - /obj/structure/flora/biolumi/flower/weaklight, - /obj/structure/flora/biolumi/mine/weaklight, - ) diff --git a/modular_nova/modules/black_mesa/code/turfs.dm b/modular_nova/modules/black_mesa/code/turfs.dm deleted file mode 100644 index 7b30cba8e69..00000000000 --- a/modular_nova/modules/black_mesa/code/turfs.dm +++ /dev/null @@ -1,111 +0,0 @@ -/turf/closed/mineral/black_mesa - turf_type = /turf/open/misc/ironsand/black_mesa - baseturfs = /turf/open/misc/ironsand/black_mesa - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - -//Floors that no longer lead into space (innovative!) -/turf/open/misc/ironsand/black_mesa - baseturfs = /turf/open/misc/ironsand/black_mesa - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - -/obj/effect/baseturf_helper/black_mesa - name = "black mesa sand baseturf editor" - baseturf = /turf/open/misc/ironsand/black_mesa - -/obj/effect/baseturf_helper/black_mesa_xen - name = "xen baseturf editor" - baseturf = /turf/open/water/xen_acid - -/turf/closed/indestructible/rock/xen - name = "strange wall" - color = "#ac3b06" - baseturfs = /turf/closed/indestructible/rock/xen - -/turf/open/misc/xen - name = "strange weeds" - desc = "It feels soft to the touch, like a carpet... only... wet." - icon = 'modular_nova/modules/black_mesa/icons/xen_turfs.dmi' - icon_state = "xen_turf" - baseturfs = /turf/open/misc/xen - footstep = FOOTSTEP_GRASS - barefootstep = FOOTSTEP_GRASS - planetary_atmos = TRUE - -/turf/open/water/beach/xen - desc = "It's mirky and filled with strange organisms." - name = "xen water" - icon = 'modular_nova/modules/black_mesa/icons/xen_turfs.dmi' - baseturfs = /turf/open/water/beach/xen - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/misc/beach/coastline_t/xen - desc = "It's mirky and filled with strange organisms." - name = "xen water" - icon = 'modular_nova/modules/black_mesa/icons/xen_turfs.dmi' - baseturfs = /turf/open/misc/beach/coastline_t/xen - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/misc/beach/coastline_t/sandwater_inner/xen - desc = "It's mirky and filled with strange organisms." - name = "xen water" - icon = 'modular_nova/modules/black_mesa/icons/xen_turfs.dmi' - baseturfs = /turf/open/misc/beach/coastline_t/sandwater_inner/xen - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/misc/beach/coastline_b/xen - name = "xen water" - desc = "It's mirky and filled with strange organisms." - icon = 'modular_nova/modules/black_mesa/icons/xen_turfs.dmi' - baseturfs = /turf/open/misc/beach/coastline_b/xen - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/misc/dirt/planet/xen - name = "strange path" - color = "#ee5f1c" - baseturfs = /turf/open/misc/dirt/planet/xen - planetary_atmos = TRUE - -/turf/open/water/xen_acid - baseturfs = /turf/open/water/xen_acid - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - planetary_atmos = TRUE - color = COLOR_VIBRANT_LIME - light_range = 2 - light_color = COLOR_VIBRANT_LIME - /// How much damage we deal if a mob enters us. - var/acid_damage = 30 - -/turf/open/water/xen_acid/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) - . = ..() - if(isliving(arrived) && !istype(arrived, /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid)) // Bull squid territory! - var/mob/living/unlucky_mob = arrived - unlucky_mob.adjustFireLoss(acid_damage) - playsound(unlucky_mob, 'sound/weapons/sear.ogg', 100, TRUE) - -/turf/open/water/electric - name = "electric water" - baseturfs = /turf/open/water/electric - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - color = COLOR_TEAL - light_range = 2 - light_color = COLOR_TEAL - -/turf/open/water/electric/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) - . = ..() - if(isliving(arrived)) - var/mob/living/unlucky_mob = arrived - unlucky_mob.Stun(1.5 SECONDS) - unlucky_mob.Knockdown(10 SECONDS) - unlucky_mob.adjustFireLoss(15) - var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread - s.set_up(5, 1, unlucky_mob.loc) - s.start() - unlucky_mob.visible_message(span_danger("[unlucky_mob.name] is shocked by [src]!"), \ - span_userdanger("You feel a powerful shock course through your body!"), \ - span_hear("You hear a heavy electrical crack!")) - playsound(unlucky_mob, SFX_SPARKS, 100, TRUE) diff --git a/modular_nova/modules/black_mesa/code/turrets.dm b/modular_nova/modules/black_mesa/code/turrets.dm deleted file mode 100644 index 724f782e854..00000000000 --- a/modular_nova/modules/black_mesa/code/turrets.dm +++ /dev/null @@ -1,53 +0,0 @@ -/obj/machinery/porta_turret/black_mesa - use_power = IDLE_POWER_USE - req_access = list(ACCESS_CENT_GENERAL) - faction = list(FACTION_XEN, FACTION_BLACKMESA, FACTION_HECU, FACTION_BLACKOPS) - mode = 1 - uses_stored = FALSE - max_integrity = 120 - base_icon_state = "syndie" - lethal_projectile = /obj/projectile/beam/emitter - lethal_projectile_sound = 'sound/weapons/laser.ogg' - -/obj/machinery/porta_turret/black_mesa/assess_perp(mob/living/carbon/human/perp) - return 10 - -/obj/machinery/porta_turret/black_mesa/setup(obj/item/gun/turret_gun) - return - -/obj/machinery/porta_turret/black_mesa/heavy - name = "Heavy Defence Turret" - max_integrity = 200 - lethal_projectile = /obj/projectile/beam/laser/heavylaser - lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' - -/obj/item/storage/toolbox/emergency/turret/mesa - name = "USMC stationary defense deployment system" - desc = "You feel a strange urge to hit this with a wrench." - -/obj/item/storage/toolbox/emergency/turret/mesa/PopulateContents() - return null - -/obj/item/storage/toolbox/emergency/turret/mesa/attackby(obj/item/I, mob/living/user, params) - if(I.tool_behaviour == TOOL_WRENCH && user.combat_mode) - user.visible_message(span_danger("[user] bashes [src] with [I]!"), \ - span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) - playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) - var/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa/turret = new(get_turf(loc)) - turret.faction = list(FACTION_HECU) - qdel(src) - - ..() - -/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa - stun_projectile = /obj/projectile/bullet/c9mm/rubber - lethal_projectile = /obj/projectile/bullet/c9mm/ap - max_integrity = 150 - req_access = list(ACCESS_AWAY_SEC) - faction = list(FACTION_HECU) - shot_delay = 0.25 - ignore_faction = TRUE - - -/obj/machinery/porta_turret/black_mesa/friendly - faction = list(FACTION_STATION) diff --git a/modular_nova/modules/black_mesa/code/uber_teleporter.dm b/modular_nova/modules/black_mesa/code/uber_teleporter.dm deleted file mode 100644 index 32b87379875..00000000000 --- a/modular_nova/modules/black_mesa/code/uber_teleporter.dm +++ /dev/null @@ -1,48 +0,0 @@ -/obj/item/uber_teleporter - name = "\improper Nihilanth's Divinity" - desc = "It glows harshly, the power of a portal wielding monster lays within." - icon = 'modular_nova/modules/black_mesa/icons/plants.dmi' - icon_state = "crystal_pylon" - -/obj/item/uber_teleporter/attack_self(mob/living/user, modifiers) - . = ..() - playsound(get_turf(user), 'sound/weapons/zapbang.ogg', 50, TRUE) - var/area/area_to_teleport_to = tgui_input_list(usr, "Area to teleport to", "Teleport", GLOB.teleportlocs) - if(!area_to_teleport_to) - return - - var/area/teleport_area = GLOB.teleportlocs[area_to_teleport_to] - - var/list/possible_turfs = list() - for(var/turf/iterating_turf in get_area_turfs(teleport_area.type)) - if(!iterating_turf.density) - var/clear = TRUE - for(var/obj/iterating_object in iterating_turf) - if(iterating_object.density) - clear = FALSE - break - if(clear) - possible_turfs += iterating_turf - - if(!LAZYLEN(possible_turfs)) - to_chat(user, span_warning("The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")) - return - - if(user.buckled) - user.buckled.unbuckle_mob(user, force=1) - - var/list/temp_turfs = possible_turfs - var/attempt = null - var/success = FALSE - while(length(temp_turfs)) - attempt = pick(temp_turfs) - do_teleport(user, attempt, channel = TELEPORT_CHANNEL_FREE) - if(get_turf(user) == attempt) - success = TRUE - break - else - temp_turfs.Remove(attempt) - - if(!success) - do_teleport(user, possible_turfs, channel = TELEPORT_CHANNEL_FREE) - playsound(get_turf(user), 'sound/weapons/zapbang.ogg', 50, TRUE) diff --git a/modular_nova/modules/black_mesa/code/weapons.dm b/modular_nova/modules/black_mesa/code/weapons.dm deleted file mode 100644 index d767407251b..00000000000 --- a/modular_nova/modules/black_mesa/code/weapons.dm +++ /dev/null @@ -1,52 +0,0 @@ -/obj/item/crowbar/freeman - name = "blood soaked crowbar" - desc = "A heavy handed crowbar, it drips with blood." - icon = 'modular_nova/modules/awaymissions_nova/icons/freeman.dmi' - icon_state = "crowbar" - force = 35 - throwforce = 45 - toolspeed = 0.1 - wound_bonus = 10 - hitsound = 'modular_nova/master_files/sound/weapons/crowbar2.ogg' - mob_throw_hit_sound = 'modular_nova/master_files/sound/weapons/crowbar2.ogg' - force_opens = TRUE - -/obj/item/crowbar/freeman/ultimate - name = "\improper Freeman's crowbar" - desc = "A weapon wielded by an ancient physicist, the blood of hundreds seeps through this rod of iron and malice." - force = 45 - -/obj/item/crowbar/freeman/ultimate/Initialize(mapload) - . = ..() - add_filter("rad_glow", 2, list("type" = "outline", "color" = "#fbff1479", "size" = 2)) - -/obj/item/shield/riot/pointman/hecu - name = "ballistic shield" - desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell. Repair with iron." - icon_state = "ballistic" - icon = 'modular_nova/modules/awaymissions_nova/icons/ballistic.dmi' - worn_icon_state = "ballistic_worn" - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/ballistic.dmi' - inhand_icon_state = "ballistic" - lefthand_file = 'modular_nova/modules/awaymissions_nova/icons/ballistic_l.dmi' - righthand_file = 'modular_nova/modules/awaymissions_nova/icons/ballistic_r.dmi' - force = 14 - throwforce = 5 - throw_speed = 1 - throw_range = 1 - block_chance = 45 - slot_flags = ITEM_SLOT_BACK - w_class = WEIGHT_CLASS_BULKY - attack_verb_continuous = list("shoves", "bashes") - attack_verb_simple = list("shove", "bash") - transparent = TRUE - max_integrity = 150 - repairable_by = /obj/item/stack/sheet/iron //what to repair the shield with - shield_break_leftover = /obj/item/ballistic_broken - -/obj/item/ballistic_broken - name = "broken ballistic shield" - desc = "An unsalvageable, unrecoverable mess of armor steel and kevlar. Should've maintained it, huh?" - icon_state = "ballistic_broken" - icon = 'modular_nova/modules/awaymissions_nova/icons/ballistic.dmi' - w_class = WEIGHT_CLASS_BULKY diff --git a/modular_nova/modules/black_mesa/code/xen_crystal.dm b/modular_nova/modules/black_mesa/code/xen_crystal.dm deleted file mode 100644 index cdc08c39154..00000000000 --- a/modular_nova/modules/black_mesa/code/xen_crystal.dm +++ /dev/null @@ -1,72 +0,0 @@ -/obj/structure/xen_crystal - name = "resonating crystal" - desc = "A strange resinating crystal." - icon = 'modular_nova/modules/black_mesa/icons/plants.dmi' - icon_state = "crystal" - light_power = 2 - light_range = 4 - density = TRUE - anchored = TRUE - /// Have we been harvested? - var/harvested = FALSE - -/obj/structure/xen_crystal/Initialize(mapload) - . = ..() - var/color_to_set = pick(COLOR_VIBRANT_LIME, COLOR_VIVID_YELLOW, COLOR_LIGHT_PINK, LIGHT_COLOR_ELECTRIC_GREEN) - color = color_to_set - light_color = color_to_set - -/obj/structure/xen_crystal/attack_hand(mob/living/user, list/modifiers) - . = ..() - if(harvested) - to_chat(user, span_warning("[src] has already been harvested!")) - return - to_chat(user, span_notice("You start harvesting [src]!")) - if(do_after(user, 5 SECONDS, src)) - harvest(user) - -/obj/structure/xen_crystal/proc/harvest(mob/living/user) - if(harvested) - return - to_chat(user, span_notice("You harvest [src]!")) - var/obj/item/grenade/xen_crystal/nade = new (get_turf(src)) - nade.color = color - harvested = TRUE - update_appearance() - -/obj/structure/xen_crystal/update_icon_state() - . = ..() - if(harvested) - icon_state = "crystal_harvested" - else - icon_state = "crystal" - -/obj/item/grenade/xen_crystal - name = "xen crystal" - desc = "A crystal with anomalous properties." - icon = 'modular_nova/modules/black_mesa/icons/plants.dmi' - icon_state = "crystal_grenade" - /// What range do we effect mobs? - var/effect_range = 6 - /// The faction we convert the mobs to - var/factions = list(FACTION_STATION, "neutral") - /// Mobs in this list will not be affected by this grenade. - var/list/blacklisted_mobs = list( - /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman, - /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth, - ) - -/obj/item/grenade/xen_crystal/detonate(mob/living/lanced_by) - for(var/mob/living/mob_to_neutralize in view(src, effect_range)) - if(is_type_in_list(mob_to_neutralize, blacklisted_mobs)) - return - mob_to_neutralize.faction |= factions - mob_to_neutralize.visible_message(span_green("[mob_to_neutralize] is overcome by a wave of peace and tranquility!")) - new /obj/effect/particle_effect/sparks/quantum(get_turf(mob_to_neutralize)) - qdel(src) - -/datum/export/xen_crystal - cost = CARGO_CRATE_VALUE * 6 //1200 - unit_name = "anomalous crystal sample" - export_types = list(/obj/item/grenade/xen_crystal) - include_subtypes = FALSE diff --git a/modular_nova/modules/black_mesa/icons/mapping_helpers.dmi b/modular_nova/modules/black_mesa/icons/mapping_helpers.dmi deleted file mode 100644 index 50a71680c64..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/mapping_helpers.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/mobs.dmi b/modular_nova/modules/black_mesa/icons/mobs.dmi deleted file mode 100644 index 6a29b8cbc13..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/mobs.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/nihilanth.dmi b/modular_nova/modules/black_mesa/icons/nihilanth.dmi deleted file mode 100644 index 5e1c2ad3f0a..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/nihilanth.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/plants.dmi b/modular_nova/modules/black_mesa/icons/plants.dmi deleted file mode 100644 index 74bb1ae1d96..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/plants.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/structures.dmi b/modular_nova/modules/black_mesa/icons/structures.dmi deleted file mode 100644 index 9e693403536..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/structures.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/structures/dmi b/modular_nova/modules/black_mesa/icons/structures/dmi deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/modular_nova/modules/black_mesa/icons/xen_door.dmi b/modular_nova/modules/black_mesa/icons/xen_door.dmi deleted file mode 100644 index 2d6660dc84d..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/xen_door.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/icons/xen_turfs.dmi b/modular_nova/modules/black_mesa/icons/xen_turfs.dmi deleted file mode 100644 index 1ab327c3202..00000000000 Binary files a/modular_nova/modules/black_mesa/icons/xen_turfs.dmi and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/downtoBLUE.ogg b/modular_nova/modules/black_mesa/sound/downtoBLUE.ogg deleted file mode 100644 index a3ba1ba27b6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/downtoBLUE.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode1.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode1.ogg deleted file mode 100644 index 44ba4160d61..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode2.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode2.ogg deleted file mode 100644 index 1811254cd92..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode3.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode3.ogg deleted file mode 100644 index e4ccc2b62da..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode4.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode4.ogg deleted file mode 100644 index 2afe902e7f7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode5.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode5.ogg deleted file mode 100644 index 59d498eb302..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode6.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode6.ogg deleted file mode 100644 index 980bce2e46f..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode6.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/explosions/explode7.ogg b/modular_nova/modules/black_mesa/sound/explosions/explode7.ogg deleted file mode 100644 index c3853097f0b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/explosions/explode7.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/lc_mainbeam.ogg b/modular_nova/modules/black_mesa/sound/lc_mainbeam.ogg deleted file mode 100644 index 796d7578c4d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/lc_mainbeam.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/lc_teleport.ogg b/modular_nova/modules/black_mesa/sound/lc_teleport.ogg deleted file mode 100644 index 2eb79c1294f..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/lc_teleport.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert01.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert01.ogg deleted file mode 100644 index 3c78711e997..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert02.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert02.ogg deleted file mode 100644 index 59ac0855acf..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert03.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert03.ogg deleted file mode 100644 index 03dc8a3e5db..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert04.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert04.ogg deleted file mode 100644 index 033d0eb9517..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert05.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert05.ogg deleted file mode 100644 index 8de1dbca94e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert06.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert06.ogg deleted file mode 100644 index 150b0883ed1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert07.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert07.ogg deleted file mode 100644 index ef6122434fd..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert08.ogg b/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert08.ogg deleted file mode 100644 index 2e1ccbedbf7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/blackops/bo_alert08.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/attack1.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/attack1.ogg deleted file mode 100644 index 203d5797add..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/attack1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect1.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect1.ogg deleted file mode 100644 index c8adcf52cd7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect2.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect2.ogg deleted file mode 100644 index 833b58b594d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect3.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect3.ogg deleted file mode 100644 index 67b2d74d13e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/detect3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg deleted file mode 100644 index 2e170a39b06..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/splat1.ogg b/modular_nova/modules/black_mesa/sound/mobs/bullsquid/splat1.ogg deleted file mode 100644 index 19fbb1a6026..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/bullsquid/splat1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/alert1.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/alert1.ogg deleted file mode 100644 index a6d6fd17865..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/alert1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack1.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack1.ogg deleted file mode 100644 index 526428f7659..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack2.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack2.ogg deleted file mode 100644 index 6f6a0b9603b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack3.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack3.ogg deleted file mode 100644 index 480dbe24df0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/attack3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/die1.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/die1.ogg deleted file mode 100644 index 5765a5b3d7a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/die1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/die2.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/die2.ogg deleted file mode 100644 index 5de82f5d890..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/die2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/headcrab/headbite.ogg b/modular_nova/modules/black_mesa/sound/mobs/headcrab/headbite.ogg deleted file mode 100644 index 60abc628f61..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/headcrab/headbite.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert01.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert01.ogg deleted file mode 100644 index 3734653c001..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert03.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert03.ogg deleted file mode 100644 index 59a5f856458..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert04.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert04.ogg deleted file mode 100644 index 5cbffe0bd5e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert05.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert05.ogg deleted file mode 100644 index 8a6d0be7e1c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert06.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert06.ogg deleted file mode 100644 index 70c21b7fe0e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert07.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert07.ogg deleted file mode 100644 index 68d201eacf7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert08.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert08.ogg deleted file mode 100644 index 8067cb009cc..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert08.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert10.ogg b/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert10.ogg deleted file mode 100644 index bf20c20e6b1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/hecu/hg_alert10.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge1.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge1.ogg deleted file mode 100644 index 889f66c3b92..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge2.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge2.ogg deleted file mode 100644 index 42f92984a6b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge3.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge3.ogg deleted file mode 100644 index 3df3f480651..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/charge3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert1.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert1.ogg deleted file mode 100644 index b0e3ae24444..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert2.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert2.ogg deleted file mode 100644 index 2e29531d28c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert3.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert3.ogg deleted file mode 100644 index b9eefe84c28..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert4.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert4.ogg deleted file mode 100644 index 8339f5c898f..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert5.ogg b/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert5.ogg deleted file mode 100644 index 01cadd89b97..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/houndeye/he_alert5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg deleted file mode 100644 index cb599e42927..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg deleted file mode 100644 index 84913bd113d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg deleted file mode 100644 index 863e523b4a4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg deleted file mode 100644 index 988842c04c6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg deleted file mode 100644 index ffcae5c7774..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg deleted file mode 100644 index 0e8df1aa5b8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg deleted file mode 100644 index 89af97787e0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg deleted file mode 100644 index b36451a233b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg b/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg deleted file mode 100644 index 6dfca973c20..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance01.ogg deleted file mode 100644 index 602d5673a6d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance02.ogg deleted file mode 100644 index 7b644dd6848..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance03.ogg deleted file mode 100644 index 731500a7372..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance04.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance04.ogg deleted file mode 100644 index 6b82a000f03..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance05.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance05.ogg deleted file mode 100644 index 3edd57fa0e9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance06.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance06.ogg deleted file mode 100644 index 17d31399095..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance07.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance07.ogg deleted file mode 100644 index 99af157c952..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance08.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance08.ogg deleted file mode 100644 index 5bfa8376d8b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance08.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance09.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance09.ogg deleted file mode 100644 index 96827c44738..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance09.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance10.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance10.ogg deleted file mode 100644 index e6fa2a5d2fd..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/annoyance10.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot01.ogg deleted file mode 100644 index 2cf9aee0d90..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot02.ogg deleted file mode 100644 index 733d3a1d81c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot03.ogg deleted file mode 100644 index 5bb72e590d9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot04.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot04.ogg deleted file mode 100644 index a1dac8eea06..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot05.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot05.ogg deleted file mode 100644 index a2e7cbe08eb..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/holddownspot05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere01.ogg deleted file mode 100644 index aabe63664b1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere02.ogg deleted file mode 100644 index 7264bcb9538..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere03.ogg deleted file mode 100644 index 9e3e28a2a15..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/illstayhere03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg deleted file mode 100644 index 110a924aefb..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg deleted file mode 100644 index b5fd456c0b0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg deleted file mode 100644 index 3c4fde3aef4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg deleted file mode 100644 index e3ed7bcc6ec..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg deleted file mode 100644 index fb4d28264fc..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon01.ogg deleted file mode 100644 index 23115f64dea..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon02.ogg deleted file mode 100644 index c6d1f7a825e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon03.ogg deleted file mode 100644 index 1cfb8e82438..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadon03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway01.ogg deleted file mode 100644 index a6fa17c7855..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway02.ogg deleted file mode 100644 index 2effcf7a3ca..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway03.ogg deleted file mode 100644 index 62b234a48ce..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway04.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway04.ogg deleted file mode 100644 index 1daade7c1e9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway05.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway05.ogg deleted file mode 100644 index c355b370ef3..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway06.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway06.ogg deleted file mode 100644 index 771774ab456..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway07.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway07.ogg deleted file mode 100644 index ee06eca3df8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway08.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway08.ogg deleted file mode 100644 index 4378988002d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/leadtheway08.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo01.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo01.ogg deleted file mode 100644 index 44ccff69ca0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo02.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo02.ogg deleted file mode 100644 index fd3ba763b1e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo03.ogg b/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo03.ogg deleted file mode 100644 index cda68c8ae6d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/security_guard/letsgo03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01.ogg deleted file mode 100644 index 308640afdc4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01b.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01b.ogg deleted file mode 100644 index 8a70d5f9744..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert01b.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert02.ogg deleted file mode 100644 index 386bd3ea853..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert03.ogg deleted file mode 100644 index 7da21632403..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert04.ogg deleted file mode 100644 index 088bf6e5ca8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert05.ogg deleted file mode 100644 index 02ac83126e5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert06.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert06.ogg deleted file mode 100644 index 0b34b22b0de..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/alert06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot1.ogg deleted file mode 100644 index b66a9d1ab9d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot2.ogg deleted file mode 100644 index 6db85a2983c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot3.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot3.ogg deleted file mode 100644 index 277737e7fa6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg deleted file mode 100644 index 1986c3b1301..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot5.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot5.ogg deleted file mode 100644 index a52dcd764c7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/attack_shoot5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death01.ogg deleted file mode 100644 index e209a1989cb..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death02.ogg deleted file mode 100644 index 3aa9c2bd197..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death03.ogg deleted file mode 100644 index 4acd2f3628c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death04.ogg deleted file mode 100644 index 44b8521d305..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death05.ogg deleted file mode 100644 index b13f39f7214..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/death05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/dispell.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/dispell.ogg deleted file mode 100644 index bbdedf2a925..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/dispell.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode1.ogg deleted file mode 100644 index 9bbc1a15059..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode2.ogg deleted file mode 100644 index cd2fceafaa7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/explode2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot1.ogg deleted file mode 100644 index c56bf341a69..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot2.ogg deleted file mode 100644 index bca7174349c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot3.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot3.ogg deleted file mode 100644 index abe15dc70c5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot4.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot4.ogg deleted file mode 100644 index d024e476126..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/foot4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle01.ogg deleted file mode 100644 index 440aef02b91..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle02.ogg deleted file mode 100644 index 5b90d8c63e1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle03.ogg deleted file mode 100644 index 0643f53081c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle04.ogg deleted file mode 100644 index a849690a715..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle05.ogg deleted file mode 100644 index ad6b4576954..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle06.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle06.ogg deleted file mode 100644 index c367ecbc724..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle07.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle07.ogg deleted file mode 100644 index 9aa989a9907..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle08.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle08.ogg deleted file mode 100644 index 994a0b9cdf8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle08.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle09.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle09.ogg deleted file mode 100644 index 8ac8e6852ef..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/idle09.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough01.ogg deleted file mode 100644 index 1b0da58a063..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough02.ogg deleted file mode 100644 index ae120e5c87a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough03.ogg deleted file mode 100644 index 9d18ab9104e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough04.ogg deleted file mode 100644 index 0d3cc38625b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough05.ogg deleted file mode 100644 index 94de57d41a2..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_cough05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle01.ogg deleted file mode 100644 index dacee2189c6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle02.ogg deleted file mode 100644 index f657f3cc575..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle03.ogg deleted file mode 100644 index c6837db09f6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle04.ogg deleted file mode 100644 index 3bb3130e500..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle05.ogg deleted file mode 100644 index 71b0406758d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_coughidle05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle01.ogg deleted file mode 100644 index 0a542972824..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle02.ogg deleted file mode 100644 index 4dc466b3448..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle03.ogg deleted file mode 100644 index a31c12f1ca0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle04.ogg deleted file mode 100644 index c88a23d8eb8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle05.ogg deleted file mode 100644 index a6db379d883..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/laboured_idle05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end1.ogg deleted file mode 100644 index 7ebfd4cf9c1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end2.ogg deleted file mode 100644 index d3c4d3889e4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end3.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end3.ogg deleted file mode 100644 index 53905b2df63..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end4.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end4.ogg deleted file mode 100644 index 24e97d0eb93..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end5.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end5.ogg deleted file mode 100644 index c1f58c563a4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end6.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end6.ogg deleted file mode 100644 index ead8e2c3970..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_end6.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start1.ogg deleted file mode 100644 index 2b7447065ff..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start2.ogg deleted file mode 100644 index 67157d2ed44..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start3.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start3.ogg deleted file mode 100644 index 7e52e70edf6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start4.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start4.ogg deleted file mode 100644 index 58dee09b0b3..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start5.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start5.ogg deleted file mode 100644 index 74aa7947cc8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mindcontrol_start5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn01.ogg deleted file mode 100644 index a43cfa101a5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn02.ogg deleted file mode 100644 index f7c09c28556..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn03.ogg deleted file mode 100644 index da4ac910f5a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn04.ogg deleted file mode 100644 index b94e68c4778..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn05.ogg deleted file mode 100644 index 4f09a181e0a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/mourn05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain01.ogg deleted file mode 100644 index 926128dd78c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain02.ogg deleted file mode 100644 index ba2d0d52c1a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain03.ogg deleted file mode 100644 index e42e9c92092..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain04.ogg deleted file mode 100644 index 64131db57d1..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/pain04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/painedprotest01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/painedprotest01.ogg deleted file mode 100644 index ab464b94a31..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/painedprotest01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest02.ogg deleted file mode 100644 index 5293e8f96b5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest03.ogg deleted file mode 100644 index 07ad3c09b97..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/protest03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead01.ogg deleted file mode 100644 index 295c2147d27..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead02.ogg deleted file mode 100644 index 58460043905..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead03.ogg deleted file mode 100644 index e7cfbff9dbf..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead2.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead2.ogg deleted file mode 100644 index 1d8c4643a57..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cower_plead2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering01.ogg deleted file mode 100644 index edeb6bc0249..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering02.ogg deleted file mode 100644 index 630784f693a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering03.ogg deleted file mode 100644 index 15d9c335627..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering04.ogg deleted file mode 100644 index 997b27b0b13..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering05.ogg deleted file mode 100644 index f2bb5bd1b34..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_cowering05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat01.ogg deleted file mode 100644 index ab0aa941ef7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat02.ogg deleted file mode 100644 index d03bef30bc0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat03.ogg deleted file mode 100644 index d37c04a7644..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_retreat03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled01.ogg deleted file mode 100644 index 5755f4d3555..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled02.ogg deleted file mode 100644 index 306393d4eb8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled03.ogg deleted file mode 100644 index a0d32b67570..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled04.ogg deleted file mode 100644 index 666f5d302ba..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/scared_startled04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry01.ogg deleted file mode 100644 index 4828fd5f143..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry02.ogg deleted file mode 100644 index ab79035fdb0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_cry02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain01.ogg deleted file mode 100644 index c3d0280bc65..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain02.ogg deleted file mode 100644 index 06cc378f1c7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain03.ogg deleted file mode 100644 index 440d33b0beb..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain04.ogg deleted file mode 100644 index 8544bf06249..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_pain04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead01.ogg deleted file mode 100644 index 5b0cb558cef..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead02.ogg deleted file mode 100644 index bf6d3162b61..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead03.ogg deleted file mode 100644 index 90c997eb559..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/tortured_plead03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg deleted file mode 100644 index a9a99e78e04..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg deleted file mode 100644 index 9120fb49f8b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg deleted file mode 100644 index eec772163e4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg deleted file mode 100644 index 38d9488dabf..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg deleted file mode 100644 index a96471b71e9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg deleted file mode 100644 index 4c4a6cdda43..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue_sigh01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue_sigh01.ogg deleted file mode 100644 index 4215ea1f353..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_argue_sigh01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_call01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_call01.ogg deleted file mode 100644 index 011aceaea3b..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_call01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_concern.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_concern.ogg deleted file mode 100644 index b39272890a4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_concern.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused01.ogg deleted file mode 100644 index c0170a3f99e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused02.ogg deleted file mode 100644 index 0661b2a0c28..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_confused02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1.ogg deleted file mode 100644 index 2b129bfd0d5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1a.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1a.ogg deleted file mode 100644 index 563382b7f13..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_cough1a.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat01.ogg deleted file mode 100644 index 24a0eb7a68d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat02.ogg deleted file mode 100644 index 3d6b9c1e6d9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_goeat02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore01.ogg deleted file mode 100644 index 92642b24cc4..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore02.ogg deleted file mode 100644 index 5797b58ddd5..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_ignore02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_invite01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_invite01.ogg deleted file mode 100644 index eabdfb48ad7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_invite01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate01.ogg deleted file mode 100644 index d966ba1762a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate02.ogg deleted file mode 100644 index e8610ee8ffb..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/village_nodebate02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping01.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping01.ogg deleted file mode 100644 index c6d3ccd8947..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping01.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping02.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping02.ogg deleted file mode 100644 index 9bb9ea2ece9..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping02.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping03.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping03.ogg deleted file mode 100644 index 06162d76433..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping03.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping04.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping04.ogg deleted file mode 100644 index 4a008fcf01d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping04.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping05.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping05.ogg deleted file mode 100644 index f78cedd9ad8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping05.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping06.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping06.ogg deleted file mode 100644 index 3ca126b3ae0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping06.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping07.ogg b/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping07.ogg deleted file mode 100644 index ab16ec9e95a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/vortigaunt/weeping07.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert1.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert1.ogg deleted file mode 100644 index 8c2c8f6d661..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert2.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert2.ogg deleted file mode 100644 index 45d8cd03395..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert3.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert3.ogg deleted file mode 100644 index ed090785a88..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert4.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert4.ogg deleted file mode 100644 index cb9d3b0325d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert5.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert5.ogg deleted file mode 100644 index 9e0e075ad18..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert6.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/alert6.ogg deleted file mode 100644 index fedf0295fd7..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/alert6.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/claw_strike.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/claw_strike.ogg deleted file mode 100644 index 45a6c30be9e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/claw_strike.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv1.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv1.ogg deleted file mode 100644 index bfd79cf0417..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv10.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv10.ogg deleted file mode 100644 index 371ec262d4c..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv10.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv11.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv11.ogg deleted file mode 100644 index 8886436db81..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv11.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv12.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv12.ogg deleted file mode 100644 index ebf968da451..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv12.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv13.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv13.ogg deleted file mode 100644 index a2ea1768e6e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv13.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv14.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv14.ogg deleted file mode 100644 index ba56bb13e45..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv14.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv2.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv2.ogg deleted file mode 100644 index a76d88d463e..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv2.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv3.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv3.ogg deleted file mode 100644 index 3ad9188e6be..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv3.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv4.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv4.ogg deleted file mode 100644 index e833ae9d6f6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv4.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv5.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv5.ogg deleted file mode 100644 index 9de7a795ed0..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv5.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv6.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv6.ogg deleted file mode 100644 index 4a6b7aa0699..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv6.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv7.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv7.ogg deleted file mode 100644 index 33518e8baf6..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv7.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv8.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv8.ogg deleted file mode 100644 index 534d008bf24..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv8.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv9.ogg b/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv9.ogg deleted file mode 100644 index 87cd5cf70b8..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/mobs/zombies/hzv9.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/siren1.ogg b/modular_nova/modules/black_mesa/sound/siren1.ogg deleted file mode 100644 index 9247070968a..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/siren1.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/siren1_long.ogg b/modular_nova/modules/black_mesa/sound/siren1_long.ogg deleted file mode 100644 index 6e91ad1a444..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/siren1_long.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/tc_12_portalsuck.ogg b/modular_nova/modules/black_mesa/sound/tc_12_portalsuck.ogg deleted file mode 100644 index 2266af00e6d..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/tc_12_portalsuck.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/tc_13_teleport.ogg b/modular_nova/modules/black_mesa/sound/tc_13_teleport.ogg deleted file mode 100644 index 0e663e22ea2..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/tc_13_teleport.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/xen-credits.ogg b/modular_nova/modules/black_mesa/sound/xen-credits.ogg deleted file mode 100644 index 88486755362..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/xen-credits.ogg and /dev/null differ diff --git a/modular_nova/modules/black_mesa/sound/xen_door.ogg b/modular_nova/modules/black_mesa/sound/xen_door.ogg deleted file mode 100644 index 078af38d077..00000000000 Binary files a/modular_nova/modules/black_mesa/sound/xen_door.ogg and /dev/null differ diff --git a/modular_nova/modules/decay_subsystem/code/nests.dm b/modular_nova/modules/decay_subsystem/code/nests.dm index 24d9ca82f57..5dee7ea6b8e 100644 --- a/modular_nova/modules/decay_subsystem/code/nests.dm +++ b/modular_nova/modules/decay_subsystem/code/nests.dm @@ -15,7 +15,7 @@ faction = list(NEST_FACTION) var/spawn_delay = 0 /// What mob to spawn - var/list/monster_types = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab) + var/list/monster_types = list(/mob/living/basic/spider/giant/hunter) /// How many mobs can we spawn? var/max_mobs = 3 var/spawned_mobs = 0 diff --git a/modular_nova/modules/hev_suit/code/hev_suit.dm b/modular_nova/modules/hev_suit/code/hev_suit.dm deleted file mode 100644 index 71ff632a984..00000000000 --- a/modular_nova/modules/hev_suit/code/hev_suit.dm +++ /dev/null @@ -1,868 +0,0 @@ - -#define HEV_COLOR_GREEN "#00ff00" -#define HEV_COLOR_RED "#ff0000" -#define HEV_COLOR_BLUE "#00aeff" -#define HEV_COLOR_ORANGE "#f88f04" - -#define HEV_DAMAGE_POWER_USE_THRESHOLD 10 - -#define HEV_POWERUSE_AIRTANK 2 - -#define HEV_POWERUSE_HIT 100 -#define HEV_POWERUSE_HEAL 150 - -#define HEV_COOLDOWN_HEAL (10 SECONDS) -#define HEV_COOLDOWN_RADS (20 SECONDS) -#define HEV_COOLDOWN_ACID (20 SECONDS) -#define PCV_COOLDOWN_HEAL (15 SECONDS) -#define PCV_COOLDOWN_RADS (30 SECONDS) -#define PCV_COOLDOWN_ACID (30 SECONDS) - -#define HEV_HEAL_AMOUNT 10 -#define PCV_HEAL_AMOUNT 5 -#define HEV_BLOOD_REPLENISHMENT 20 -#define PCV_BLOOD_REPLENISHMENT 10 - -#define HEV_NOTIFICATION_TEXT_AND_VOICE "VOICE_AND_TEXT" -#define HEV_NOTIFICATION_TEXT "TEXT_ONLY" -#define HEV_NOTIFICATION_VOICE "VOICE_ONLY" -#define HEV_NOTIFICATION_OFF "OFF" -#define HEV_NOTIFICATIONS list(HEV_NOTIFICATION_TEXT_AND_VOICE, HEV_NOTIFICATION_TEXT, HEV_NOTIFICATION_VOICE, HEV_NOTIFICATION_OFF) - -/obj/item/clothing/head/helmet/space/hev_suit - name = "hazardous environment suit helmet" - desc = "The Mark IV HEV suit helmet." - icon = 'modular_nova/master_files/icons/obj/clothing/head/helmet.dmi' - worn_icon = 'modular_nova/master_files/icons/mob/clothing/head/helmet.dmi' - icon_state = "hev" - armor_type = /datum/armor/space_hev_suit - obj_flags = NO_MAT_REDEMPTION - resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE|ACID_PROOF|INDESTRUCTIBLE|FREEZE_PROOF - clothing_flags = STOPSPRESSUREDAMAGE|THICKMATERIAL|SNUG_FIT|LAVAPROTECT|BLOCK_GAS_SMOKE_EFFECT - clothing_traits = list(TRAIT_REAGENT_SCANNER) - visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR - visor_flags = STOPSPRESSUREDAMAGE - dog_fashion = null - slowdown = 0 - -/datum/armor/space_hev_suit - melee = 20 - bullet = 20 - laser = 20 - energy = 20 - bomb = 30 - bio = 40 - fire = 40 - acid = 40 - wound = 40 - consume = 10 - -/datum/armor/space_hev_suit/powered - melee = 50 - bullet = 50 - laser = 50 - energy = 50 - bomb = 90 - bio = 100 - fire = 100 - acid = 100 - wound = 100 - consume = 30 - -/obj/item/clothing/suit/space/hev_suit - name = "hazardous environment suit" - desc = "The Mark IV HEV suit protects the user from a number of hazardous environments and has in build ballistic protection." - icon = 'modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi' - worn_icon = 'modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi' - worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi' - icon_state = "hev" - inhand_icon_state = "syndicate-orange" - armor_type = /datum/armor/space_hev_suit - allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - cell = /obj/item/stock_parts/cell/hyper - slowdown = 0 //I am not gimping doctor freeman - actions_types = list(/datum/action/item_action/hev_toggle, /datum/action/item_action/hev_toggle_notifs, /datum/action/item_action/toggle_helmet, /datum/action/item_action/toggle_spacesuit) - resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE|ACID_PROOF|INDESTRUCTIBLE|FREEZE_PROOF - clothing_flags = STOPSPRESSUREDAMAGE|THICKMATERIAL|SNUG_FIT|LAVAPROTECT - - ///Whether or not the suit is activated/activating. - var/activated = FALSE - var/activating = FALSE - - ///Defines the current user (duh), current helmet, internals tank and built-in radio. - var/mob/living/carbon/current_user - var/obj/item/clothing/head/helmet/space/hev_suit/current_helmet - var/obj/item/tank/internals/current_internals_tank - var/obj/item/radio/internal_radio - - ///Used by the healing system. - var/user_old_bruteloss - var/user_old_fireloss - var/user_old_toxloss - var/user_old_oxyloss - - ///Lots of sound vars. - var/activation_song = 'modular_nova/modules/hev_suit/sound/hev/anomalous_materials.ogg' - - var/logon_sound = 'modular_nova/modules/hev_suit/sound/hev/01_hev_logon.ogg' - var/armor_sound = 'modular_nova/modules/hev_suit/sound/hev/02_powerarmor_on.ogg' - var/atmospherics_sound = 'modular_nova/modules/hev_suit/sound/hev/03_atmospherics_on.ogg' - var/vitalsigns_sound = 'modular_nova/modules/hev_suit/sound/hev/04_vitalsigns_on.ogg' - var/automedic_sound = 'modular_nova/modules/hev_suit/sound/hev/05_automedic_on.ogg' - var/weaponselect_sound = 'modular_nova/modules/hev_suit/sound/hev/06_weaponselect_on.ogg' - var/munitions_sound = 'modular_nova/modules/hev_suit/sound/hev/07_munitionview_on.ogg' - var/communications_sound = 'modular_nova/modules/hev_suit/sound/hev/08_communications_on.ogg' - var/safe_day_sound = 'modular_nova/modules/hev_suit/sound/hev/09_safe_day.ogg' - - var/batt_50_sound = 'modular_nova/modules/hev_suit/sound/hev/power_level_is_fifty.ogg' - var/batt_40_sound = 'modular_nova/modules/hev_suit/sound/hev/power_level_is_fourty.ogg' - var/batt_30_sound = 'modular_nova/modules/hev_suit/sound/hev/power_level_is_thirty.ogg' - var/batt_20_sound = 'modular_nova/modules/hev_suit/sound/hev/power_level_is_twenty.ogg' - var/batt_10_sound = 'modular_nova/modules/hev_suit/sound/hev/power_level_is_ten.ogg' - - var/near_death_sound = 'modular_nova/modules/hev_suit/sound/hev/near_death.ogg' - var/health_critical_sound = 'modular_nova/modules/hev_suit/sound/hev/health_critical.ogg' - var/health_dropping_sound = 'modular_nova/modules/hev_suit/sound/hev/health_dropping2.ogg' - - var/blood_loss_sound = 'modular_nova/modules/hev_suit/sound/hev/blood_loss.ogg' - var/blood_toxins_sound = 'modular_nova/modules/hev_suit/sound/hev/blood_toxins.ogg' - var/biohazard_sound = 'modular_nova/modules/hev_suit/sound/hev/biohazard_detected.ogg' - var/chemical_sound = 'modular_nova/modules/hev_suit/sound/hev/chemical_detected.ogg' - var/radiation_sound = 'modular_nova/modules/hev_suit/sound/hev/radiation_detected.ogg' - - var/minor_fracture_sound = 'modular_nova/modules/hev_suit/sound/hev/minor_fracture.ogg' - var/major_fracture_sound = 'modular_nova/modules/hev_suit/sound/hev/major_fracture.ogg' - var/minor_lacerations_sound = 'modular_nova/modules/hev_suit/sound/hev/minor_lacerations.ogg' - var/major_lacerations_sound = 'modular_nova/modules/hev_suit/sound/hev/major_lacerations.ogg' - - var/morphine_sound = 'modular_nova/modules/hev_suit/sound/hev/morphine_shot.ogg' - var/wound_sound = 'modular_nova/modules/hev_suit/sound/hev/wound_sterilized.ogg' - var/antitoxin_sound = 'modular_nova/modules/hev_suit/sound/hev/antitoxin_shot.ogg' - var/antidote_sound = 'modular_nova/modules/hev_suit/sound/hev/antidote_shot.ogg' - - var/radio_channel = RADIO_CHANNEL_COMMON - - var/timer_id = null - - ///Action cooldowns, duh. - var/healing_current_cooldown - var/acid_statement_cooldown - var/rad_statement_cooldown - - ///Static cooldowns for even more armor differentiation, duuh. - var/health_static_cooldown = HEV_COOLDOWN_HEAL - var/rads_static_cooldown = HEV_COOLDOWN_RADS - var/acid_static_cooldown = HEV_COOLDOWN_ACID - - ///Muh alarms - var/blood_loss_alarm = FALSE - var/toxins_alarm = FALSE - var/batt_50_alarm = FALSE - var/batt_40_alarm = FALSE - var/batt_30_alarm = FALSE - var/batt_20_alarm = FALSE - var/batt_10_alarm = FALSE - var/health_near_death_alarm = FALSE - var/health_critical_alarm = FALSE - var/health_dropping_alarm = FALSE - - ///Notification modes and current playing voicelines. - var/send_notifications = HEV_NOTIFICATION_TEXT_AND_VOICE - var/playing_voice_line - - ///Used only for differentiating of different (obviously) suits. - var/armor_unpowered = /datum/armor/space_hev_suit - var/armor_powered = /datum/armor/space_hev_suit/powered - var/heal_amount = HEV_HEAL_AMOUNT - var/blood_replenishment = HEV_BLOOD_REPLENISHMENT - var/suit_name = "HEV MARK IV" - - var/list/queued_voice_lines = list() - - /// On first activation, we play the user a nice song! - var/first_use = TRUE - -/obj/item/clothing/suit/space/hev_suit/Initialize(mapload) - . = ..() - internal_radio = new(src) - internal_radio.subspace_transmission = TRUE - internal_radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud. - internal_radio.recalculateChannels() - AddComponent(/datum/component/cell, cell_override = initial(cell), _has_cell_overlays = FALSE) - -/obj/item/clothing/suit/space/hev_suit/equipped(mob/user, slot) - . = ..() - current_user = user - -/obj/item/clothing/suit/space/hev_suit/dropped() - . = ..() - deactivate() - if(current_internals_tank) - current_internals_tank = null - current_helmet = null - current_user = null - -/obj/item/clothing/suit/space/hev_suit/Destroy() - QDEL_NULL(internal_radio) - if(current_internals_tank) - REMOVE_TRAIT(current_internals_tank, TRAIT_NODROP, "hev_trait") - current_internals_tank = null - current_helmet = null - deactivate() - current_user = null - return ..() - -/datum/action/item_action/hev_toggle - name = "Toggle HEV Suit" - button_icon = 'modular_nova/modules/hev_suit/icons/toggles.dmi' - background_icon_state = "bg_hl" - button_icon = 'modular_nova/modules/hev_suit/icons/toggles.dmi' - button_icon_state = "system_off" - -/datum/action/item_action/hev_toggle_notifs - name = "Toggle HEV Suit Notifications" - button_icon = 'modular_nova/modules/hev_suit/icons/toggles.dmi' - background_icon_state = "bg_hl" - button_icon = 'modular_nova/modules/hev_suit/icons/toggles.dmi' - button_icon_state = "sound_VOICE_AND_TEXT" - -/datum/action/item_action/hev_toggle_notifs/Trigger(trigger_flags) - var/obj/item/clothing/suit/space/hev_suit/my_suit = target - var/new_setting = tgui_input_list(my_suit.current_user, "Please select your notification settings.", "HEV Notification Settings", HEV_NOTIFICATIONS) - - if(!new_setting) - new_setting = HEV_NOTIFICATION_TEXT_AND_VOICE - - to_chat(my_suit.current_user, span_notice("[my_suit] notification mode is now [new_setting].")) - - my_suit.send_notifications = new_setting - - button_icon_state = "sound_[new_setting]" - - playsound(my_suit, 'modular_nova/modules/hev_suit/sound/hev/blip.ogg', 50) - - build_all_button_icons() - -/datum/action/item_action/hev_toggle/Trigger(trigger_flags) - var/obj/item/clothing/suit/space/hev_suit/my_suit = target - if(my_suit.activated) - my_suit.deactivate() - else - my_suit.activate() - - var/toggle = FALSE - - if(my_suit.activated || my_suit.activating) - toggle = TRUE - - button_icon_state = toggle ? "system_on" : "system_off" - - playsound(my_suit, 'modular_nova/modules/hev_suit/sound/hev/blip.ogg', 50) - - build_all_button_icons() - -/obj/item/clothing/suit/space/hev_suit/proc/send_message(message, color = HEV_COLOR_ORANGE) - if(send_notifications != HEV_NOTIFICATION_TEXT_AND_VOICE && send_notifications != HEV_NOTIFICATION_TEXT) - return - if(!current_user) - return - to_chat(current_user, "[suit_name]: [message]") - -/obj/item/clothing/suit/space/hev_suit/proc/send_hev_sound(sound_in, priority, volume = 50) - if(send_notifications != HEV_NOTIFICATION_TEXT_AND_VOICE && send_notifications != HEV_NOTIFICATION_VOICE) - return - - if(!activated) - return - - if(playing_voice_line) - if(priority) //Shit's fucked, we better say this ASAP - queued_voice_lines.Insert(1, sound_in) - else - queued_voice_lines += sound_in - return - - if(queued_voice_lines.len) - var/voice_line = queued_voice_lines[1] - var/sound/voice = sound(voice_line, wait = 1, channel = CHANNEL_HEV) - voice.status = SOUND_STREAM - playing_voice_line = TRUE - playsound(src, voice, volume) - queued_voice_lines -= voice_line - addtimer(CALLBACK(src, PROC_REF(reset_sound)), 4 SECONDS) - return - - playing_voice_line = TRUE - - var/sound/voice = sound(sound_in, wait = 1, channel = CHANNEL_HEV) - voice.status = SOUND_STREAM - playsound(src, voice, volume) - - addtimer(CALLBACK(src, PROC_REF(reset_sound)), 4 SECONDS) - -/obj/item/clothing/suit/space/hev_suit/proc/reset_sound() - playing_voice_line = FALSE - send_hev_sound() - -/obj/item/clothing/suit/space/hev_suit/proc/activate() - if(!current_user) - return FALSE - - if(activating || activated) - send_message("ERROR - SYSTEM [activating ? "ALREADY ACTIVATING" : "ALREADY ACTIVATED"]", HEV_COLOR_RED) - return FALSE - - var/power_test = item_use_power(10, TRUE) - if(!(power_test & COMPONENT_POWER_SUCCESS)) - var/failure_reason - switch(power_test) - if(COMPONENT_NO_CELL) - failure_reason = "NO CELL INSERTED" - if(COMPONENT_NO_CHARGE) - failure_reason = "NO CELL CHARGE" - else - failure_reason = "GENERIC FAILURE" - send_message("ERROR - POWER SYSTEMS FAILURE - [failure_reason]", HEV_COLOR_RED) - return FALSE - - var/obj/item/clothing/head/helmet/space/hev_suit/helmet = current_user.head - - if(!helmet || !istype(helmet)) - send_message("ERROR - SUIT HELMET NOT PRESENT", HEV_COLOR_RED) - return FALSE - - current_helmet = helmet - - ADD_TRAIT(current_helmet, TRAIT_NODROP, "hev_trait") - - send_message("ACTIVATING SYSTEMS") - activating = TRUE - - if(first_use) - var/sound/song = sound(activation_song, volume = 50) - SEND_SOUND(current_user, song) - first_use = FALSE - - playsound(src, logon_sound, 50) - - send_message("ESTABLISHING HELMET LINK...") - send_message("...ESTABLISHED", HEV_COLOR_GREEN) - - send_message("CALIBRATING FIT ADJUSTMENTS...") - send_message("...CALIBRATED", HEV_COLOR_GREEN) - - send_message("CALIBRATING REACTIVE ARMOR SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(powerarmor)), 10 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/use_hev_power(amount) - var/power_test = item_use_power(amount) - if(!(power_test & COMPONENT_POWER_SUCCESS)) - var/failure_reason - switch(power_test) - if(COMPONENT_NO_CELL) - failure_reason = "NO CELL INSERTED" - if(COMPONENT_NO_CHARGE) - failure_reason = "NO CELL CHARGE" - else - failure_reason = "GENERIC FAILURE" - send_message("ERROR - POWER SYSTEMS FAILURE - [failure_reason]", HEV_COLOR_RED) - deactivate() - return FALSE - announce_battery() - return TRUE - -/obj/item/clothing/suit/space/hev_suit/proc/announce_battery() - var/datum/component/cell/my_cell = GetComponent(/datum/component/cell) - var/current_battery_charge = my_cell.inserted_cell.percent() - - if(current_battery_charge <= 10 && !batt_10_alarm) - send_hev_sound(batt_10_sound) - batt_10_alarm = TRUE - return - else if(current_battery_charge > 10 && batt_10_alarm) - batt_10_alarm = FALSE - - if(current_battery_charge > 10 && current_battery_charge <= 20 && !batt_20_alarm) - send_hev_sound(batt_20_sound) - batt_20_alarm = TRUE - return - else if(current_battery_charge > 20 && batt_20_alarm) - batt_20_alarm = FALSE - - if(current_battery_charge > 20 && current_battery_charge <= 30 && !batt_30_alarm) - send_hev_sound(batt_30_sound) - batt_30_alarm = TRUE - return - else if(current_battery_charge > 30 && batt_30_alarm) - batt_30_alarm = FALSE - - if(current_battery_charge > 30 && current_battery_charge <= 40 && !batt_40_alarm) - send_hev_sound(batt_40_sound) - batt_40_alarm = TRUE - return - else if(current_battery_charge > 40 && batt_40_alarm) - batt_40_alarm = FALSE - - if(current_battery_charge > 40 && current_battery_charge <= 50 && !batt_50_alarm) - send_hev_sound(batt_50_sound) - batt_50_alarm = TRUE - return - else if(current_battery_charge > 50 && batt_50_alarm) - batt_50_alarm = FALSE - -/obj/item/clothing/suit/space/hev_suit/proc/powerarmor() - set_armor(armor_powered) - current_helmet.set_armor(armor_powered) - user_old_bruteloss = current_user.getBruteLoss() - user_old_fireloss = current_user.getFireLoss() - user_old_toxloss = current_user.getToxLoss() - user_old_oxyloss = current_user.getOxyLoss() - RegisterSignal(current_user, COMSIG_MOB_RUN_ARMOR, PROC_REF(process_hit)) - playsound(src, armor_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING ATMOSPHERIC CONTAMINANT SENSORS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(atmospherics)), 4 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/process_hit() - SIGNAL_HANDLER - var/new_bruteloss = current_user.getBruteLoss() - var/new_fireloss = current_user.getFireLoss() - var/new_toxloss = current_user.getToxLoss() - var/new_oxyloss = current_user.getOxyLoss() - var/use_power_this_hit = FALSE - if(current_user.getBruteLoss() > (new_bruteloss + HEV_DAMAGE_POWER_USE_THRESHOLD)) - use_power_this_hit = TRUE - if(current_user.getFireLoss() > (new_fireloss + HEV_DAMAGE_POWER_USE_THRESHOLD)) - use_power_this_hit = TRUE - if(current_user.getToxLoss() > (new_toxloss + HEV_DAMAGE_POWER_USE_THRESHOLD)) - use_power_this_hit = TRUE - user_old_bruteloss = new_bruteloss - user_old_fireloss = new_fireloss - user_old_toxloss = new_toxloss - user_old_oxyloss = new_oxyloss - state_health() - if(use_power_this_hit) - use_hev_power(HEV_POWERUSE_HIT) - -/obj/item/clothing/suit/space/hev_suit/proc/state_health() - var/health_percent = round((current_user.health / current_user.maxHealth) * 100, 1) - - if(health_percent <= 20 && !health_near_death_alarm) - send_hev_sound(near_death_sound, TRUE) - health_near_death_alarm = TRUE - return - else if(health_percent > 20 && health_near_death_alarm) - health_near_death_alarm = FALSE - - if(health_percent > 20 && health_percent <= 30 && !health_critical_alarm) - send_hev_sound(health_critical_sound, TRUE) - health_critical_alarm = TRUE - return - else if(health_percent > 30 && health_critical_alarm) - health_critical_alarm = FALSE - - if(health_percent > 30 && health_percent <= 80 && !health_dropping_alarm) - send_hev_sound(health_dropping_sound, TRUE) - health_dropping_alarm = TRUE - return - else if(health_percent > 80 && health_dropping_alarm) - health_dropping_alarm = FALSE - -/obj/item/clothing/suit/space/hev_suit/proc/atmospherics() - var/obj/item/tank/internals/tank = current_user.get_item_by_slot(ITEM_SLOT_SUITSTORE) - if(!tank || !istype(tank)) - send_message("...FAILURE, NO TANK DETECTED", HEV_COLOR_RED) - send_message("CALIBRATING VITALSIGN MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(vitalsigns)), 4 SECONDS, TIMER_STOPPABLE) - return - current_internals_tank = tank - ADD_TRAIT(current_internals_tank, TRAIT_NODROP, "hev_trait") - to_chat(current_user, span_notice("You hear a click as [current_internals_tank] is secured to your suit.")) - playsound(src, atmospherics_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING VITALSIGN MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(vitalsigns)), 4 SECONDS, TIMER_STOPPABLE) - - -/obj/item/clothing/suit/space/hev_suit/proc/handle_tank() - if(!current_internals_tank) - return - if(use_hev_power(HEV_POWERUSE_AIRTANK)) - current_internals_tank.populate_gas() - -/obj/item/clothing/suit/space/hev_suit/proc/vitalsigns() - RegisterSignal(current_user, COMSIG_MOB_STATCHANGE, PROC_REF(stat_changed)) - playsound(src, vitalsigns_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING AUTOMATIC MEDICAL SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(medical_systems)), 3 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/stat_changed(datum/source, new_stat) - SIGNAL_HANDLER - if(new_stat == DEAD) - playsound(src, 'modular_nova/modules/hev_suit/sound/hev/flatline.ogg', 40) - internal_radio.talk_into(src, "WARNING! USER [uppertext(current_user.real_name)] VITALSIGNS HAVE FLATLINED, CURRENT POSITION: [loc.x], [loc.y], [loc.z]!", radio_channel) - deactivate() - -/obj/item/clothing/suit/space/hev_suit/proc/medical_systems() - RegisterSignal(current_user, COMSIG_CARBON_GAIN_WOUND, PROC_REF(process_wound)) - RegisterSignal(current_user, COMSIG_ATOM_ACID_ACT, PROC_REF(process_acid)) - RegisterSignal(current_user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(process_radiation)) - START_PROCESSING(SSobj, src) - playsound(src, automedic_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING DEFENSIVE WEAPON SELECTION SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(weaponselect)), 3 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/process(seconds_per_tick) - if(!activated) - return - if(current_user.blood_volume < BLOOD_VOLUME_OKAY) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.blood_volume += blood_replenishment - if(!blood_loss_alarm) - send_hev_sound(blood_loss_sound) - blood_loss_alarm = TRUE - else if(blood_loss_alarm && current_user.blood_volume >= BLOOD_VOLUME_OKAY) - blood_loss_alarm = FALSE - - var/diseased = FALSE - - for(var/thing in current_user.diseases) - var/datum/disease/disease_to_kill = thing - disease_to_kill.cure() - diseased = TRUE - - if(diseased) - send_hev_sound(biohazard_sound) - send_message("DISEASE CURED", HEV_COLOR_BLUE) - - handle_tank() - - if(current_user.getToxLoss() > 30 && !toxins_alarm) - send_hev_sound(blood_toxins_sound) - toxins_alarm = TRUE - else if(toxins_alarm && current_user.getToxLoss() <= 30) - toxins_alarm = FALSE - - if(current_user.all_wounds) - var/datum/wound/wound2fix = current_user.all_wounds[1] - wound2fix.remove_wound() - send_message("WOUND TREATED", HEV_COLOR_BLUE) - - if(world.time <= healing_current_cooldown) - return - - var/new_bruteloss = current_user.getBruteLoss() - var/new_fireloss = current_user.getFireLoss() - var/new_toxloss = current_user.getToxLoss() - var/new_oxyloss = current_user.getOxyLoss() - var/new_stamloss = current_user.getStaminaLoss() - - if(new_stamloss) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.adjustStaminaLoss(-heal_amount) - healing_current_cooldown = world.time + health_static_cooldown * 2 - - if(new_oxyloss) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.adjustOxyLoss(-heal_amount) - healing_current_cooldown = world.time + health_static_cooldown - send_message("ADRENALINE ADMINISTERED", HEV_COLOR_BLUE) - send_hev_sound(morphine_sound) - return - - if(new_bruteloss) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.adjustBruteLoss(-heal_amount) - healing_current_cooldown = world.time + health_static_cooldown - send_message("BRUTE MEDICAL ATTENTION ADMINISTERED", HEV_COLOR_BLUE) - send_hev_sound(wound_sound) - return - - if(new_fireloss) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.adjustFireLoss(-heal_amount) - healing_current_cooldown = world.time + health_static_cooldown - send_message("BURN MEDICAL ATTENTION ADMINISTERED", HEV_COLOR_BLUE) - send_hev_sound(wound_sound) - return - - if(new_toxloss) - if(use_hev_power(HEV_POWERUSE_HEAL)) - current_user.adjustToxLoss(-heal_amount) - healing_current_cooldown = world.time + health_static_cooldown - send_message("TOXIN MEDICAL ATTENTION ADMINISTERED", HEV_COLOR_BLUE) - send_hev_sound(antitoxin_sound) - return - -/obj/item/clothing/suit/space/hev_suit/proc/process_wound(carbon, wound, bodypart) - SIGNAL_HANDLER - - if (!istype(wound, /datum/wound)) - return - - var/datum/wound/new_wound = wound - - var/sound_to_play - - var/datum/wound_pregen_data/pregen_data = new_wound.get_pregen_data() - var/wound_severity = new_wound.severity - - var/is_laceration = pregen_data.wounding_types_valid(list(WOUND_SLASH, WOUND_PIERCE)) - var/is_fracture = pregen_data.wounding_types_valid(list(WOUND_BLUNT)) - - if (is_laceration) - if (wound_severity >= WOUND_SEVERITY_SEVERE) - sound_to_play = major_lacerations_sound - else - sound_to_play = minor_lacerations_sound - else if (is_fracture) - if (wound_severity >= WOUND_SEVERITY_SEVERE) - sound_to_play = major_fracture_sound - else - sound_to_play = minor_fracture_sound - - if (sound_to_play) - send_hev_sound(sound_to_play) - -/obj/item/clothing/suit/space/hev_suit/proc/process_acid() - SIGNAL_HANDLER - if(world.time <= acid_statement_cooldown) - return - acid_statement_cooldown = world.time + acid_static_cooldown - send_hev_sound(chemical_sound) - -/obj/item/clothing/suit/space/hev_suit/proc/process_radiation() - SIGNAL_HANDLER - if(world.time <= rad_statement_cooldown) - return - rad_statement_cooldown = world.time + rads_static_cooldown - send_hev_sound(radiation_sound) - -/obj/item/clothing/suit/space/hev_suit/proc/weaponselect() - ADD_TRAIT(current_user, list(TRAIT_GUNFLIP,TRAIT_GUN_NATURAL), "hev_trait") - playsound(src, weaponselect_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING MUNITION LEVEL MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(munitions_monitoring)), 4 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/munitions_monitoring() - //Crickets, not sure what to make this do! - playsound(src, munitions_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - send_message("CALIBRATING COMMUNICATIONS SYSTEMS...") - timer_id = addtimer(CALLBACK(src, PROC_REF(comms_system)), 4 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/comms_system() - - playsound(src, communications_sound, 50) - send_message("...CALIBRATED", HEV_COLOR_GREEN) - timer_id = addtimer(CALLBACK(src, PROC_REF(finished)), 4 SECONDS, TIMER_STOPPABLE) - -/obj/item/clothing/suit/space/hev_suit/proc/finished() - to_chat(current_user, span_notice("You feel [src] seal around your body, locking it in place!")) - ADD_TRAIT(src, TRAIT_NODROP, "hev_trait") - send_message("ALL SYSTEMS ONLINE, WELCOME [uppertext(current_user.real_name)]", HEV_COLOR_GREEN) - playsound(src, safe_day_sound, 50) - activated = TRUE - activating = FALSE - -/obj/item/clothing/suit/space/hev_suit/proc/deactivate() - if(timer_id) - deltimer(timer_id) - STOP_PROCESSING(SSobj, src) - REMOVE_TRAIT(src, TRAIT_NODROP, "hev_trait") - set_armor(armor_unpowered) - if(current_helmet) - current_helmet.set_armor(armor_unpowered) - REMOVE_TRAIT(current_helmet, TRAIT_NODROP, "hev_trait") - if(current_internals_tank) - REMOVE_TRAIT(current_internals_tank, TRAIT_NODROP, "hev_trait") - if(current_user) - send_message("SYSTEMS DEACTIVATED", HEV_COLOR_RED) - REMOVE_TRAIT(current_user, list(TRAIT_GUNFLIP,TRAIT_GUN_NATURAL), "hev_trait") - UnregisterSignal(current_user, list( - COMSIG_ATOM_ACID_ACT, - COMSIG_CARBON_GAIN_WOUND, - COMSIG_IN_RANGE_OF_IRRADIATION, - COMSIG_MOB_RUN_ARMOR, - COMSIG_MOB_STATCHANGE - )) - activated = FALSE - activating = FALSE - -/obj/machinery/suit_storage_unit/hev - suit_type = /obj/item/clothing/suit/space/hev_suit - helmet_type = /obj/item/clothing/head/helmet/space/hev_suit - mask_type = /obj/item/clothing/mask/gas/alt - storage_type = /obj/item/tank/internals/oxygen - - -/obj/item/clothing/head/helmet/space/hev_suit/pcv - name = "powered combat helmet" - desc = "A deprecated combat helmet developed during the early 21th century in Sol-3, with protections rated level III-A. Contains attachment points for AN/PVS night vision goggles." - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_muzzled.dmi' - icon_state = "hecu_helm" - armor_type = /datum/armor/hev_suit_pcv - flags_inv = HIDEHAIR - obj_flags = NO_MAT_REDEMPTION - supports_variations_flags = NONE - resistance_flags = FIRE_PROOF|ACID_PROOF|FREEZE_PROOF - clothing_flags = SNUG_FIT - clothing_traits = null - flags_cover = HEADCOVERSEYES | PEPPERPROOF - flash_protect = null - visor_flags_inv = null - visor_flags = null - slowdown = 0 - uses_advanced_reskins = TRUE - unique_reskin = list( - "Basic" = list( - RESKIN_ICON_STATE = "hecu_helm", - RESKIN_WORN_ICON_STATE = "hecu_helm" - ), - "Corpsman" = list( - RESKIN_ICON_STATE = "hecu_helm_medic", - RESKIN_WORN_ICON_STATE = "hecu_helm_medic" - ), - "Basic Black" = list( - RESKIN_ICON_STATE = "hecu_helm_black", - RESKIN_WORN_ICON_STATE = "hecu_helm_black" - ), - "Corpsman Black" = list( - RESKIN_ICON_STATE = "hecu_helm_medic_black", - RESKIN_WORN_ICON_STATE = "hecu_helm_medic_black" - ), - ) - -/datum/armor/hev_suit_pcv - melee = 30 - bullet = 30 - laser = 30 - energy = 30 - bomb = 30 - bio = 30 - fire = 20 - acid = 20 - wound = 20 - consume = 10 - -/datum/armor/hev_suit_pcv/powered - melee = 40 - bullet = 40 - laser = 40 - energy = 40 - bomb = 60 - bio = 75 - fire = 50 - acid = 50 - wound = 50 - consume = 40 - -/obj/item/clothing/suit/space/hev_suit/pcv - name = "powered combat vest" - desc = "An electrically charged piece of body armor, the power stiffens the suit's fibers to provide a layer of resilient armor in response to trauma received from kinetic force. It's fitted with a geiger counter, tactical radio, a heads up display and a combat cocktail injector that allows the user to function normally even after serious injury. The concentration of mass in the lower rear side from the onboard computer makes your ass feel heavy." - icon = 'modular_nova/modules/awaymissions_nova/icons/hecucloth.dmi' - worn_icon = 'modular_nova/modules/awaymissions_nova/icons/hecumob.dmi' - worn_icon_digi = 'modular_nova/modules/awaymissions_nova/icons/hecumob_digi.dmi' - icon_state = "hecu_vest" - armor_type = /datum/armor/hev_suit_pcv - flags_inv = null - allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - cell = /obj/item/stock_parts/cell/super - actions_types = list(/datum/action/item_action/hev_toggle, /datum/action/item_action/hev_toggle_notifs) - resistance_flags = FIRE_PROOF|ACID_PROOF|FREEZE_PROOF - clothing_flags = SNUG_FIT - show_hud = FALSE - uses_advanced_reskins = TRUE - unique_reskin = list( - "Basic" = list( - RESKIN_ICON_STATE = "hecu_vest", - RESKIN_WORN_ICON_STATE = "hecu_vest" - ), - "Corpsman" = list( - RESKIN_ICON_STATE = "hecu_vest_medic", - RESKIN_WORN_ICON_STATE = "hecu_vest_medic" - ), - "Basic Black" = list( - RESKIN_ICON_STATE = "hecu_vest_black", - RESKIN_WORN_ICON_STATE = "hecu_vest_black" - ), - "Corpsman Black" = list( - RESKIN_ICON_STATE = "hecu_vest_medic_black", - RESKIN_WORN_ICON_STATE = "hecu_vest_medic_black" - ), - ) - - activation_song = null // removal of song only standard suit will have the song - - logon_sound = 'modular_nova/modules/hev_suit/sound/pcv/01_pcv_logon.ogg' - armor_sound = 'modular_nova/modules/hev_suit/sound/pcv/02_powerarmor_on.ogg' - atmospherics_sound = 'modular_nova/modules/hev_suit/sound/pcv/03_atmospherics_on.ogg' - vitalsigns_sound = 'modular_nova/modules/hev_suit/sound/pcv/04_vitalsigns_on.ogg' - automedic_sound = 'modular_nova/modules/hev_suit/sound/pcv/05_automedic_on.ogg' - weaponselect_sound = 'modular_nova/modules/hev_suit/sound/pcv/06_weaponselect_on.ogg' - munitions_sound = 'modular_nova/modules/hev_suit/sound/pcv/07_munitionview_on.ogg' - communications_sound = 'modular_nova/modules/hev_suit/sound/pcv/08_communications_on.ogg' - safe_day_sound = 'modular_nova/modules/hev_suit/sound/pcv/09_safe_day.ogg' - - batt_50_sound = 'modular_nova/modules/hev_suit/sound/pcv/power_level_is_fifty.ogg' - batt_40_sound = 'modular_nova/modules/hev_suit/sound/pcv/power_level_is_fourty.ogg' - batt_30_sound = 'modular_nova/modules/hev_suit/sound/pcv/power_level_is_thirty.ogg' - batt_20_sound = 'modular_nova/modules/hev_suit/sound/pcv/power_level_is_twenty.ogg' - batt_10_sound = 'modular_nova/modules/hev_suit/sound/pcv/power_level_is_ten.ogg' - - near_death_sound = 'modular_nova/modules/hev_suit/sound/pcv/near_death.ogg' - health_critical_sound = 'modular_nova/modules/hev_suit/sound/pcv/health_critical.ogg' - health_dropping_sound = 'modular_nova/modules/hev_suit/sound/pcv/health_dropping2.ogg' - - blood_loss_sound = 'modular_nova/modules/hev_suit/sound/pcv/blood_loss.ogg' - blood_toxins_sound = 'modular_nova/modules/hev_suit/sound/pcv/blood_toxins.ogg' - biohazard_sound = 'modular_nova/modules/hev_suit/sound/pcv/biohazard_detected.ogg' - chemical_sound = 'modular_nova/modules/hev_suit/sound/pcv/chemical_detected.ogg' - - minor_fracture_sound = 'modular_nova/modules/hev_suit/sound/pcv/minor_fracture.ogg' - major_fracture_sound = 'modular_nova/modules/hev_suit/sound/pcv/major_fracture.ogg' - minor_lacerations_sound = 'modular_nova/modules/hev_suit/sound/pcv/minor_lacerations.ogg' - major_lacerations_sound = 'modular_nova/modules/hev_suit/sound/pcv/major_lacerations.ogg' - - morphine_sound = 'modular_nova/modules/hev_suit/sound/pcv/morphine_shot.ogg' - wound_sound = 'modular_nova/modules/hev_suit/sound/pcv/wound_sterilized.ogg' - antitoxin_sound = 'modular_nova/modules/hev_suit/sound/pcv/antitoxin_shot.ogg' - antidote_sound = 'modular_nova/modules/hev_suit/sound/pcv/antidote_shot.ogg' - - armor_unpowered = /datum/armor/hev_suit_pcv - armor_powered = /datum/armor/hev_suit_pcv/powered - heal_amount = PCV_HEAL_AMOUNT - blood_replenishment = PCV_BLOOD_REPLENISHMENT - health_static_cooldown = PCV_COOLDOWN_HEAL - rads_static_cooldown = PCV_COOLDOWN_RADS - acid_static_cooldown = PCV_COOLDOWN_ACID - suit_name = "PCV MARK II" - -/obj/item/clothing/suit/space/hev_suit/pcv/AltClick(mob/living/user) - reskin_obj(user) - . = ..() - -#undef HEV_COLOR_GREEN -#undef HEV_COLOR_RED -#undef HEV_COLOR_BLUE -#undef HEV_COLOR_ORANGE -#undef HEV_DAMAGE_POWER_USE_THRESHOLD -#undef HEV_POWERUSE_AIRTANK -#undef HEV_POWERUSE_HIT -#undef HEV_POWERUSE_HEAL -#undef HEV_COOLDOWN_HEAL -#undef HEV_COOLDOWN_RADS -#undef HEV_COOLDOWN_ACID -#undef HEV_HEAL_AMOUNT -#undef PCV_HEAL_AMOUNT -#undef HEV_BLOOD_REPLENISHMENT -#undef HEV_NOTIFICATION_TEXT_AND_VOICE -#undef HEV_NOTIFICATION_TEXT -#undef HEV_NOTIFICATION_VOICE -#undef HEV_NOTIFICATION_OFF -#undef HEV_NOTIFICATIONS diff --git a/modular_nova/modules/hev_suit/icons/toggles.dmi b/modular_nova/modules/hev_suit/icons/toggles.dmi deleted file mode 100644 index 6ebfa4750df..00000000000 Binary files a/modular_nova/modules/hev_suit/icons/toggles.dmi and /dev/null differ diff --git a/modular_nova/modules/hev_suit/readme.md b/modular_nova/modules/hev_suit/readme.md deleted file mode 100644 index 8b2441d4a83..00000000000 --- a/modular_nova/modules/hev_suit/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -## Title: HEV Mark IV - -MODULE ID: hev - -### Description: - -Adds a fully functional HEV suit. - -### Credits: -Gandalf2k15 - All code -Sojourn/Eris - Helmet Sprites - Modified by Gandalf2k15 -Crowbar Collective - HEV sounds - Modified by Gandalf2k15 -Hippiestation - HEV sprites - Modified by Gandalf2k15 diff --git a/modular_nova/modules/hev_suit/sound/hev/01_hev_logon.ogg b/modular_nova/modules/hev_suit/sound/hev/01_hev_logon.ogg deleted file mode 100644 index 29811b063c5..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/01_hev_logon.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/02_powerarmor_on.ogg b/modular_nova/modules/hev_suit/sound/hev/02_powerarmor_on.ogg deleted file mode 100644 index ff32e1fe877..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/02_powerarmor_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/03_atmospherics_on.ogg b/modular_nova/modules/hev_suit/sound/hev/03_atmospherics_on.ogg deleted file mode 100644 index 2a69c4eaeb1..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/03_atmospherics_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/04_vitalsigns_on.ogg b/modular_nova/modules/hev_suit/sound/hev/04_vitalsigns_on.ogg deleted file mode 100644 index c82fdac8833..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/04_vitalsigns_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/05_automedic_on.ogg b/modular_nova/modules/hev_suit/sound/hev/05_automedic_on.ogg deleted file mode 100644 index 406dcfbc38b..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/05_automedic_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/06_weaponselect_on.ogg b/modular_nova/modules/hev_suit/sound/hev/06_weaponselect_on.ogg deleted file mode 100644 index 812540da7df..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/06_weaponselect_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/07_munitionview_on.ogg b/modular_nova/modules/hev_suit/sound/hev/07_munitionview_on.ogg deleted file mode 100644 index 82f24f4ebda..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/07_munitionview_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/08_communications_on.ogg b/modular_nova/modules/hev_suit/sound/hev/08_communications_on.ogg deleted file mode 100644 index 6010e86912e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/08_communications_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/09_safe_day.ogg b/modular_nova/modules/hev_suit/sound/hev/09_safe_day.ogg deleted file mode 100644 index 576cc709d14..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/09_safe_day.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/_comma.ogg b/modular_nova/modules/hev_suit/sound/hev/_comma.ogg deleted file mode 100644 index 186761f7f92..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/_comma.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/_period.ogg b/modular_nova/modules/hev_suit/sound/hev/_period.ogg deleted file mode 100644 index 45cb68b06ea..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/_period.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/acquired.ogg b/modular_nova/modules/hev_suit/sound/hev/acquired.ogg deleted file mode 100644 index 6bfe81bb72c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/acquired.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/activated.ogg b/modular_nova/modules/hev_suit/sound/hev/activated.ogg deleted file mode 100644 index bf8685fd3b5..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/activated.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/ammo_depleted.ogg b/modular_nova/modules/hev_suit/sound/hev/ammo_depleted.ogg deleted file mode 100644 index 7c2e4e9eaf3..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/ammo_depleted.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/ammowarning.ogg b/modular_nova/modules/hev_suit/sound/hev/ammowarning.ogg deleted file mode 100644 index fd362ba5413..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/ammowarning.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/anomalous_materials.ogg b/modular_nova/modules/hev_suit/sound/hev/anomalous_materials.ogg deleted file mode 100644 index faf11d45350..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/anomalous_materials.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/antidote_shot.ogg b/modular_nova/modules/hev_suit/sound/hev/antidote_shot.ogg deleted file mode 100644 index efc6ee6b4a1..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/antidote_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/antitoxin_shot.ogg b/modular_nova/modules/hev_suit/sound/hev/antitoxin_shot.ogg deleted file mode 100644 index 039c85a0d35..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/antitoxin_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/beep.ogg b/modular_nova/modules/hev_suit/sound/hev/beep.ogg deleted file mode 100644 index 7b4071d5c94..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/beep.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/bell.ogg b/modular_nova/modules/hev_suit/sound/hev/bell.ogg deleted file mode 100644 index 75ae310c516..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/bell.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/biohazard_detected.ogg b/modular_nova/modules/hev_suit/sound/hev/biohazard_detected.ogg deleted file mode 100644 index 7a5539ee6f6..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/biohazard_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/blip.ogg b/modular_nova/modules/hev_suit/sound/hev/blip.ogg deleted file mode 100644 index a117521c7c1..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/blip.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/blood_loss.ogg b/modular_nova/modules/hev_suit/sound/hev/blood_loss.ogg deleted file mode 100644 index 3bf73d34e34..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/blood_loss.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/blood_toxins.ogg b/modular_nova/modules/hev_suit/sound/hev/blood_toxins.ogg deleted file mode 100644 index 28e693010f1..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/blood_toxins.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/boop.ogg b/modular_nova/modules/hev_suit/sound/hev/boop.ogg deleted file mode 100644 index 53b595b1a5b..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/boop.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/chemical_detected.ogg b/modular_nova/modules/hev_suit/sound/hev/chemical_detected.ogg deleted file mode 100644 index 0a40c92b1ec..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/chemical_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/eighty.ogg b/modular_nova/modules/hev_suit/sound/hev/eighty.ogg deleted file mode 100644 index 7e6ee34a7c4..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/eighty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/fifteen.ogg b/modular_nova/modules/hev_suit/sound/hev/fifteen.ogg deleted file mode 100644 index 55a9da00ec0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/fifteen.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/fifty.ogg b/modular_nova/modules/hev_suit/sound/hev/fifty.ogg deleted file mode 100644 index 34f4204cb73..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/fifty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/five.ogg b/modular_nova/modules/hev_suit/sound/hev/five.ogg deleted file mode 100644 index 2ce50cae931..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/five.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/flatline.ogg b/modular_nova/modules/hev_suit/sound/hev/flatline.ogg deleted file mode 100644 index 9cf3fe0dd17..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/flatline.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/fourty.ogg b/modular_nova/modules/hev_suit/sound/hev/fourty.ogg deleted file mode 100644 index f95b48b95fc..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/fourty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/fuzz.ogg b/modular_nova/modules/hev_suit/sound/hev/fuzz.ogg deleted file mode 100644 index 25a33829830..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/fuzz.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/health_critical.ogg b/modular_nova/modules/hev_suit/sound/hev/health_critical.ogg deleted file mode 100644 index 083d2479df8..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/health_critical.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/health_dropping2.ogg b/modular_nova/modules/hev_suit/sound/hev/health_dropping2.ogg deleted file mode 100644 index 823554d7b40..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/health_dropping2.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/hiss.ogg b/modular_nova/modules/hev_suit/sound/hev/hiss.ogg deleted file mode 100644 index e886a7473a4..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/hiss.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/major_fracture.ogg b/modular_nova/modules/hev_suit/sound/hev/major_fracture.ogg deleted file mode 100644 index d708ab71930..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/major_fracture.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/major_lacerations.ogg b/modular_nova/modules/hev_suit/sound/hev/major_lacerations.ogg deleted file mode 100644 index c24c1f51d44..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/major_lacerations.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/minor_fracture.ogg b/modular_nova/modules/hev_suit/sound/hev/minor_fracture.ogg deleted file mode 100644 index 30a973d832e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/minor_fracture.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/minor_lacerations.ogg b/modular_nova/modules/hev_suit/sound/hev/minor_lacerations.ogg deleted file mode 100644 index d3e61a8c7d4..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/minor_lacerations.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/morphine_shot.ogg b/modular_nova/modules/hev_suit/sound/hev/morphine_shot.ogg deleted file mode 100644 index 74eaeeaa3d7..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/morphine_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/near_death.ogg b/modular_nova/modules/hev_suit/sound/hev/near_death.ogg deleted file mode 100644 index d57088a50ce..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/near_death.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/ninety.ogg b/modular_nova/modules/hev_suit/sound/hev/ninety.ogg deleted file mode 100644 index 52b37d9ae9a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/ninety.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/onehundred.ogg b/modular_nova/modules/hev_suit/sound/hev/onehundred.ogg deleted file mode 100644 index 3ab37eae580..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/onehundred.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/percent.ogg b/modular_nova/modules/hev_suit/sound/hev/percent.ogg deleted file mode 100644 index 8d4aeacc975..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/percent.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is.ogg deleted file mode 100644 index 120d2ace75c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is_fifty.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is_fifty.ogg deleted file mode 100644 index 922b41d6de7..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is_fifty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is_fourty.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is_fourty.ogg deleted file mode 100644 index 6126f424d6e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is_fourty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is_ten.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is_ten.ogg deleted file mode 100644 index 74824f27956..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is_ten.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is_thirty.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is_thirty.ogg deleted file mode 100644 index 7b876b3cd0c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is_thirty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_level_is_twenty.ogg b/modular_nova/modules/hev_suit/sound/hev/power_level_is_twenty.ogg deleted file mode 100644 index d964a0bda2c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_level_is_twenty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/power_restored.ogg b/modular_nova/modules/hev_suit/sound/hev/power_restored.ogg deleted file mode 100644 index ffd62d8dba7..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/power_restored.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/radiation_detected.ogg b/modular_nova/modules/hev_suit/sound/hev/radiation_detected.ogg deleted file mode 100644 index 27cc448b63a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/radiation_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/seek_medic.ogg b/modular_nova/modules/hev_suit/sound/hev/seek_medic.ogg deleted file mode 100644 index d8a3fd9cb0c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/seek_medic.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/seventy.ogg b/modular_nova/modules/hev_suit/sound/hev/seventy.ogg deleted file mode 100644 index 7eba3520899..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/seventy.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/sixty.ogg b/modular_nova/modules/hev_suit/sound/hev/sixty.ogg deleted file mode 100644 index 3009ba2b635..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/sixty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/ten.ogg b/modular_nova/modules/hev_suit/sound/hev/ten.ogg deleted file mode 100644 index 5ff90ae4701..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/ten.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/thirty.ogg b/modular_nova/modules/hev_suit/sound/hev/thirty.ogg deleted file mode 100644 index 9edf2ca933e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/thirty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/twenty.ogg b/modular_nova/modules/hev_suit/sound/hev/twenty.ogg deleted file mode 100644 index 7913d0340d0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/twenty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/warning.ogg b/modular_nova/modules/hev_suit/sound/hev/warning.ogg deleted file mode 100644 index b41e12b585e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/warning.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/hev/wound_sterilized.ogg b/modular_nova/modules/hev_suit/sound/hev/wound_sterilized.ogg deleted file mode 100644 index b548a4a9b22..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/hev/wound_sterilized.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/01_pcv_logon.ogg b/modular_nova/modules/hev_suit/sound/pcv/01_pcv_logon.ogg deleted file mode 100644 index 0bb54386b25..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/01_pcv_logon.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/02_powerarmor_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/02_powerarmor_on.ogg deleted file mode 100644 index 6c320332460..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/02_powerarmor_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/03_atmospherics_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/03_atmospherics_on.ogg deleted file mode 100644 index 919351f036e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/03_atmospherics_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/04_vitalsigns_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/04_vitalsigns_on.ogg deleted file mode 100644 index 3321d799d0a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/04_vitalsigns_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/05_automedic_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/05_automedic_on.ogg deleted file mode 100644 index 40f17bf5b4c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/05_automedic_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/06_weaponselect_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/06_weaponselect_on.ogg deleted file mode 100644 index 85d32c69216..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/06_weaponselect_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/07_munitionview_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/07_munitionview_on.ogg deleted file mode 100644 index 91c421f5741..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/07_munitionview_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/08_communications_on.ogg b/modular_nova/modules/hev_suit/sound/pcv/08_communications_on.ogg deleted file mode 100644 index d74b9a8a815..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/08_communications_on.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/09_safe_day.ogg b/modular_nova/modules/hev_suit/sound/pcv/09_safe_day.ogg deleted file mode 100644 index e2d46244745..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/09_safe_day.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/_comma.ogg b/modular_nova/modules/hev_suit/sound/pcv/_comma.ogg deleted file mode 100644 index 31a47dca600..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/_comma.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/_period.ogg b/modular_nova/modules/hev_suit/sound/pcv/_period.ogg deleted file mode 100644 index 7eeb1eb9bc5..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/_period.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/acquired.ogg b/modular_nova/modules/hev_suit/sound/pcv/acquired.ogg deleted file mode 100644 index 3df8f9af068..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/acquired.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/activated.ogg b/modular_nova/modules/hev_suit/sound/pcv/activated.ogg deleted file mode 100644 index eb4f455ed3c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/activated.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/ammo_depleted.ogg b/modular_nova/modules/hev_suit/sound/pcv/ammo_depleted.ogg deleted file mode 100644 index 4bc2784b787..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/ammo_depleted.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/antidote_shot.ogg b/modular_nova/modules/hev_suit/sound/pcv/antidote_shot.ogg deleted file mode 100644 index 06cad7dc12b..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/antidote_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/antitoxin_shot.ogg b/modular_nova/modules/hev_suit/sound/pcv/antitoxin_shot.ogg deleted file mode 100644 index 74a0b280f8b..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/antitoxin_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/beep.ogg b/modular_nova/modules/hev_suit/sound/pcv/beep.ogg deleted file mode 100644 index c79cbd9fba5..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/beep.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/bell.ogg b/modular_nova/modules/hev_suit/sound/pcv/bell.ogg deleted file mode 100644 index 2fc03654bad..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/bell.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/biohazard_detected.ogg b/modular_nova/modules/hev_suit/sound/pcv/biohazard_detected.ogg deleted file mode 100644 index b3f36f5c6e8..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/biohazard_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/blip.ogg b/modular_nova/modules/hev_suit/sound/pcv/blip.ogg deleted file mode 100644 index 51734dd8c11..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/blip.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/blood_loss.ogg b/modular_nova/modules/hev_suit/sound/pcv/blood_loss.ogg deleted file mode 100644 index 1b9456d27ce..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/blood_loss.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/blood_plasma.ogg b/modular_nova/modules/hev_suit/sound/pcv/blood_plasma.ogg deleted file mode 100644 index 58490cb92fe..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/blood_plasma.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/blood_toxins.ogg b/modular_nova/modules/hev_suit/sound/pcv/blood_toxins.ogg deleted file mode 100644 index e34257325a0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/blood_toxins.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/boop.ogg b/modular_nova/modules/hev_suit/sound/pcv/boop.ogg deleted file mode 100644 index c6f30365da0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/boop.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/chemical_detected.ogg b/modular_nova/modules/hev_suit/sound/pcv/chemical_detected.ogg deleted file mode 100644 index 1a17842f89d..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/chemical_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/eighty.ogg b/modular_nova/modules/hev_suit/sound/pcv/eighty.ogg deleted file mode 100644 index ed52d73f55e..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/eighty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/fifteen.ogg b/modular_nova/modules/hev_suit/sound/pcv/fifteen.ogg deleted file mode 100644 index 83834aad06a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/fifteen.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/fifty.ogg b/modular_nova/modules/hev_suit/sound/pcv/fifty.ogg deleted file mode 100644 index 8444d3f41d8..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/fifty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/five.ogg b/modular_nova/modules/hev_suit/sound/pcv/five.ogg deleted file mode 100644 index 788f0fdd06a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/five.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/flatline.ogg b/modular_nova/modules/hev_suit/sound/pcv/flatline.ogg deleted file mode 100644 index 24a2499c896..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/flatline.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/fourty.ogg b/modular_nova/modules/hev_suit/sound/pcv/fourty.ogg deleted file mode 100644 index a9d46b92539..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/fourty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/fuzz.ogg b/modular_nova/modules/hev_suit/sound/pcv/fuzz.ogg deleted file mode 100644 index b198faa594c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/fuzz.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/health_critical.ogg b/modular_nova/modules/hev_suit/sound/pcv/health_critical.ogg deleted file mode 100644 index 06f5d2539fe..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/health_critical.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/health_dropping2.ogg b/modular_nova/modules/hev_suit/sound/pcv/health_dropping2.ogg deleted file mode 100644 index 24dbdb3d676..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/health_dropping2.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/hiss.ogg b/modular_nova/modules/hev_suit/sound/pcv/hiss.ogg deleted file mode 100644 index e124120802c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/hiss.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/major_fracture.ogg b/modular_nova/modules/hev_suit/sound/pcv/major_fracture.ogg deleted file mode 100644 index e11f28e7ef7..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/major_fracture.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/major_lacerations.ogg b/modular_nova/modules/hev_suit/sound/pcv/major_lacerations.ogg deleted file mode 100644 index 2b4b3acb464..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/major_lacerations.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/minor_fracture.ogg b/modular_nova/modules/hev_suit/sound/pcv/minor_fracture.ogg deleted file mode 100644 index 22407398b56..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/minor_fracture.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/minor_lacerations.ogg b/modular_nova/modules/hev_suit/sound/pcv/minor_lacerations.ogg deleted file mode 100644 index 6196d7293b1..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/minor_lacerations.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/morphine_shot.ogg b/modular_nova/modules/hev_suit/sound/pcv/morphine_shot.ogg deleted file mode 100644 index dda168d3c19..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/morphine_shot.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/near_death.ogg b/modular_nova/modules/hev_suit/sound/pcv/near_death.ogg deleted file mode 100644 index e1c064af70d..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/near_death.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/ninety.ogg b/modular_nova/modules/hev_suit/sound/pcv/ninety.ogg deleted file mode 100644 index 2c44c5c84eb..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/ninety.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/onehundred.ogg b/modular_nova/modules/hev_suit/sound/pcv/onehundred.ogg deleted file mode 100644 index 0a8b915746a..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/onehundred.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/pain_block.ogg b/modular_nova/modules/hev_suit/sound/pcv/pain_block.ogg deleted file mode 100644 index 7e078eb78d0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/pain_block.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/percent.ogg b/modular_nova/modules/hev_suit/sound/pcv/percent.ogg deleted file mode 100644 index fdc98010acc..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/percent.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is.ogg deleted file mode 100644 index fcc389596eb..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fifty.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fifty.ogg deleted file mode 100644 index 365ca460cc8..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fifty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fourty.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fourty.ogg deleted file mode 100644 index d192f31db55..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_fourty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_ten.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is_ten.ogg deleted file mode 100644 index 74b07e92c0d..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_ten.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_thirty.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is_thirty.ogg deleted file mode 100644 index 0ed878ff8af..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_thirty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_twenty.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_level_is_twenty.ogg deleted file mode 100644 index 6281211e095..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_level_is_twenty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/power_restored.ogg b/modular_nova/modules/hev_suit/sound/pcv/power_restored.ogg deleted file mode 100644 index e214f05c95f..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/power_restored.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/radiation_detected.ogg b/modular_nova/modules/hev_suit/sound/pcv/radiation_detected.ogg deleted file mode 100644 index 686ba1a32f7..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/radiation_detected.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/seek_medic.ogg b/modular_nova/modules/hev_suit/sound/pcv/seek_medic.ogg deleted file mode 100644 index 3fee2a9e27b..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/seek_medic.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/seventy.ogg b/modular_nova/modules/hev_suit/sound/pcv/seventy.ogg deleted file mode 100644 index 5bb06c79486..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/seventy.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/sixty.ogg b/modular_nova/modules/hev_suit/sound/pcv/sixty.ogg deleted file mode 100644 index 0ebd28e3696..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/sixty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/ten.ogg b/modular_nova/modules/hev_suit/sound/pcv/ten.ogg deleted file mode 100644 index f8fba21e022..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/ten.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/thirty.ogg b/modular_nova/modules/hev_suit/sound/pcv/thirty.ogg deleted file mode 100644 index f4a6ec6ef33..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/thirty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/torniquette_applied.ogg b/modular_nova/modules/hev_suit/sound/pcv/torniquette_applied.ogg deleted file mode 100644 index 23e2618fcb6..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/torniquette_applied.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/twenty.ogg b/modular_nova/modules/hev_suit/sound/pcv/twenty.ogg deleted file mode 100644 index 43a0e51077f..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/twenty.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/warning.ogg b/modular_nova/modules/hev_suit/sound/pcv/warning.ogg deleted file mode 100644 index 6469f8a4de0..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/warning.ogg and /dev/null differ diff --git a/modular_nova/modules/hev_suit/sound/pcv/wound_sterilized.ogg b/modular_nova/modules/hev_suit/sound/pcv/wound_sterilized.ogg deleted file mode 100644 index 520aaee252c..00000000000 Binary files a/modular_nova/modules/hev_suit/sound/pcv/wound_sterilized.ogg and /dev/null differ diff --git a/modular_nova/modules/loadouts/loadout_items/pizzabox.dm b/modular_nova/modules/loadouts/loadout_items/pizzabox.dm new file mode 100644 index 00000000000..fe2c6c20903 --- /dev/null +++ b/modular_nova/modules/loadouts/loadout_items/pizzabox.dm @@ -0,0 +1,35 @@ +/// Handpicked list of various pizzas and "pizzas" to make sure it's both 'safe' (human-edible) and doesn't spawn the base type like the bomb pizza can. +#define EDIBLE_PIZZA_LIST list( \ + /obj/item/food/pizza/margherita, \ + /obj/item/food/pizza/meat, \ + /obj/item/food/pizza/mushroom, \ + /obj/item/food/pizza/vegetable, \ + /obj/item/food/pizza/donkpocket, \ + /obj/item/food/pizza/dank, \ + /obj/item/food/pizza/sassysage, \ + /obj/item/food/pizza/pineapple, \ + /obj/item/food/pizza/mothic_margherita, \ + /obj/item/food/pizza/mothic_firecracker, \ + /obj/item/food/pizza/mothic_five_cheese, \ + /obj/item/food/pizza/mothic_white_pie, \ + /obj/item/food/pizza/mothic_pesto, \ + /obj/item/food/pizza/mothic_garlic, \ + /obj/item/food/pizza/flatbread/rustic, \ + /obj/item/food/pizza/flatbread/italic, \ + /obj/item/food/pizza/flatbread/zmorgast, \ + /obj/item/food/pizza/flatbread/fish, \ + /obj/item/food/pizza/flatbread/mushroom, \ + /obj/item/food/pizza/flatbread/nutty, \ +) + +/obj/item/pizzabox/random + boxtag = "Randy's Surprise" + boxtag_set = TRUE + +/obj/item/pizzabox/random/Initialize(mapload) + . = ..() + if(!pizza) + var/random_pizza = pick(EDIBLE_PIZZA_LIST) + pizza = new random_pizza(src) + +#undef EDIBLE_PIZZA_LIST diff --git a/modular_nova/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_nova/modules/novaya_ert/code/advanced_choice_beacon.dm index 3e35700096d..57925d8edde 100644 --- a/modular_nova/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_nova/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -206,12 +206,12 @@ new /obj/item/ammo_box/magazine/mmg_box(src) new /obj/item/ammo_box/magazine/mmg_box(src) new /obj/item/ammo_box/magazine/mmg_box(src) - new /obj/item/minespawner/explosive(src) - new /obj/item/minespawner/explosive(src) - new /obj/item/minespawner/explosive(src) - new /obj/item/minespawner/explosive(src) - new /obj/item/minespawner/explosive(src) - new /obj/item/minespawner/explosive(src) + new /obj/item/minespawner/ancient_milsim(src) + new /obj/item/minespawner/ancient_milsim(src) + new /obj/item/minespawner/ancient_milsim(src) + new /obj/item/minespawner/ancient_milsim(src) + new /obj/item/minespawner/ancient_milsim(src) + new /obj/item/minespawner/ancient_milsim(src) new /obj/item/grenade/frag(src) new /obj/item/grenade/frag(src) new /obj/item/grenade/frag(src) diff --git a/modular_nova/modules/novaya_ert/code/head.dm b/modular_nova/modules/novaya_ert/code/head.dm index 4eeb355f55b..2e6a605a30c 100644 --- a/modular_nova/modules/novaya_ert/code/head.dm +++ b/modular_nova/modules/novaya_ert/code/head.dm @@ -12,39 +12,3 @@ fire = 20 acid = 50 wound = 20 - -/obj/item/clothing/head/helmet/space/hev_suit/nri - name = "\improper VOSKHOD powered combat armor helmet" - desc = "A composite graphene-plasteel helmet with a ballistic nylon inner padding, complete with a deployable airtight polycarbonate visor and respirator system. 'НРИ - Оборонная Коллегия' is imprinted on the back." - icon = 'modular_nova/master_files/icons/obj/clothing/head/helmet.dmi' - worn_icon = 'modular_nova/master_files/icons/mob/clothing/head/helmet.dmi' - worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/head_muzzled.dmi' - worn_icon_teshari = 'modular_nova/master_files/icons/mob/clothing/species/teshari/head.dmi' - icon_state = "nri_soldier" - armor_type = /datum/armor/hev_suit_nri - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - obj_flags = null - supports_variations_flags = CLOTHING_SNOUTED_VARIATION - resistance_flags = FIRE_PROOF|UNACIDABLE|ACID_PROOF|FREEZE_PROOF - clothing_flags = STOPSPRESSUREDAMAGE|SNUG_FIT|BLOCK_GAS_SMOKE_EFFECT - clothing_traits = null - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF - flash_protect = FLASH_PROTECTION_WELDER - visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR - visor_flags = STOPSPRESSUREDAMAGE - slowdown = 0 - -/obj/item/clothing/head/helmet/space/hev_suit/nri/captain - name = "\improper VOSKHOD-2 powered combat armor helmet" - desc = "A black composite polyurea coated graphene-plastitanium helmet with durathread inner padding, complete with a deployable airtight tinted plasmaglass visor and a kevlar-lined respirator system. 'НРИ - Оборонная Коллегия' is imprinted on the back." - icon_state = "nri_captain" - -/obj/item/clothing/head/helmet/space/hev_suit/nri/medic - name = "\improper VOSKHOD-KH powered combat armor helmet" - desc = "A combat medic's composite graphene-titanium helmet with bio-resistant padding, complete with a deployable airtight polycarbonate visor and optimized respirator system. 'НРИ - Оборонная Коллегия' is imprinted on the back." - icon_state = "nri_medic" - -/obj/item/clothing/head/helmet/space/hev_suit/nri/engineer - name = "\improper VOSKHOD-IN powered combat armor helmet" - desc = "A composite tungsten-plasteel helmet with a lead-lined ballistic nylon inner padding, complete with a deployable airtight polycarbonate visor and respirator system. 'НРИ - Оборонная Коллегия' is imprinted on the back." - icon_state = "nri_engineer" diff --git a/modular_nova/modules/novaya_ert/code/mod_suit.dm b/modular_nova/modules/novaya_ert/code/mod_suit.dm index 5bfd94429b8..850f63b74d8 100644 --- a/modular_nova/modules/novaya_ert/code/mod_suit.dm +++ b/modular_nova/modules/novaya_ert/code/mod_suit.dm @@ -250,7 +250,7 @@ var/new_fireloss = mod.wearer.getFireLoss() var/new_toxloss = mod.wearer.getToxLoss() var/new_stamloss = mod.wearer.getStaminaLoss() - playsound(mod.wearer, 'modular_nova/modules/hev_suit/sound/hev/hiss.ogg', 100) + playsound(mod.wearer, 'sound/machines/steam_hiss.ogg', 40) if(new_bruteloss) mod.wearer.reagents.add_reagent(/datum/reagent/medicine/mine_salve, 10) diff --git a/modular_nova/modules/novaya_ert/code/suit.dm b/modular_nova/modules/novaya_ert/code/suit.dm deleted file mode 100644 index 65fd31155c3..00000000000 --- a/modular_nova/modules/novaya_ert/code/suit.dm +++ /dev/null @@ -1,95 +0,0 @@ -#define NRI_POWERUSE_HIT 100 -#define NRI_POWERUSE_HEAL 150 - -#define NRI_COOLDOWN_HEAL (10 SECONDS) -#define NRI_COOLDOWN_RADS (20 SECONDS) -#define NRI_COOLDOWN_ACID (20 SECONDS) - -#define NRI_HEAL_AMOUNT 10 -#define NRI_BLOOD_REPLENISHMENT 20 - -/obj/item/clothing/suit/space/hev_suit/nri - name = "\improper VOSKHOD powered combat armor" - desc = "A hybrid set of space-resistant armor built on a modified mass-produced Nomex-Aerogel flight suit, polyurea coated durathread-lined light plasteel plates hinder mobility as little as possible while the onboard life support system aids the user in combat. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels." - icon = 'modular_nova/master_files/icons/obj/clothing/suits/spacesuit.dmi' - worn_icon = 'modular_nova/master_files/icons/mob/clothing/suits/spacesuit.dmi' - worn_icon_digi = 'modular_nova/master_files/icons/mob/clothing/suits/spacesuit_digi.dmi' - worn_icon_teshari = 'modular_nova/master_files/icons/mob/clothing/species/teshari/suit.dmi' - icon_state = "nri_soldier" - armor_type = /datum/armor/hev_suit_nri - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDESEXTOY|HIDETAIL - allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank/internals) - cell = /obj/item/stock_parts/cell/bluespace - actions_types = list(/datum/action/item_action/hev_toggle/nri, /datum/action/item_action/hev_toggle_notifs/nri, /datum/action/item_action/toggle_spacesuit) - resistance_flags = FIRE_PROOF|UNACIDABLE|ACID_PROOF|FREEZE_PROOF - clothing_flags = STOPSPRESSUREDAMAGE|SNUG_FIT - clothing_traits = list(TRAIT_SHOVE_KNOCKDOWN_BLOCKED) - - activation_song = null //No nice song. - - radio_channel = RADIO_CHANNEL_CENTCOM - - armor_unpowered = /datum/armor/hev_suit_nri - armor_powered = /datum/armor/hev_suit_nri/powered - heal_amount = NRI_HEAL_AMOUNT - blood_replenishment = NRI_BLOOD_REPLENISHMENT - health_static_cooldown = NRI_COOLDOWN_HEAL - rads_static_cooldown = NRI_COOLDOWN_RADS - acid_static_cooldown = NRI_COOLDOWN_ACID - suit_name = "VOSKHOD" - first_use = FALSE //No nice song. - - - -/datum/armor/hev_suit_nri - melee = 25 - bullet = 25 - laser = 25 - energy = 25 - bomb = 25 - bio = 25 - fire = 30 - acid = 30 - wound = 30 - consume = 10 - -/datum/armor/hev_suit_nri/powered - melee = 40 - bullet = 50 - laser = 30 - energy = 40 - bomb = 60 - bio = 75 - fire = 50 - acid = 50 - wound = 50 - consume = 40 - -/datum/action/item_action/hev_toggle/nri - name = "Toggle VOSKHOD Suit" - button_icon = 'modular_nova/modules/novaya_ert/icons/toggles.dmi' - background_icon_state = "bg_nri" - button_icon = 'modular_nova/modules/novaya_ert/icons/toggles.dmi' - button_icon_state = "toggle" - -/datum/action/item_action/hev_toggle_notifs/nri - name = "Toggle VOSKHOD Suit Notifications" - button_icon = 'modular_nova/modules/novaya_ert/icons/toggles.dmi' - background_icon_state = "bg_nri" - button_icon = 'modular_nova/modules/novaya_ert/icons/toggles.dmi' - button_icon_state = "sound" - -/obj/item/clothing/suit/space/hev_suit/nri/captain - name = "\improper VOSKHOD-2 powered combat armor" - desc = "A unique hybrid set of space-resistant armor made for high-ranking NRI operatives, built on a proprietary durathread padded, Akulan made Larr'Takh silk utility uniform. Polyurea coated hexagraphene-lined plastitanium plates hinder mobility as little as possible while the onboard life support system aids the user in combat. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels." - icon_state = "nri_captain" - -/obj/item/clothing/suit/space/hev_suit/nri/medic - name = "\improper VOSKHOD-KH powered combat armor" - desc = "A hybrid set of space-resistant armor built on a modified mass-produced Dipolyester-Aerogel surgeon field jumpsuit, polyurea coated titanium plates hinder mobility as little as possible while the onboard life support system aids the user in combat and provides additional medical functions. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels." - icon_state = "nri_medic" - -/obj/item/clothing/suit/space/hev_suit/nri/engineer - name = "\improper VOSKHOD-IN powered combat armor" - desc = "A hybrid set of space-resistant armor built on a modified Nanotrasen heavy-duty engineering undersuit, polyurea coated lead-lined light plasteel plates hinder mobility as little as possible and offer additional radiation protection while the onboard life support system aids the user in combat. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels." - icon_state = "nri_engineer" diff --git a/modular_nova/modules/opposing_force/code/equipment/clothing.dm b/modular_nova/modules/opposing_force/code/equipment/clothing.dm index 95466b52fe2..d055d5d3590 100644 --- a/modular_nova/modules/opposing_force/code/equipment/clothing.dm +++ b/modular_nova/modules/opposing_force/code/equipment/clothing.dm @@ -123,14 +123,13 @@ /datum/opposing_force_equipment/clothing_sol/sol_militant name = "Sol Militant" description = "There is a war being fought, and its taking place right here." - admin_note = "Uniquely strong power armour." item_type = /obj/item/storage/backpack/ert/odst/hecu/sol_militant /obj/item/storage/backpack/ert/odst/hecu/sol_militant/PopulateContents() - new /obj/item/clothing/under/rank/security/officer/hecu(src) - new /obj/item/clothing/suit/space/hev_suit/pcv(src) - new /obj/item/clothing/head/helmet/space/hev_suit/pcv(src) - new /obj/item/storage/belt/military/assault/hecu(src) + new /obj/item/clothing/under/sol_peacekeeper(src) + new /obj/item/clothing/suit/armor/sf_peacekeeper(src) + new /obj/item/clothing/head/helmet/sf_peacekeeper(src) + new /obj/item/storage/belt/military/assault(src) new /obj/item/clothing/mask/gas/hecu2(src) new /obj/item/clothing/shoes/combat(src) new /obj/item/clothing/gloves/combat(src) diff --git a/tgstation.dme b/tgstation.dme index da0e385e0e9..56d9c9efa50 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6697,46 +6697,6 @@ #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\outfit.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\turf.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\virtual_domain.dm" -#include "modular_nova\modules\black_mesa\code\armor.dm" -#include "modular_nova\modules\black_mesa\code\bump_teleporter.dm" -#include "modular_nova\modules\black_mesa\code\drops.dm" -#include "modular_nova\modules\black_mesa\code\fluff.dm" -#include "modular_nova\modules\black_mesa\code\follow_component.dm" -#include "modular_nova\modules\black_mesa\code\gateway.dm" -#include "modular_nova\modules\black_mesa\code\ghost_spawners.dm" -#include "modular_nova\modules\black_mesa\code\guns.dm" -#include "modular_nova\modules\black_mesa\code\healing_puddle.dm" -#include "modular_nova\modules\black_mesa\code\lambda_teleporter.dm" -#include "modular_nova\modules\black_mesa\code\mapping_fluff.dm" -#include "modular_nova\modules\black_mesa\code\objects.dm" -#include "modular_nova\modules\black_mesa\code\projectiles.dm" -#include "modular_nova\modules\black_mesa\code\rationpacks.dm" -#include "modular_nova\modules\black_mesa\code\shield_pylon.dm" -#include "modular_nova\modules\black_mesa\code\shockplant.dm" -#include "modular_nova\modules\black_mesa\code\spawners.dm" -#include "modular_nova\modules\black_mesa\code\turfs.dm" -#include "modular_nova\modules\black_mesa\code\turrets.dm" -#include "modular_nova\modules\black_mesa\code\uber_teleporter.dm" -#include "modular_nova\modules\black_mesa\code\weapons.dm" -#include "modular_nova\modules\black_mesa\code\xen_crystal.dm" -#include "modular_nova\modules\black_mesa\code\armaments\__armament_bodyarmor.dm" -#include "modular_nova\modules\black_mesa\code\armaments\_armament_primary.dm" -#include "modular_nova\modules\black_mesa\code\armaments\_armaments_secondary.dm" -#include "modular_nova\modules\black_mesa\code\armaments\armament_explosives.dm" -#include "modular_nova\modules\black_mesa\code\armaments\armament_medical.dm" -#include "modular_nova\modules\black_mesa\code\armaments\armament_melee.dm" -#include "modular_nova\modules\black_mesa\code\armaments\armament_miscellaneous.dm" -#include "modular_nova\modules\black_mesa\code\armaments\armament_utility.dm" -#include "modular_nova\modules\black_mesa\code\armaments\hecu_armament_station.dm" -#include "modular_nova\modules\black_mesa\code\mobs\bullsquid.dm" -#include "modular_nova\modules\black_mesa\code\mobs\gordon_freeman.dm" -#include "modular_nova\modules\black_mesa\code\mobs\headcrab.dm" -#include "modular_nova\modules\black_mesa\code\mobs\headcrab_zombie.dm" -#include "modular_nova\modules\black_mesa\code\mobs\houndeye.dm" -#include "modular_nova\modules\black_mesa\code\mobs\human_mobs.dm" -#include "modular_nova\modules\black_mesa\code\mobs\mob_spawners.dm" -#include "modular_nova\modules\black_mesa\code\mobs\nihilanth.dm" -#include "modular_nova\modules\black_mesa\code\mobs\vortigaunt.dm" #include "modular_nova\modules\blastwave_outfits\code\cargo_packs.dm" #include "modular_nova\modules\blastwave_outfits\code\clothing\blastwave_head.dm" #include "modular_nova\modules\blastwave_outfits\code\clothing\blastwave_mask.dm" @@ -7318,7 +7278,6 @@ #include "modular_nova\modules\gunpoint\code\gunpoint_datum.dm" #include "modular_nova\modules\hairbrush\code\hairbrush.dm" #include "modular_nova\modules\hairbrush\code\mood_events.dm" -#include "modular_nova\modules\hev_suit\code\hev_suit.dm" #include "modular_nova\modules\holdingfashion_port\code\backpack.dm" #include "modular_nova\modules\holdingfashion_port\code\bluespace_design.dm" #include "modular_nova\modules\holdingfashion_port\code\bluespace_node.dm" @@ -7420,6 +7379,7 @@ #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_shoes.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_suit.dm" #include "modular_nova\modules\loadouts\loadout_items\loadout_datum_toys.dm" +#include "modular_nova\modules\loadouts\loadout_items\pizzabox.dm" #include "modular_nova\modules\loadouts\loadout_items\donator\personal\donator_personal.dm" #include "modular_nova\modules\loadouts\loadout_items\under\donator.dm" #include "modular_nova\modules\loadouts\loadout_items\under\loadout_datum_under.dm" @@ -7841,7 +7801,6 @@ #include "modular_nova\modules\novaya_ert\code\outfit.dm" #include "modular_nova\modules\novaya_ert\code\police_outfit.dm" #include "modular_nova\modules\novaya_ert\code\shield.dm" -#include "modular_nova\modules\novaya_ert\code\suit.dm" #include "modular_nova\modules\novaya_ert\code\surplus_armor.dm" #include "modular_nova\modules\novaya_ert\code\survival_pack.dm" #include "modular_nova\modules\novaya_ert\code\toolbox.dm"