From 7854766c3e5cf6b09918fc22a35695dcb8b82015 Mon Sep 17 00:00:00 2001 From: FluffMedic <109300046+FluffMedic@users.noreply.github.com> Date: Sat, 2 Dec 2023 06:29:47 -0500 Subject: [PATCH] Some minor things (#7305) --- code/modules/mob/living/carbon/human/life.dm | 4 + .../submaps/gateway/maddnesslab.dm | 6 + .../submaps/gateway/maddnesslab.dmm | 3241 ++++++++++------- .../mob/living/simple_mob/butchering.dm | 8 +- 4 files changed, 1886 insertions(+), 1373 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7f7f286bab..22bafbe41f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -277,6 +277,10 @@ if((COLD_RESISTANCE in mutations) || (prob(1))) heal_organ_damage(0,1) + if(stat != DEAD) //CHOMPadd: Until I find where nutrion heal code is anyway + if((mRegen in mutations)) + heal_organ_damage(0.2,0.2) + // DNA2 - Gene processing. // The HULK stuff that was here is now in the hulk gene. if(!isSynthetic()) diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dm b/maps/southern_cross/submaps/gateway/maddnesslab.dm index a9c141e97f..f5312812d2 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dm @@ -113,6 +113,12 @@ /area/awaymission/mol/headdorms name = "Delta Lab Head Dorms" +/area/awaymission/mol/themaze + name = "Delta Maze" + +/area/awaymission/mol/crumblingmaze + name = "Delta Breaking Maze" + /obj/structure/prop/blackbox/maddnesslab catalogue_data = list(/datum/category_item/catalogue/information/blackbox/maddnesslab) diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dmm b/maps/southern_cross/submaps/gateway/maddnesslab.dmm index 91327e500b..35fb8e6c3d 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dmm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dmm @@ -34,6 +34,9 @@ /mob/living/simple_mob/vore/candy/peppermint, /turf/simulated/floor/tiled/kafel_full/yellow, /area/awaymission/mol/kitchen/chamberC) +"aj" = ( +/turf/simulated/wall/r_wall, +/area/awaymission/mol/themaze) "an" = ( /obj/structure/table/hardwoodtable, /obj/random/maintenance/foodstuff, @@ -84,7 +87,7 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "aF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -342,8 +345,19 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) "cl" = ( -/turf/simulated/shuttle/wall/alien/blue, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, /area/awaymission/mol/mines) +"cr" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "ct" = ( /obj/effect/floor_decal/corner/green/diagonal, /mob/living/bot/cleanbot{ @@ -369,6 +383,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room2) +"cH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "cI" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -376,9 +397,6 @@ /obj/effect/spider/stickyweb/dark, /turf/simulated/floor, /area/awaymission/mol/headdorms) -"cJ" = ( -/turf/simulated/floor/lava, -/area/awaymission/mol/mines) "cK" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/bmarble, @@ -409,6 +427,17 @@ /obj/item/weapon/soap/rainbow_soap, /turf/simulated/floor/wood/sif, /area/awaymission/mol/dorms) +"cQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/crumblingmaze) +"cS" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "cW" = ( /turf/simulated/floor/water{ oxygen = 21.8366; @@ -529,6 +558,10 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"dK" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/themaze) "dO" = ( /obj/structure/closet/jcloset, /obj/item/weapon/soap/rainbow_soap, @@ -764,6 +797,13 @@ /obj/machinery/door/airlock/hatch, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observationroom) +"fq" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "fr" = ( /turf/simulated/floor/carpet/brown, /area/awaymission/mol/vistortunnel/orange) @@ -850,7 +890,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "fY" = ( /turf/simulated/floor/carpet/retro_red, /area/awaymission/mol/vistortunnel/red) @@ -929,6 +969,15 @@ /obj/machinery/door/airlock, /turf/simulated/floor/carpet/oracarpet, /area/awaymission/mol/mines) +"gK" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "gN" = ( /obj/random/obstruction, /obj/structure/disposalpipe/segment{ @@ -1012,13 +1061,29 @@ /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"hg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "hh" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) +"hp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "hq" = ( /obj/structure/table/standard, /obj/random/maintenance/research, @@ -1085,7 +1150,7 @@ dir = 4 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "hI" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/bcarpet, @@ -1098,6 +1163,13 @@ /obj/random/obstruction, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room3) +"hM" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "hN" = ( /obj/machinery/gibber, /turf/simulated/floor/tiled/kafel_full/gray, @@ -1166,7 +1238,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "ii" = ( /obj/structure/table/marble, /obj/machinery/microwave, @@ -1236,6 +1308,12 @@ /obj/machinery/light, /turf/simulated/floor/carpet/retro_red, /area/awaymission/mol/vistortunnel/red) +"iG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "iH" = ( /obj/machinery/honey_extractor, /obj/effect/floor_decal/corner/lime/diagonal, @@ -1317,6 +1395,13 @@ nitrogen = 82.1472 }, /area/awaymission/mol/entrancetunnel) +"jb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/crumblingmaze) "jc" = ( /obj/effect/floor_decal/corner/orange/diagonal, /obj/structure/table/rack/shelf, @@ -1380,7 +1465,7 @@ dir = 4 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "jy" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light{ @@ -1422,9 +1507,6 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room1) -"jS" = ( -/turf/simulated/shuttle/floor/alien/blue, -/area/awaymission/mol/mines) "jT" = ( /obj/effect/floor_decal/corner/orange/diagonal, /obj/structure/table/rack/shelf, @@ -1603,6 +1685,15 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/conveyorcontrol) +"kU" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "kV" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/effect/map_helper/no_phaseshift, @@ -1625,6 +1716,13 @@ }, /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room2) +"ld" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "le" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light{ @@ -1642,6 +1740,12 @@ "lh" = ( /turf/simulated/floor/carpet/oracarpet, /area/awaymission/mol/mines) +"lj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "ll" = ( /obj/machinery/light{ dir = 1 @@ -1671,6 +1775,17 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) +"lr" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "ls" = ( /mob/living/simple_mob/vore/candy/bluecabold, /obj/machinery/light{ @@ -1715,6 +1830,16 @@ /obj/machinery/light, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"lH" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/random/trash, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "lJ" = ( /obj/effect/spider/stickyweb/dark, /obj/structure/table/hardwoodtable, @@ -1888,6 +2013,15 @@ "mI" = ( /turf/simulated/wall/solidrock, /area/awaymission/mol/realitycore) +"mL" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "mP" = ( /obj/structure/table/standard, /obj/random/maintenance/research, @@ -1926,6 +2060,13 @@ /mob/living/simple_mob/animal/passive/mouse, /turf/simulated/floor/carpet/blue, /area/awaymission/mol/headdorms) +"mX" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "mY" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/map_helper/no_phaseshift, @@ -1940,6 +2081,10 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observationroom) +"nd" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "ng" = ( /obj/item/weapon/material/barbedwire{ anchored = 1; @@ -2059,6 +2204,12 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/kafel_full/blue, /area/awaymission/mol/kitchen/chamberB) +"nY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/mines) "nZ" = ( /obj/effect/floor_decal/corner/grey/diagonal, /mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror, @@ -2189,7 +2340,7 @@ dir = 4 }, /turf/simulated/wall/solidrock, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "oR" = ( /mob/living/simple_mob/vr/poisonwiz, /turf/simulated/floor/flock, @@ -2262,7 +2413,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "pr" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/melee/energy/sword/imperial, @@ -2281,6 +2432,9 @@ /obj/machinery/light, /turf/simulated/floor/carpet/blue, /area/awaymission/mol/vistortunnel/blue) +"px" = ( +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "pB" = ( /obj/effect/decal/mecha_wreckage/marauder, /obj/effect/floor_decal/corner/black/diagonal, @@ -2415,10 +2569,6 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) -"qs" = ( -/obj/structure/loot_pile/surface/bones, -/turf/simulated/floor/lava, -/area/awaymission/mol/mines) "qu" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/brown, @@ -2438,7 +2588,7 @@ dir = 8 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "qA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/steel, @@ -2448,6 +2598,10 @@ }, /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room2) +"qC" = ( +/obj/structure/disposaloutlet, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "qE" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light, @@ -2775,7 +2929,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "sN" = ( /turf/simulated/wall/dungeon{ blocks_nonghost_incorporeal = 1 @@ -2788,8 +2942,15 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/shuttle/floor/alienplating/blue, +/turf/simulated/floor, /area/awaymission/mol/mines) +"sS" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "sU" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/effect/floor_decal/corner/lightgrey/diagonal, @@ -2909,6 +3070,9 @@ /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen/ChamberD) +"tI" = ( +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "tK" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/wood/sif, @@ -3070,6 +3234,13 @@ }, /turf/simulated/floor/tiled/kafel_full/purple, /area/awaymission/mol/kitchen/chamberC) +"uE" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "uH" = ( /mob/living/simple_mob/vore/candy/peppermint, /turf/simulated/floor/tiled/kafel_full/purple, @@ -3138,6 +3309,15 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/mines) +"vc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "vd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3371,6 +3551,14 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) +"wN" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/mines) "wO" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/effect/floor_decal/industrial/warning{ @@ -3412,6 +3600,10 @@ "xd" = ( /turf/unsimulated/ai_visible, /area/awaymission/mol/vr/shattered) +"xe" = ( +/obj/machinery/disposal, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "xg" = ( /obj/machinery/chemical_dispenser/xenoflora/full, /obj/structure/table/steel_reinforced, @@ -3443,6 +3635,15 @@ /obj/structure/curtain, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room2) +"xm" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "xo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3477,6 +3678,16 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"xu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/random/trash, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "xv" = ( /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/carpet/brown, @@ -3520,8 +3731,11 @@ /turf/simulated/wall/r_wall, /area/awaymission/mol/entrancetunnel) "xJ" = ( -/turf/simulated/floor/lava/harmless, -/area/awaymission/mol/mines) +/obj/structure/table/hardwoodtable, +/obj/effect/spider/stickyweb/dark, +/obj/item/weapon/card/id/syndicate_command, +/turf/simulated/floor/carpet/tealcarpet, +/area/awaymission/mol/headdorms) "xM" = ( /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/light, @@ -3538,6 +3752,13 @@ }, /turf/simulated/floor, /area/awaymission/mol/headdorms) +"xW" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "xX" = ( /obj/structure/table/hardwoodtable, /obj/random/maintenance/foodstuff, @@ -3591,6 +3812,13 @@ outdoors = 1 }, /area/awaymission/mol/vr/shattered) +"yo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "yp" = ( /mob/living/simple_mob/vore/candy/redcabold, /obj/structure/disposalpipe/segment{ @@ -3609,7 +3837,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "yz" = ( /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/door/blast/puzzle{ @@ -3659,6 +3887,12 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) +"yN" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "yO" = ( /obj/machinery/door/airlock, /turf/simulated/floor/bmarble, @@ -3819,6 +4053,14 @@ /mob/living/simple_mob/mechanical/cyber_horror/grey, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room2) +"zO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "zR" = ( /obj/structure/prop/blackbox/maddnesslab, /turf/simulated/floor/carpet/oracarpet, @@ -3826,6 +4068,14 @@ "zS" = ( /turf/simulated/mineral, /area/awaymission/mol/mines) +"zT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "zX" = ( /obj/effect/decal/mecha_wreckage/gorilla, /obj/effect/floor_decal/corner/black/diagonal, @@ -3919,6 +4169,11 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) +"Ax" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "AC" = ( /obj/random/trash_pile, /turf/simulated/floor/bmarble, @@ -3941,6 +4196,9 @@ /obj/item/weapon/bedsheet/captain, /turf/simulated/floor/carpet/oracarpet, /area/awaymission/mol/mines) +"AI" = ( +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "AK" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light, @@ -3989,6 +4247,15 @@ temperature = 293.15 }, /area/awaymission/mol/vr/shattered) +"Bi" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Bj" = ( /obj/machinery/light{ dir = 1 @@ -4110,6 +4377,17 @@ }, /turf/simulated/floor/tiled/kafel_full/gray, /area/awaymission/mol/kitchen/ChamberD) +"BJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) +"BL" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/crumblingmaze) "BR" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -4123,14 +4401,6 @@ /obj/machinery/light, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room2) -"Cb" = ( -/obj/item/weapon/card/id/syndicate_command, -/turf/simulated/floor/outdoors/dirt{ - oxygen = 21.8366; - nitrogen = 82.1472; - temperature = 293.15 - }, -/area/awaymission/mol/mines) "Cc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /mob/living/simple_mob/mechanical/cyber_horror/tajaran, @@ -4144,6 +4414,13 @@ /obj/item/weapon/gun/projectile/revolver/judge, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"Ch" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Cl" = ( /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic, /obj/structure/closet/wardrobe, @@ -4161,6 +4438,15 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/carpet/blue, /area/awaymission/mol/vistortunnel/blue) +"Cr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "Cs" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "ammo cabinet" @@ -4183,6 +4469,13 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/conveyorcontrol) +"Cw" = ( +/obj/structure/disposalpipe/segment, +/obj/random/trash, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "Cx" = ( /obj/structure/barricade/planks, /obj/item/tape/police, @@ -4315,7 +4608,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Do" = ( /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, @@ -4381,6 +4674,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/shattered) +"DG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/mines) "DI" = ( /mob/living/simple_mob/vr/glitch, /turf/simulated/floor/water{ @@ -4418,6 +4718,16 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"DQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "DR" = ( /obj/structure/table/standard, /obj/item/weapon/paper{ @@ -4466,6 +4776,14 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/kafel_full/blue, /area/awaymission/mol/kitchen/chamberB) +"Ee" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "Ei" = ( /obj/structure/cliff/automatic{ dir = 6 @@ -4547,7 +4865,7 @@ dir = 4 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "EL" = ( /mob/living/simple_mob/vore/candy/yellowcabold, /obj/effect/floor_decal/corner/white/diagonal, @@ -4639,7 +4957,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Fh" = ( /obj/structure/closet/crate/secure/loot, /turf/simulated/floor/wood, @@ -4729,7 +5047,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Fz" = ( /mob/living/simple_mob/vr/lightingwiz, /obj/effect/floor_decal/corner/black/diagonal, @@ -4844,7 +5162,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/solidrock, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Gy" = ( /obj/structure/table/marble, /obj/machinery/button/remote/blast_door{ @@ -4855,6 +5173,13 @@ }, /turf/simulated/floor, /area/awaymission/mol/vistortunnel) +"GA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "GB" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light{ @@ -5049,7 +5374,7 @@ /area/awaymission/mol/kitchen/chamberB) "HH" = ( /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "HI" = ( /turf/simulated/floor/reinforced, /area/awaymission/mol/audiotorium) @@ -5235,6 +5560,15 @@ }, /turf/simulated/floor/tiled/kafel_full/green, /area/awaymission/mol/kitchen/chamberB) +"IR" = ( +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "IT" = ( /obj/structure/safe, /obj/item/weapon/gun/energy/vepr/plasma, @@ -5284,6 +5618,13 @@ /obj/machinery/door/airlock/gold, /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) +"Jg" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Jh" = ( /obj/item/weapon/flame/candle/everburn, /obj/item/weapon/flame/candle/everburn, @@ -5431,6 +5772,13 @@ temperature = 293.15 }, /area/awaymission/mol/vr/shattered) +"Kl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Km" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/bmarble, @@ -5509,6 +5857,10 @@ }, /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room1) +"KW" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "KY" = ( /obj/structure/table/marble, /obj/random/maintenance/foodstuff, @@ -5617,12 +5969,28 @@ }, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) +"LP" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/mines) "LQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/r_wall, /area/awaymission/mol/hardlightentrance) +"LR" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "LS" = ( /obj/effect/floor_decal/corner/orange/diagonal, /obj/machinery/light{ @@ -5722,10 +6090,6 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) -"MB" = ( -/obj/structure/fans/hardlight/colorable/abductor, -/turf/simulated/shuttle/floor/alienplating/blue, -/area/awaymission/mol/mines) "MC" = ( /obj/structure/table/standard, /obj/item/weapon/grenade/chem_grenade/cleaner, @@ -5805,13 +6169,20 @@ }, /turf/simulated/wall/r_wall, /area/awaymission/mol/vr/observation) +"Nd" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Nf" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ dir = 1 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Ng" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -5819,7 +6190,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/wall/solidrock, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Nh" = ( /turf/simulated/wall/solidrock, /area/awaymission/mol/mines) @@ -6105,6 +6476,9 @@ /obj/item/weapon/bedsheet/blue, /turf/simulated/floor/carpet/blue, /area/awaymission/mol/vistortunnel/blue) +"OW" = ( +/turf/simulated/wall/solidrock, +/area/awaymission/mol/crumblingmaze) "OZ" = ( /obj/effect/floor_decal/corner/red/border{ dir = 6 @@ -6128,6 +6502,16 @@ temperature = 293.15 }, /area/awaymission/mol/vr/shattered) +"Pg" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/random/trash, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "Ph" = ( /obj/structure/table/standard, /obj/random/maintenance/research, @@ -6176,6 +6560,13 @@ }, /turf/simulated/floor/carpet/retro_red, /area/awaymission/mol/vistortunnel/red) +"PC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "PD" = ( /obj/structure/flora/ausbushes/grassybush, /mob/living/simple_mob/vr/glitch, @@ -6193,6 +6584,13 @@ }, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) +"PF" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "PG" = ( /turf/simulated/floor, /area/awaymission/mol/vistortunnel) @@ -6368,6 +6766,17 @@ }, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) +"QU" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "QV" = ( /mob/living/simple_mob/vr/doomknight, /turf/simulated/floor/dungeon, @@ -6383,7 +6792,7 @@ dir = 4 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Rc" = ( /mob/living/simple_mob/vore/candy/marshmellowserpent, /obj/effect/floor_decal/corner/lightgrey/diagonal, @@ -6396,7 +6805,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Ri" = ( /obj/item/modular_computer/console/preset/civilian, /obj/effect/floor_decal/corner/black/diagonal, @@ -6602,6 +7011,13 @@ can_open = 1 }, /area/awaymission/mol/scraptunnels) +"SA" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "SB" = ( /turf/simulated/floor/tiled/kafel_full/blue, /area/awaymission/mol/kitchen/chamberB) @@ -6615,6 +7031,13 @@ /mob/living/simple_mob/vr/glitch, /turf/simulated/floor/beach/sand, /area/awaymission/mol/vr/shattered) +"SH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "SJ" = ( /obj/structure/bed, /obj/item/weapon/bedsheet/blue, @@ -6653,7 +7076,7 @@ "Td" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Tf" = ( /obj/effect/floor_decal/corner/red/border{ dir = 4 @@ -6856,7 +7279,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/shuttle/wall/alien/blue, +/turf/simulated/wall/r_wall, /area/awaymission/mol/mines) "Uk" = ( /obj/structure/flora/tree/bigtree, @@ -6869,6 +7292,11 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observationroom) +"Um" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "Ur" = ( /obj/machinery/light{ dir = 1; @@ -6909,7 +7337,7 @@ /obj/item/weapon/card/id/silver{ access = list(200) }, -/turf/simulated/shuttle/floor/alienplating/blue, +/turf/simulated/floor, /area/awaymission/mol/mines) "Ux" = ( /obj/effect/floor_decal/corner/orange/diagonal, @@ -6948,6 +7376,10 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/securitycheckpoint) +"UF" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/themaze) "UH" = ( /mob/living/simple_mob/vr/firewiz, /turf/simulated/floor/lava/harmless, @@ -7000,6 +7432,15 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/carpet/retro_red, /area/awaymission/mol/vistortunnel/red) +"UZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall{ + can_open = 1 + }, +/area/awaymission/mol/crumblingmaze) "Va" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/r_wall, @@ -7053,7 +7494,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Vo" = ( /obj/machinery/door/blast/puzzle{ id = "FinaleGate2" @@ -7161,6 +7602,15 @@ /obj/item/weapon/bedsheet/blue, /turf/simulated/floor/carpet/green, /area/awaymission/mol/vistortunnel/green) +"VP" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "VV" = ( /obj/machinery/light, /turf/simulated/floor/tiled/milspec/raised, @@ -7215,7 +7665,7 @@ dir = 4 }, /turf/simulated/wall/r_wall, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Wh" = ( /obj/effect/floor_decal/corner/yellow/border, /obj/machinery/optable, @@ -7279,7 +7729,7 @@ dir = 8 }, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "WB" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -7312,7 +7762,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall/solidrock, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "WO" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -7397,7 +7847,7 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/wall/solidrock, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Xr" = ( /obj/machinery/light{ dir = 4 @@ -7417,7 +7867,7 @@ }, /obj/structure/disposalpipe/trunk, /turf/simulated/floor, -/area/awaymission/mol/scraptunnels) +/area/awaymission/mol/themaze) "Xy" = ( /obj/machinery/light{ dir = 4 @@ -7435,6 +7885,15 @@ /obj/machinery/chemical_dispenser/biochemistry/full, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"XD" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "XE" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/grass2{ @@ -7456,6 +7915,13 @@ }, /turf/simulated/wall/solidrock, /area/awaymission/mol/scraptunnels) +"XH" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor, +/area/awaymission/mol/crumblingmaze) "XK" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light, @@ -7464,6 +7930,17 @@ "XM" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vr/observationroom) +"XN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "XP" = ( /obj/machinery/light, /turf/simulated/floor/carpet/brown, @@ -7588,12 +8065,18 @@ }, /turf/simulated/wall/solidrock, /area/awaymission/mol/mines) +"Yz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/themaze) "YA" = ( /obj/machinery/light, /turf/simulated/floor/carpet/green, /area/awaymission/mol/vistortunnel/green) "YG" = ( -/turf/simulated/shuttle/floor/alienplating/blue, +/turf/simulated/floor, /area/awaymission/mol/mines) "YJ" = ( /turf/simulated/wall/solidrock{ @@ -7737,6 +8220,13 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/serverroom) +"ZJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/wall/solidrock, +/area/awaymission/mol/crumblingmaze) "ZL" = ( /obj/machinery/light, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -7759,6 +8249,13 @@ "ZU" = ( /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room2) +"ZW" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/wall/r_wall, +/area/awaymission/mol/crumblingmaze) "ZY" = ( /obj/machinery/light{ dir = 4 @@ -10297,29 +10794,29 @@ Nh Nh Nh Nh -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -10555,29 +11052,29 @@ Nh Nh Nh Nh -cl -YG -YG -YG -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -qs -cJ -cJ -cJ -YG -YG -YG -cl +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -10809,33 +11306,33 @@ Nh Nh Nh Nh -ch -ch -ch Nh -cl -YG -YG -YG -jS -jS -jS -jS -cJ -cJ -cJ -cJ -jS -jS -jS -jS -cJ -cJ -cJ -YG -YG -YG -cl +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Yy +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +VJ +Nh +Nh Nh Nh Nh @@ -11066,34 +11563,34 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -MB -YG -YG -YG -cJ -cJ -cJ -jS -cJ -cJ -cJ -cJ -jS -cJ -cJ -jS -cJ -cJ -cJ -YG -YG -YG -cl +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +NB +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +NB +Nh +Nh Nh Nh Nh @@ -11324,34 +11821,34 @@ Nh Nh Nh Nh -ch -ch -Cb -ch -ch -MB -YG -YG -YG -cJ -cJ -cJ -jS -cJ -cJ -cJ -cJ -jS -cJ -cJ -jS -cJ -cJ -cJ -YG -YG -YG -cl +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +NB +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +NB +Nh +Nh Nh Nh Nh @@ -11582,34 +12079,34 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -MB -YG -YG -YG -cJ -cJ -cJ -jS -cJ -cJ -cJ -cJ -jS -cJ -cJ -jS -cJ -cJ -cJ -YG -YG -YG -cl +Nh +Nh +Nh +Nh +Nh +Yy +dm +dm +dm +YX +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +VJ +rZ +VJ +Nh Nh Nh Nh @@ -11841,33 +12338,33 @@ Nh Nh Nh Nh -ch -ch -ch Nh -cl -YG -YG -YG -cJ -cJ -cJ -jS -cJ -cJ -cJ -cJ -jS -cJ -cJ -jS -jS -jS -jS -YG -YG -YG -cl +Nh +Nh +Nh +NB +Nh +Nh +Nh +NB +Yy +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +VJ +Nh +Nh +NB +Nh +NB +Nh Nh Nh Nh @@ -12103,29 +12600,29 @@ Nh Nh Nh Nh -cl -YG -YG -YG -cJ -cJ -qs -jS -jS -jS -jS -jS -jS -cJ -cJ -cJ -cJ -cJ -cJ -YG -YG -YG -cl +NB +Yy +dm +dm +YX +Dq +dm +dm +dm +dm +dm +VJ +Nh +Nh +Nh +Nh +NB +Nh +Nh +NB +Nh +NB +Nh Nh Nh Nh @@ -12361,31 +12858,31 @@ Nh Nh Nh Nh -cl -cl -cl -cl -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cl -cl -cl -cl +NB +NB Nh Nh +NB +NB +Nh +Nh +Nh +Yy +dm +YX +dm +dm +dm +dm +Dq +dm +Va +LP +Va +LP +Va +VJ +Nh Nh Nh Nh @@ -12612,37 +13109,37 @@ Nh Nh Nh Nh +Yy +dm +BL +nd +nd +nd +fq +uE +yo +nd +fq +iG +iG +PC +nd +fq +iG +AI +iG +AI +AI +AI Nh -Nh -Nh -Nh -Nh -Nh -Nh +NB +Yy +Va +DG cl -YG -YG -YG -cJ -cJ -qs -xJ -xJ -xJ -xJ -xJ -xJ -cJ -cJ -cJ -cJ -cJ -cJ -YG -YG -YG -cl -Nh +nY +tG +NB Nh Nh Nh @@ -12870,37 +13367,37 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -cl -YG -YG -YG -cJ -cJ -cJ -xJ -cJ -cJ -cJ -cJ -xJ -cJ -cJ -xJ -xJ -xJ -xJ -YG +NB +Yy +BL +nd +sS +tI +kU +tI +Nd +AI +Nd +hp +kU +hp +cS +ZW +Nd +tI +kU +tI +cS +nd +VJ +NB +NB +tG +nY Uw -YG -cl -Nh +nY +tG +NB Nh Nh Nh @@ -13128,37 +13625,37 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -MB +NB +NB +jb +nd +KW +KW +KW +Ch +tI +PC +KW +Kl +KW +Kl +KW +fq +tI +tI +tI +tI +tI +PC +YX +YX +Ja +tG +nY YG -YG -YG -cJ -cJ -cJ -xJ -cJ -cJ -xJ -xJ -xJ -cJ -cJ -xJ -cJ -cJ -cJ -YG -YG -YG -cl -Nh +nY +tG +NB Nh Nh Nh @@ -13384,40 +13881,40 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -MB -YG -YG -YG -cJ -cJ -cJ -xJ -cJ -cJ -xJ -cJ -cJ -cJ -cJ -xJ -cJ -cJ -cJ -YG -YG -YG -cl Nh Nh +NB +NB +cQ +PC +Jg +tI +tI +SA +Bi +iG +Um +XH +tI +hp +mX +XN +Jg +tI +tI +tI +mX +ZW +NB +NB +Nh +tG +nY +YG +nY +tG +NB +Nh Nh Nh Nh @@ -13638,48 +14135,48 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -MB -YG -YG -YG -cJ -cJ -cJ -xJ -cJ -cJ -xJ -cJ -cJ -cJ -cJ -xJ -cJ -cJ -cJ -YG -YG -YG -cl Nh Nh Nh Nh Nh Nh +NB +NB +cQ +uE +KW +KW +KW +KW +KW +hg +tI +tI +tI +hp +tI +iG +tI +tI +tI +tI +tI +AI +NB +NB +Nh +tG +nY +YG +nY +tG +NB +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -13894,44 +14391,6 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -cl -YG -YG -YG -xJ -xJ -xJ -xJ -cJ -cJ -xJ -xJ -xJ -xJ -xJ -xJ -cJ -cJ -cJ -YG -YG -YG -cl Nh Nh Nh @@ -13940,6 +14399,44 @@ Nh Nh Nh Nh +NB +NB +cQ +PC +sS +tI +XD +tI +cS +DQ +PF +tI +XD +hp +cS +ZW +PF +tI +XD +SH +sS +AI +NB +NB +Nh +tG +nY +YG +nY +tG +NB +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -14150,47 +14647,47 @@ Nh Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch Nh -cl -YG -YG -YG -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -cJ -qs -cJ -cJ -cJ -YG +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +NB +NB +cQ +uE +nd +nd +QU +fq +AI +iG +UZ +lH +UZ +vc +Ax +AI +uE +nd +Ee +zO +nd +nd +YX +Ja +Nh +tG +nY sQ -YG -cl -Nh +nY +tG +NB Nh Nh Nh @@ -14407,48 +14904,48 @@ tG Nh Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch Nh Nh Nh Nh Nh -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl +Nh +Nh +Nh +Nh +Nh +Nh +NB +NB +cQ +PC +sS +tI +kU +hp +xe +vc +cS +BJ +IR +SH +sS +Ax +PF +tI +xm +tI +PF +AI +NB +Nh +Nh +tG Ui -cl -cl -Nh +Ui +Ui +tG +NB Nh Nh Nh @@ -14664,33 +15161,6 @@ em tG Nh Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -14704,9 +15174,36 @@ Nh Nh Nh NB +NB +cQ +uE +KW +KW +KW +XH +tI +Cr +KW +BJ +KW +Kl +KW +Cw +XH +SH +XH +SH +XH +AI +NB Nh Nh Nh +NB +NB +NB +Nh +NB Nh Nh Nh @@ -14920,37 +15417,10 @@ em pB em tG -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tG +tG +tG +tG Nh Nh Nh @@ -14962,9 +15432,36 @@ Nh Nh Nh NB +NB +cQ +PC +Jg +tI +tI +tI +mX +vc +qC +hp +tI +hp +VP +Cr +Jg +hp +tI +hp +mX +nd +Dq +VJ Nh Nh +NB +NB +NB Nh +NB Nh Nh Nh @@ -15177,38 +15674,11 @@ em Hx em em +XV +em +em +em tG -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -15220,9 +15690,36 @@ Nh Nh Nh NB +NB +cQ +iG +tI +tI +tI +tI +tI +xu +KW +BJ +KW +Kl +Kl +vc +tI +hp +SH +XH +tI +AI +NB +NB Nh Nh +NB +NB +NB Nh +NB Nh Nh Nh @@ -15436,38 +15933,11 @@ UC zX em XV -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +em +em +em +tG +tG Nh Nh Nh @@ -15478,9 +15948,36 @@ Nh Nh Nh NB +NB +cQ +uE +sS +tI +xW +Ch +cS +vc +cS +BJ +LR +hp +Nd +Cr +sS +hp +mL +SH +sS +AI +NB +NB Nh Nh +NB +NB +NB Nh +NB Nh Nh Nh @@ -15694,51 +16191,51 @@ em hx em XV -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +em +em +em +wN +Va +dm +dm +dm +dm +dm +VJ Nh Nh Nh NB +NB +cQ +AI +AI +PC +nd +yo +nd +nd +gK +zT +Cr +Pg +yN +ld +nd +ld +nd +ld +nd +nd +Ja +NB Nh Nh +NB +NB +NB Nh +NB Nh Nh Nh @@ -15952,42 +16449,11 @@ vb em em XV -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +em +em +em +tG +tG Nh Nh Nh @@ -15997,6 +16463,37 @@ NB Nh Nh Nh +NB +NB +ZJ +nd +sS +hp +xm +SA +sS +AI +Nd +hp +kU +hp +PF +iG +xe +hp +cr +XH +cS +nd +dm +Ja +Nh +Nh +NB +NB +NB +Nh +NB Nh Nh Nh @@ -16209,42 +16706,11 @@ UC em em em +XV +em +em +em tG -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -16255,6 +16721,37 @@ NB Nh Nh Nh +NB +NB +OW +AI +tI +hp +SA +Ch +tI +PC +KW +XH +tI +hp +SA +ld +KW +XH +tI +tI +tI +AI +Nh +Nh +Nh +Nh +NB +NB +NB +Nh +NB Nh Nh Nh @@ -16468,41 +16965,10 @@ em Hx em tG -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tG +tG +tG +tG Nh Nh Nh @@ -16513,6 +16979,37 @@ NB Nh Nh Nh +NB +rZ +BL +nd +Jg +hp +tI +hp +mX +lr +qC +tI +tI +hp +VP +uE +Jg +tI +tI +tI +mX +nd +dm +dm +dm +dm +YX +Dq +YX +dm +Ja Nh Nh Nh @@ -16736,39 +17233,39 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +NB Nh Nh Nh NB Nh +OW +AI +tI +hp +tI +SA +Ch +iG +tI +tI +tI +hp +SA +nd +Ch +tI +tI +tI +tI +AI +Nh +Nh +Nh +Nh +NB +NB +NB Nh Nh Nh @@ -16994,39 +17491,39 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +NB Nh Nh Nh NB Nh +OW +AI +PF +SA +LR +tI +Nd +uE +sS +tI +XD +hp +PF +AI +Nd +tI +XD +tI +cS +fq +Nh +Nh +Nh +Nh +NB +NB +NB Nh Nh Nh @@ -17252,41 +17749,41 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh NB Nh Nh Nh +rZ +dm +BL +nd +ZW +AI +AI +AI +AI +AI +AI +AI +iG +iG +iG +AI +AI +AI +uE +nd +nd +ld +dm +dm +dm +dm +Ja +NB +NB +Nh +Nh Nh Nh Nh @@ -17510,22 +18007,7 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +NB Nh Nh Nh @@ -17542,12 +18024,27 @@ Nh Nh Nh NB +NB +NB Nh Nh Nh Nh Nh Nh +NB +Nh +Nh +Nh +Nh +Nh +NB +NB +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -17768,6 +18265,7 @@ Nh Nh Nh Nh +NB Nh Nh Nh @@ -17783,24 +18281,23 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +rZ +YX +Dq +dm +dm +dm +dm +dm +dm +Ja Nh Nh Nh Nh Nh NB -Nh +NB Nh Nh Nh @@ -18026,21 +18523,7 @@ HF Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +NB Nh Nh Nh @@ -18058,6 +18541,7 @@ Nh Nh Nh NB +NB Nh Nh Nh @@ -18070,6 +18554,19 @@ Nh Nh Nh Nh +NB +NB +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -18284,39 +18781,39 @@ HF Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -NB -Nh +rZ +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +Ja +rZ +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +dm +Dq +Ja Nh Nh Nh @@ -24476,33 +24973,33 @@ HF NY Wf Vn -HF -HF -Xw -HF -HF +aj +aj +Yz +aj +aj Fx -Aj -KE -Aj -Aj -Aj -Aj +dK +UF +dK +dK +dK +dK Wf -Aj -Aj +dK +dK Wf -Aj -KE -Aj +dK +UF +dK Wf -Aj +dK Vn -Xw -HF -HF -HF -HF +Yz +aj +aj +aj +aj NB NB Nh @@ -24732,7 +25229,7 @@ zv zv HF XG -Xw +Yz Wz HH HH @@ -24740,9 +25237,9 @@ qz HH HH Wz -HF -Ye -HF +aj +px +aj QY HH HH @@ -24750,9 +25247,9 @@ qz HH HH Wz -HF -Ye -HF +aj +px +aj Wz HH hG @@ -24760,7 +25257,7 @@ qz HH HH Wz -HF +aj NB NB Nh @@ -24990,7 +25487,7 @@ zv zv HF XG -Xw +Yz HH HH HH @@ -24998,9 +25495,9 @@ HH hh Td Td -Aj -KE -Aj +dK +UF +dK sM Td Td @@ -25008,8 +25505,8 @@ Td Dm hh Td -Aj -KE +dK +UF Vn HH HH @@ -25018,7 +25515,7 @@ HH HH HH HH -HF +aj NB NB Nh @@ -25248,7 +25745,7 @@ zv RQ HF XG -Xw +Yz HH HH HH @@ -25256,9 +25753,9 @@ HH hG HH HH -HF -Ye -HF +aj +px +aj yx Td Dm @@ -25266,8 +25763,8 @@ HH yx sM Td -Aj -KE +dK +UF Rh Td Dm @@ -25276,7 +25773,7 @@ HH HH HH HH -HF +aj NB NB Nh @@ -25515,8 +26012,8 @@ hG HH Xx Vn -NY -Aj +cH +dK Nf HH hG @@ -25524,8 +26021,8 @@ HH HH hG Xx -HF -Ye +aj +px Fg Nf hG @@ -25534,7 +26031,7 @@ HH HH HH Xx -Aj +dK Dq Dq dm @@ -25764,7 +26261,7 @@ zv zv HF XG -HF +aj HH HH HH @@ -25772,8 +26269,8 @@ HH hG HH HH -Xw -XG +Yz +lj Fx Td Td @@ -25783,8 +26280,8 @@ Td jx Td Vn -Ye -HF +px +aj HH hG hG @@ -25792,7 +26289,7 @@ HH HH HH HH -HF +aj NB NB Nh @@ -26022,7 +26519,7 @@ zv zv HF XG -HF +aj HH HH HH @@ -26030,9 +26527,9 @@ HH hG HH HH -Xw -XG -Xw +Yz +lj +Yz HH HH hG @@ -26041,8 +26538,8 @@ HH yx Td Rh -KE -Aj +UF +dK Td jx sM @@ -26050,7 +26547,7 @@ Td Td Td Td -Aj +dK Dq Dq dm @@ -26280,7 +26777,7 @@ zv zv HF XG -HF +aj QY HH HH @@ -26288,9 +26785,9 @@ EH hG HH QY -Xw -XG -Xw +Yz +lj +Yz QY HH hG @@ -26298,9 +26795,9 @@ EH HH HH QY -Xw -Ye -HF +Yz +px +aj QY hG hG @@ -26308,7 +26805,7 @@ EH HH HH QY -HF +aj NB NB Nh @@ -26538,35 +27035,35 @@ zv RQ HF XG -HF -Xw -HF -HF +aj +Yz +aj +aj Fg fT -HF +aj Fg Rh -My +GA fT Fg Vn -Xw +Yz Fg Vn -HF +aj Fg Wf WN Fx fT -Xw -Xw -Xw -HF -HF +Yz +Yz +Yz +aj +aj Fg -Aj +dK Ja NB Nh @@ -26796,35 +27293,35 @@ zv zv HF XG -Ye -lO -KE -KE -KE -KE +px +hM +UF +UF +UF +UF WN -Ye -lO -My -KE +px +hM +GA +UF WN -XG -XG -Ye -XG -Ye -Ye -XG -XG -XG -NY +lj +lj +px +lj +px +px +lj +lj +lj +cH oP oP Gr -Ye -Ye -Ye -Ye +px +px +px +px Nh NB Nh @@ -27054,35 +27551,35 @@ zv zv HF XG -HF -HF -HF -HF +aj +aj +aj +aj Fx Vn -Xw +Yz Fx -Aj -My +dK +GA Vn -Xw -Xw -Xw -HF +Yz +Yz +Yz +aj Fg -Aj +dK Vn -Xw -lO +Yz +hM Wf Wf Wf Wf Vn -HF +aj Fx Vn -HF +aj Nh NB Nh @@ -27312,7 +27809,7 @@ zv zv HF XG -HF +aj Wz HH HH @@ -27320,9 +27817,9 @@ qz hG hG Wz -HF -XG -Xw +aj +lj +Yz Wz hG hG @@ -27332,7 +27829,7 @@ HH Wz Fg WN -Xw +Yz Wz hG hG @@ -27340,7 +27837,7 @@ qz HH hG Wz -HF +aj Nh NB Nh @@ -27570,7 +28067,7 @@ Bx fi Aj My -Aj +dK Td Td Td @@ -27578,8 +28075,8 @@ Td jx jx Td -Aj -My +dK +GA Wf Td jx @@ -27588,7 +28085,7 @@ Td Td Td Td -Aj +dK oP Rh Td @@ -27598,7 +28095,7 @@ Td Td jx Td -Aj +dK VJ NB Nh @@ -27828,7 +28325,7 @@ pi zv HF XG -HF +aj HH HH HH @@ -27836,8 +28333,8 @@ HH yx sM Td -Aj -My +dK +GA Rh Td jx @@ -27847,8 +28344,8 @@ Td Td Td Vn -XG -Xw +lj +Yz HH yx sM @@ -27856,7 +28353,7 @@ Td Td ig HH -HF +aj NB NB Nh @@ -28086,7 +28583,7 @@ pi zv HF lO -Aj +dK Nf HH HH @@ -28094,8 +28591,8 @@ HH HH hG Xx -HF -XG +aj +lj Fg Nf yx @@ -28104,8 +28601,8 @@ Td Dm HH Xx -Xw -lO +Yz +hM Rh Nf HH @@ -28114,7 +28611,7 @@ Td Dm HH Xx -Aj +dK Ja NB Nh @@ -28344,7 +28841,7 @@ pi RQ HF Ye -HF +aj HH HH HH @@ -28353,8 +28850,8 @@ HH hG HH Fx -My -Aj +GA +dK Td Td jx @@ -28363,7 +28860,7 @@ jx Td Td Wf -KE +UF Rh Td Td @@ -28372,7 +28869,7 @@ HH hG HH HH -HF +aj Nh NB Nh @@ -28602,7 +29099,7 @@ pi zv HF Ye -HF +aj HH HH HH @@ -28610,9 +29107,9 @@ HH HH hG HH -Xw -XG -HF +Yz +lj +aj HH HH yx @@ -28620,9 +29117,9 @@ Td jx Dm HH -Xw -Ye -Xw +Yz +px +Yz HH HH hG @@ -28630,7 +29127,7 @@ HH hG HH HH -HF +aj Nh NB Nh @@ -28860,7 +29357,7 @@ pi zv HF Ye -HF +aj QY HH HH @@ -28868,9 +29365,9 @@ EH HH hG QY -Xw -XG -HF +Yz +lj +aj QY HH HH @@ -28878,9 +29375,9 @@ EH hG hG QY -Xw -Ye -Xw +Yz +px +Yz QY HH hG @@ -28888,7 +29385,7 @@ EH hG HH QY -HF +aj Nh NB Nh @@ -29118,35 +29615,35 @@ pi zv HF Ye -HF +aj Fg Vn Fx fT -HF -Xw +aj +Yz Fg fT -XG +lj Fx fT Fx -Aj +dK fT -Xw -Xw -Xw -Xw -Ye -Xw +Yz +Yz +Yz +Yz +px +Yz Fg -Aj +dK Rh fT -Xw +Yz Fx fT -HF +aj Nh NB Nh @@ -29376,35 +29873,35 @@ pi RQ HF Ye -Ye -Ye -XG -XG -Ye -Ye -XG -NY -KE -My +px +px +lj +lj +px +px +lj +cH +UF +GA oP -KE +UF Gr -Ye -Ye -XG -XG -lO +px +px +lj +lj +hM Gr -Ye -XG -Ye -NY -My -KE -My +px +lj +px +cH +GA +UF +GA Gr -Ye -Ye +px +px Nh NB Nh @@ -29634,35 +30131,35 @@ qn Qf Aj KE -Aj +dK Vn -Xw -Xw +Yz +Yz Fx -Aj +dK Wf Rh -Aj -My +dK +GA Wf Vn -HF +aj Fx Vn -Xw -Xw +Yz +Yz Fx -Aj -KE +dK +UF Rh -Aj +dK fT -Xw +Yz Fx fT -HF +aj Fx -Aj +dK dm Dq VJ @@ -29892,7 +30389,7 @@ zv zv HF Ye -HF +aj Wz hG hG @@ -29900,9 +30397,9 @@ qz HH hG Wz -HF -XG -Xw +aj +lj +Yz Wz HH hG @@ -29910,9 +30407,9 @@ qz hG hG Wz -HF -Ye -Xw +aj +px +Yz Wz HH hG @@ -29920,7 +30417,7 @@ qz HH HH Wz -HF +aj Nh NB NB @@ -30150,7 +30647,7 @@ zv zv HF NY -Aj +dK Td jx sM @@ -30158,8 +30655,8 @@ Td Td jx Td -Aj -My +dK +GA Wf Td Td @@ -30168,9 +30665,9 @@ HH hG hG HH -HF -Ye -Xw +aj +px +Yz HH HH hG @@ -30178,7 +30675,7 @@ HH HH HH HH -HF +aj Nh NB NB @@ -30416,8 +30913,8 @@ Td Td ig HH -HF -XG +aj +lj Fg Td Td @@ -30426,8 +30923,8 @@ Td jx sM Td -Aj -KE +dK +UF Rh Td Td @@ -30436,7 +30933,7 @@ Td Td Dm HH -HF +aj Nh NB NB @@ -30674,9 +31171,9 @@ HH HH HH Xx -HF -XG -HF +aj +lj +aj Nf HH HH @@ -30685,7 +31182,7 @@ hG hG Xx Vn -Ye +px Fg Nf HH @@ -30694,7 +31191,7 @@ HH HH hG Xx -HF +aj Nh NB rZ @@ -30932,9 +31429,9 @@ Td Td Td Td -Aj -My -Aj +dK +GA +dK Td Td Dm @@ -30943,8 +31440,8 @@ hG hG HH Fg -KE -Aj +UF +dK Td Dm hG @@ -30952,7 +31449,7 @@ HH HH hG HH -HF +aj Nh NB Nh @@ -31182,7 +31679,7 @@ zv zv HF XG -Xw +Yz HH hG hG @@ -31190,9 +31687,9 @@ HH HH HH HH -HF -XG -HF +aj +lj +aj HH HH hG @@ -31200,9 +31697,9 @@ HH hG hG HH -HF -Ye -HF +aj +px +aj HH hG hG @@ -31210,7 +31707,7 @@ HH HH hG HH -HF +aj Nh NB Nh @@ -31440,7 +31937,7 @@ zv RQ HF XG -Xw +Yz QY hG hG @@ -31448,9 +31945,9 @@ EH HH HH QY -HF -XG -HF +aj +lj +aj QY HH hG @@ -31458,9 +31955,9 @@ EH hG hG QY -HF -Ye -HF +aj +px +aj QY hG hG @@ -31468,7 +31965,7 @@ EH HH hG QY -HF +aj Nh NB Nh @@ -31700,33 +32197,33 @@ HF XG Fg fT -Xw -Xw +Yz +Yz Fg -Aj +dK Vn Fg -Aj -My +dK +GA Vn -HF -HF +aj +aj Fg fT -Xw -Xw -Xw +Yz +Yz +Yz Fx -KE -Aj +UF +dK fT Fg Rh -Aj -Aj +dK +dK Rh fT -HF +aj Nh NB Nh @@ -31956,35 +32453,35 @@ zv zv HF XG -Ye -NY +px +cH oP Gr -Ye -Ye -XG -Ye -Ye -XG -XG -Ye -Ye -Ye -Ye -XG -XG -lO -My -KE +px +px +lj +px +px +lj +lj +px +px +px +px +lj +lj +hM +GA +UF Ng Xo WN -XG -NY -KE +lj +cH +UF Gr -Ye -Ye +px +px Nh NB Nh @@ -32214,35 +32711,35 @@ zv RQ HF XG -HF -Xw +aj +Yz Fg -Aj +dK Vn -HF +aj Fg -Aj -Aj -My +dK +dK +GA Wf Vn -HF -HF +aj +aj Fx Wf Wf -Aj +dK fT -Ye -Xw -Xw -Xw -Xw -Xw -HF -HF +px +Yz +Yz +Yz +Yz +Yz +aj +aj Fx -Aj +dK dm Ja Nh @@ -32472,7 +32969,7 @@ zv zv HF XG -HF +aj Wz HH HH @@ -32480,9 +32977,9 @@ qz HH HH aC -Aj +dK Gr -Xw +Yz Wz HH HH @@ -32490,9 +32987,9 @@ qz hG hG Wz -HF -Ye -Xw +aj +px +Yz Wz hG hG @@ -32500,7 +32997,7 @@ qz HH HH Wz -HF +aj Nh Nh Nh @@ -32730,7 +33227,7 @@ zv zv HF XG -HF +aj HH HH HH @@ -32739,7 +33236,7 @@ HH HH HH po -KE +UF Rh Td Td @@ -32749,7 +33246,7 @@ jx ig HH Fx -KE +UF fT HH hG @@ -32758,7 +33255,7 @@ HH HH HH HH -HF +aj Nh Nh Nh @@ -32988,7 +33485,7 @@ zv zv HF XG -HF +aj HH HH HH @@ -32996,9 +33493,9 @@ HH HH HH HH -Xw -Ye -Xw +Yz +px +Yz HH HH HH @@ -33006,8 +33503,8 @@ HH hG HH HH -Xw -Ye +Yz +px Fx Td jx @@ -33016,7 +33513,7 @@ HH HH HH HH -HF +aj Nh Nh Nh @@ -33255,7 +33752,7 @@ HH HH Xx fT -Ye +px Fg Nf HH @@ -33265,7 +33762,7 @@ hG HH Xx fT -Ye +px Fg Nf hG @@ -33504,7 +34001,7 @@ zv zv HF XG -Xw +Yz HH HH HH @@ -33512,9 +34009,9 @@ HH HH HH HH -HF -Ye -HF +aj +px +aj HH hh Td @@ -33522,9 +34019,9 @@ Td sM Td Td -Aj -KE -Aj +dK +UF +dK Td sM Td @@ -33770,9 +34267,9 @@ Td Td Td Td -Aj -KE -Aj +dK +UF +dK Td jx Td @@ -33780,9 +34277,9 @@ Td sM Td Td -Aj -KE -Aj +dK +UF +dK Td sM Td @@ -34020,7 +34517,7 @@ zv zv HF XG -HF +aj QY HH HH @@ -34028,9 +34525,9 @@ EH HH HH QY -HF -Ye -HF +aj +px +aj QY hG HH @@ -34038,9 +34535,9 @@ EH hG HH QY -HF -Ye -HF +aj +px +aj QY hG HH @@ -34048,7 +34545,7 @@ EH HH HH QY -Xw +Yz Nh Nh Nh @@ -34278,33 +34775,33 @@ HF HF HF XG -HF -Xw -HF -HF -Xw -HF -HF -Xw -HF -Ye -HF +aj +Yz +aj +aj +Yz +aj +aj +Yz +aj +px +aj Fg fT -HF +aj Fg fT -HF -Xw -HF -Ye -HF -HF +aj +Yz +aj +px +aj +aj Fg -Aj +dK fT -HF -HF +aj +aj Fg fT Nh @@ -65139,7 +65636,7 @@ TE TE TE Op -np +xJ Vf OM Vf diff --git a/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm b/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm index b59c94124c..957415fc12 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm @@ -9,4 +9,10 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/deathclawmeat /mob/living/simple_mob/metroid - meat_type = /obj/item/weapon/reagent_containers/food/snacks/metroidmeat \ No newline at end of file + meat_type = /obj/item/weapon/reagent_containers/food/snacks/metroidmeat + +/mob/living/simple_mob/metroid/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks. + . = ..() + + if(. && (!is_sharp(I) || !has_edge(I))) + return FALSE