diff --git a/_maps/map_files/Efficiencystation/efficiency3.1.3a.dmm b/_maps/map_files/Efficiencystation/efficiency3.1.3a.dmm index c01c4c1b44b..933c25a5d63 100644 --- a/_maps/map_files/Efficiencystation/efficiency3.1.3a.dmm +++ b/_maps/map_files/Efficiencystation/efficiency3.1.3a.dmm @@ -1121,7 +1121,7 @@ "avC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/fpmaint{name = "Medical Maintenance"}) "avD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/fpmaint{name = "Medical Maintenance"}) "avE" = (/obj/effect/decal/cleanable/robot_debris,/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/fpmaint{name = "Medical Maintenance"}) -"avF" = (/obj/structure/table/glass,/obj/item/device/flashlight/pen{pixel_x = 0},/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/antitoxin,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/genetics) +"avF" = (/obj/structure/table/glass,/obj/item/device/flashlight/pen{pixel_x = 0},/obj/item/device/flashlight/pen{pixel_x = 4; pixel_y = 3},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/charcoal,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteblue"},/area/medical/genetics) "avG" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "avH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/camera{c_tag = "Genetics Research"; dir = 2; network = list("SS13","RD"); pixel_x = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) "avI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/genetics) @@ -1405,7 +1405,7 @@ "aBa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_access_txt = "7"; req_one_access_txt = "0"},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "aBb" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/security/checkpoint/science{name = "Security Post - Research Division"}) "aBc" = (/obj/structure/noticeboard{dir = 8; pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) -"aBd" = (/turf/simulated/wall/r_wall,/area/toxins/telesci) +"aBd" = (/turf/simulated/wall/r_wall,/area/toxins/explab) "aBe" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/folder,/obj/item/weapon/pen,/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/maintenance/fore) "aBf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/fore) "aBg" = (/turf/simulated/wall,/area/hallway/primary/starboard) @@ -1462,13 +1462,13 @@ "aCf" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (EAST)"; dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "aCg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "aCh" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"aCi" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/telesci) -"aCj" = (/obj/item/weapon/paper_bin{pixel_x = 0; pixel_y = 6},/obj/item/weapon/pen,/obj/structure/table,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitecorner"},/area/toxins/telesci) -"aCk" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/device/radio/off,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/telesci) -"aCl" = (/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/light{dir = 1},/obj/item/device/gps/science{gpstag = "SCI1"},/obj/item/device/gps/science{gpstag = "SCI2"},/obj/item/device/gps/science{gpstag = "SCI3"},/obj/item/device/gps/science{gpstag = "SCI4"},/obj/item/device/gps/science{gpstag = "SCI5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/telesci) -"aCm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/telesci) -"aCn" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/toxins/telesci) -"aCo" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Telescience Maintenance"; req_access_txt = "7"},/turf/simulated/floor/plating,/area/toxins/telesci) +"aCi" = (/obj/item/weapon/paper_bin{pixel_x = 0; pixel_y = 6},/obj/item/weapon/pen,/obj/structure/table,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitecorner"},/area/toxins/explab) +"aCj" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/toxins/explab) +"aCk" = (/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/hand_labeler,/obj/item/stack/packageWrap,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/explab) +"aCl" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/device/radio/off,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/explab) +"aCm" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitecorner"},/area/toxins/explab) +"aCn" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/requests_console{department = "Science"; departmentType = 2; name = "Science Requests Console"; pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/toxins/explab) +"aCo" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Experimentation Lab Maintenance"; req_access_txt = "7"},/turf/simulated/floor/plating,/area/toxins/explab) "aCp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/junction{icon_state = "pipe-j1"; dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/fore) "aCq" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fore) "aCr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fore) @@ -1527,12 +1527,12 @@ "aDs" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "Misc Research APC"; pixel_x = 0; pixel_y = -25},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "aDt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) "aDu" = (/obj/machinery/camera{c_tag = "Research Division East"; dir = 1; network = list("SS13")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/medical/research{name = "Research Division"}) -"aDv" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Telescience Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aDw" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aDx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aDy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aDz" = (/obj/structure/closet/l3closet/scientist{pixel_x = -2},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aDA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/telesci) +"aDv" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aDw" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/research{name = "Experimentation Lab"; req_access_txt = "7"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aDx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aDy" = (/obj/structure/closet/l3closet/scientist{pixel_x = -2},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aDz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aDA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/explab) "aDB" = (/obj/structure/sign/securearea{pixel_x = -32},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fore) "aDC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg2"; tag = "icon-platingdmg2"},/area/maintenance/fore) "aDD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/fore) @@ -1592,12 +1592,12 @@ "aEF" = (/turf/simulated/wall,/area/assembly/chargebay) "aEG" = (/obj/machinery/door/firedoor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/research{name = "Mech Bay"; req_access_txt = "29"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/chargebay) "aEH" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=1"; freq = 1400; location = "Science"},/obj/machinery/door/firedoor/heavy,/obj/machinery/door/poddoor/preopen{id = "Biohazard"; name = "biohazard containment door"},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/medical/research{name = "Research Division"}) -"aEI" = (/turf/simulated/wall,/area/toxins/telesci) -"aEJ" = (/obj/machinery/light_switch{pixel_x = -20; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aEK" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aEL" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aEM" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aEN" = (/obj/structure/closet/emcloset{pixel_x = -2},/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "Telescience Lab APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) +"aEI" = (/obj/machinery/light_switch{pixel_x = -20; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aEJ" = (/turf/simulated/wall,/area/toxins/explab) +"aEK" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aEL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aEM" = (/obj/structure/closet/emcloset{pixel_x = -2},/obj/structure/disposalpipe/segment,/obj/machinery/power/apc{dir = 4; name = "Telescience Lab APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aEN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "aEO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/oil,/turf/simulated/floor/plating,/area/maintenance/fore) "aEP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/nuke_storage) "aEQ" = (/turf/simulated/wall/r_wall,/area/ai_monitored/nuke_storage) @@ -1665,9 +1665,9 @@ "aGa" = (/turf/simulated/floor/plasteel,/area/assembly/chargebay) "aGb" = (/turf/simulated/wall/r_wall,/area/assembly/chargebay) "aGc" = (/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplefull"},/area/medical/research{name = "Research Division"}) -"aGd" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aGe" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) -"aGf" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera{c_tag = "Telescience Lab"; dir = 8; network = list("SS13","RD")},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) +"aGd" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aGe" = (/obj/structure/stool/bed/chair/office/light,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aGf" = (/obj/structure/disposalpipe/segment,/obj/machinery/camera{c_tag = "Experimentation Lab"; dir = 8; network = list("SS13","RD")},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) "aGg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/maintenance/fore) "aGh" = (/obj/structure/filingcabinet,/obj/item/weapon/folder/documents,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage) "aGi" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage) @@ -1727,11 +1727,11 @@ "aHk" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "aHl" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplefull"},/area/medical/research{name = "Research Division"}) "aHm" = (/obj/machinery/camera{c_tag = "Research Division Access"; dir = 2; network = list("SS13")},/obj/machinery/shower{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"aHn" = (/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/toxins/telesci) -"aHo" = (/obj/item/weapon/book/manual/wiki/telescience{pixel_y = 8},/obj/structure/table,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/toxins/telesci) -"aHp" = (/obj/machinery/computer/telescience,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/toxins/telesci) -"aHq" = (/obj/machinery/door_control{id = "telescipub"; name = "Public Shutters"; pixel_x = 0; pixel_y = 0},/obj/structure/table,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitecorner"},/area/toxins/telesci) -"aHr" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/telesci) +"aHn" = (/obj/machinery/door_control{id = "telelab"; name = "Test Chamber Blast Doors"; pixel_x = -25; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"},/area/toxins/explab) +"aHo" = (/obj/machinery/computer/rdconsole/experiment,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 1},/area/toxins/explab) +"aHp" = (/obj/structure/table,/obj/item/weapon/book/manual/research_and_development,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitecorner"},/area/toxins/explab) +"aHq" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/explab) +"aHr" = (/obj/structure/table,/obj/machinery/door_control{id = "explab"; name = "Test Chamber Blast Doors"; pixel_x = 0; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitecorner"},/area/toxins/explab) "aHs" = (/obj/machinery/light_switch{pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/ai_monitored/nuke_storage) "aHt" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/nuke_storage) "aHu" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/nuke_storage) @@ -1799,8 +1799,8 @@ "aIE" = (/obj/machinery/light/small{dir = 8},/obj/structure/closet/firecloset,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "aIF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplefull"},/area/medical/research{name = "Research Division"}) "aIG" = (/obj/structure/sign/securearea{pixel_x = 32; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"aIH" = (/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/engine,/area/toxins/telesci) -"aII" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/turf/simulated/floor/plating,/area/toxins/telesci) +"aIH" = (/obj/machinery/door/poddoor/preopen{id = "explab"; name = "test chamber blast door"},/turf/simulated/floor/engine,/area/toxins/explab) +"aII" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/machinery/door/poddoor/preopen{id = "explab"; name = "test chamber blast door"},/turf/simulated/floor/plating,/area/toxins/explab) "aIJ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{burnt = 1; icon_state = "panelscorched"; tag = "icon-panelscorched"},/area/maintenance/fore) "aIK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/nuke_storage) "aIL" = (/obj/machinery/power/apc{dir = 8; name = "Vault APC"; pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera/motion{c_tag = "Vault"; dir = 4; name = "motion-sensitive security camera"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/ai_monitored/nuke_storage) @@ -1876,7 +1876,7 @@ "aKd" = (/obj/structure/closet/emcloset,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) "aKe" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplefull"},/area/medical/research{name = "Research Division"}) "aKf" = (/obj/machinery/shower{dir = 8},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/medical/research{name = "Research Division"}) -"aKg" = (/turf/simulated/floor/engine,/area/toxins/telesci) +"aKg" = (/turf/simulated/floor/engine,/area/toxins/explab) "aKh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/decal/cleanable/dirt,/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/weapon/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/turf/simulated/floor/plating,/area/maintenance/fore) "aKi" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/ai_monitored/nuke_storage) "aKj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ai_monitored/nuke_storage) @@ -1937,9 +1937,9 @@ "aLm" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/assembly/chargebay) "aLn" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/assembly/chargebay) "aLo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) -"aLp" = (/obj/item/device/radio/beacon,/turf/simulated/floor/engine,/area/toxins/telesci) -"aLq" = (/obj/machinery/telepad,/turf/simulated/floor/engine,/area/toxins/telesci) -"aLr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/engine,/area/toxins/telesci) +"aLp" = (/obj/machinery/r_n_d/experimentor,/turf/simulated/floor/engine,/area/toxins/explab) +"aLq" = (/obj/item/device/radio/beacon,/turf/simulated/floor/engine,/area/toxins/explab) +"aLr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/engine,/area/toxins/explab) "aLs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/item/weapon/newspaper,/turf/simulated/floor/plating,/area/maintenance/fore) "aLt" = (/obj/structure/closet/secure_closet/freezer/money,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage) "aLu" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage) @@ -2037,7 +2037,7 @@ "aNi" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) "aNj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "aNk" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/mob/living/simple_animal/hostile/mimic/crate,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"aNl" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteyellow"},/area/medical/chemistry) +"aNl" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/hallway/primary/starboard) "aNm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/toxins/lab) "aNn" = (/turf/simulated/floor/plasteel{tag = "icon-purple (NORTHWEST)"; icon_state = "purple"; dir = 9},/area/hallway/primary/central) "aNo" = (/turf/simulated/floor/plasteel{tag = "icon-purple (NORTH)"; icon_state = "purple"; dir = 1},/area/hallway/primary/central) @@ -2051,7 +2051,7 @@ "aNw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{tag = "icon-purplecorner (NORTH)"; icon_state = "purplecorner"; dir = 1},/area/hallway/primary/starboard) "aNx" = (/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "aNy" = (/turf/simulated/floor/plasteel{tag = "icon-purplecorner (EAST)"; icon_state = "purplecorner"; dir = 4},/area/hallway/primary/starboard) -"aNz" = (/obj/machinery/door/firedoor,/obj/machinery/door/poddoor/shutters{id = "telescipub"; name = "Telescience Shutters"},/turf/simulated/floor/engine,/area/toxins/telesci) +"aNz" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whiteyellow"},/area/medical/chemistry) "aNA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fore) "aNB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/robot_debris{tag = "icon-gib7"; icon_state = "gib7"},/obj/item/device/assembly/timer,/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/maintenance/fore) "aNC" = (/obj/structure/sign/securearea{pixel_x = 0; pixel_y = -32},/obj/machinery/light/small,/obj/machinery/camera{c_tag = "EVA Maintenance"; dir = 1; network = list("SS13")},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fore) @@ -2100,9 +2100,9 @@ "aOt" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "aOu" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) "aOv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel,/area/hallway/primary/starboard) -"aOw" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 8},/area/hallway/primary/starboard) -"aOx" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/primary/starboard) -"aOy" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{icon_state = "warningcorner"; dir = 4},/area/hallway/primary/starboard) +"aOw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -4; pixel_y = -3},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"aOx" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellow"},/area/medical/chemistry) +"aOy" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "aOz" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fore) "aOA" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fore) "aOB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva{name = "E.V.A. Storage"}) @@ -2232,7 +2232,7 @@ "aQV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/maintenance/disposal) "aQW" = (/turf/simulated/floor/plating,/area/maintenance/fpmaint{name = "Medical Maintenance"}) "aQX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/maintenance/fpmaint{name = "Medical Maintenance"}) -"aQY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) +"aQY" = (/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/pill/patch/silver_sulf{pixel_x = -3; pixel_y = -8},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "aQZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "aRa" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "45"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "aRb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"}) @@ -2244,7 +2244,7 @@ "aRh" = (/obj/machinery/mineral/stacking_machine{input_dir = 1; stack_amt = 10},/turf/simulated/floor/plating,/area/maintenance/disposal) "aRi" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay{name = "Medbay Central"}) "aRj" = (/obj/machinery/chem_master,/turf/simulated/floor/plasteel{tag = "icon-whiteyellow (SOUTHWEST)"; icon_state = "whiteyellow"; dir = 10},/area/medical/chemistry) -"aRk" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellow"},/area/medical/chemistry) +"aRk" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "aRl" = (/obj/machinery/chem_master,/turf/simulated/floor/plasteel{dir = 6; icon_state = "whiteyellow"},/area/medical/chemistry) "aRm" = (/turf/simulated/floor/plasteel{icon_state = "yellow"; dir = 10},/area/hallway/primary/central) "aRn" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warning"},/area/hallway/primary/central) @@ -2358,6 +2358,8 @@ "aTr" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=2-SECentral"; location = "1-Medbay1"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "aTs" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=0-Escape"; location = "9-Medbay2"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) "aTt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fpmaint{name = "Medical Maintenance"}) +"aTu" = (/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/device/electropack,/obj/item/device/assembly/signaler,/obj/item/weapon/razor{pixel_x = -6},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/security/prison) +"aTv" = (/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aTw" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/shuttle/plating,/area/space) "aTx" = (/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating,/area/space) "aTy" = (/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor,/area/space) @@ -3086,7 +3088,6 @@ "bhC" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/wood,/area/library) "bhD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/library) "bhE" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/wood,/area/library) -"bhF" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/librarypubliccomp,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "bhG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall,/area/library) "bhH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/oil,/obj/item/trash/candy,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "bhI" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/hydroponics) @@ -3245,7 +3246,6 @@ "bkF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "bkG" = (/obj/machinery/camera{c_tag = "Engineering Access"},/turf/simulated/floor/plasteel,/area/engine/engineering) "bkH" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/engine/chiefs_office) -"bkI" = (/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -8},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "bkJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "bkK" = (/obj/machinery/light,/obj/machinery/camera{c_tag = "Chief Engineer's Office"; dir = 1; network = list("SS13")},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "bkL" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{dir = 8; icon_state = "warning"},/area/quartermaster/storage) @@ -3267,7 +3267,6 @@ "blb" = (/obj/machinery/door/window/northright{base_state = "left"; dir = 8; icon_state = "left"; name = "Library Desk Door"; req_access_txt = "37"},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/wood,/area/library) "blc" = (/obj/machinery/light_switch{pixel_y = -25},/turf/simulated/floor/wood,/area/library) "bld" = (/obj/machinery/newscaster{pixel_y = -28},/obj/machinery/camera{c_tag = "Library South"; dir = 1; network = list("SS13")},/obj/machinery/light,/turf/simulated/floor/wood,/area/library) -"ble" = (/obj/machinery/librarycomp{pixel_y = 0},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/structure/table/wood,/turf/simulated/floor/wood,/area/library) "blf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/item/weapon/stock_parts/manipulator,/turf/simulated/floor/plating{burnt = 1; icon_state = "panelscorched"; tag = "icon-panelscorched"},/area/maintenance/fsmaint2) "blg" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/hydroponics) "blh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Hydroponics"; req_access_txt = "35"},/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hydroponics) @@ -4969,7 +4968,6 @@ "bRN" = (/obj/structure/stool,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "chapel"},/area/chapel/main) "bRO" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/fancy/carpet,/area/chapel/main) "bRP" = (/obj/machinery/bot/secbot/beepsky{desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey, and with a sturdier reinforced chassis, too. "; health = 45; maxhealth = 45; name = "Officer Beepsky"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-Medbay1"; location = "0-Escape"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft) -"bRQ" = (/obj/structure/table,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/item/device/electropack,/obj/item/device/assembly/signaler,/obj/item/weapon/razor{pixel_x = -6},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitehall"},/area/security/prison) "bRR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel,/area/security/prison) "bRS" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/obj/machinery/door_control{id = "permacell1"; name = "Cell 1 Lockdown"; pixel_x = -4; pixel_y = -25; req_access_txt = "2"},/obj/machinery/flasher_button{id = "PCell 1"; pixel_x = 6; pixel_y = -24},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "redcorner"},/area/security/prison) "bRT" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/computer/security/telescreen{desc = "Used for watching Prison Wing holding areas."; dir = 1; name = "Prison Monitor"; network = list("Prison"); pixel_x = 0; pixel_y = -30},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/prison) @@ -5291,7 +5289,6 @@ "bXX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "barber"},/area/security/prison) "bXY" = (/obj/machinery/shower{dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/prison) "bXZ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/security/prison) -"bYa" = (/obj/structure/table,/obj/machinery/librarycomp{pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "bYb" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "arrival"; dir = 8},/area/hallway/secondary/entry{name = "Arrivals"}) "bYc" = (/obj/structure/stool/bed/chair,/obj/effect/landmark{name = "JoinLate"},/turf/simulated/shuttle/floor,/area/space) "bYd" = (/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel,/area/security/prison) @@ -5618,22 +5615,22 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahJaaaajjarYajlaaaajjarYajlaaaajjarYajlaacajjarYajlaacaaAaacaacaacaccaccaccacUadpaseaseaseaseaseaxXaxYaxZayaaybavyavyawQaycaydayeayfasoaygavGavGavGayhayiavGayjasoatqaykaylaymaynayoaxfanYakxagTaypayqavZawaayraysawdaytayuayvayvayvaoLaywayxayyayzayAayBayCayDayEayFayGayHayIayJayKayLayMayNayOayNayPauyayQayRaySayTayUahEaaaayVayWayXayYayZaaaarUazaazbazcazdazeawCawDawDawDazfaxRazgaxQaxQaxRaxQaxQazhaqzaaaaqzaziazjaxWamEaacapoaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaajjarYajlaacajjarYajlaacajjarYajlaaaajjarYajlaaaaaAaaaabDazkazlazmaznazoazpazqazrazsaztazuaztaztaztazvaseavyazwawQazxazyazzazAasoazBavGavGavGazCayiazCazDasoaspaykazEaymazFazGaxfanYakxagTagTagDazHagDagTagTaoLaoLaoLaacaacaacaoLazIazJawjazKazLazMazNazOaxwasNauRakxawnazPazQazRazSagXazTagXazUawuazVarUazWazXazYahEaaaazZaAaaAbaAcayZaaaarUaAdaAeaAfaAgaAhaAiaAjaAkaAlaAmaAmaAkaAkaAnaxRaAoaAlaApawCaAqaAraAsaxWaxWamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaajjaAtajlaacajjaAtajlaacajjaAtajlaaaajjaAtajlaaaaaAaaaaaaaacacGacIacIaeXaAuaAvaAwaAxaseaAyaAzaseaAAaAyaseaABavyawQaACaADaAEaAFasoaAGavGavGaAHaAIaAJaAKaALasoaAMaANaAOaAPaAQaARaxfaASakxagXaATaAUaAVaAWaATagXaAXaAYawuaAZaAZaAZawuaBaawuawjaxwaxwaBbaxwaxwaxwasNauRaBcaBdaBdaBdaBdaBdaBdaBdawuawuawuaBearUahEaBfahEaBgaBgaBhaBiaBjaBkaBlaBmarUatOatWaBnazgaBoaqzaBpaBqaBraBsaBtaBqaxQaBuaxRaBuaBvaBwaqzaaaamEamEamEamEamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaaaaaaaaacaacaaaaaaaaaaaaaaaaacaacaaaaaaaaaaacaaaahJaaaaacaacacUaBxacYaByaBzaBAaBBaBCaseaBDaBEaseaBFaBGaseavyavyawQaBHaBIaBJaBKasoaBLaBLaBMaBLaBLaBLaBLaBLasoaBNaBOaBPaBQaBQaBRaBSaBTaBUaBVaBVaBWaBXaBXaBXaBYaBXaBXaBZaBVaBVaCaaCbaCcaCdaCeaCeaCeaCfaCgaCgaCgaChauRakxaCiaCjaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuaCvamhaCwaCxaCyaCzaCAaCBaCCaBmaCDaCEaCFaCGaCHaCIaqzaCJaCKaCLaCMaCNaCOaCPaBuaCQaCRaxPaCSaveaxTaxUaCTaCUaCUamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaAaaAahJaaAahJaaAaaAaaAaaAaaAaaAaaAaaAahJaaAaaAaaAaaAaaaaaaaaaacUaCVaseaseaCWasYasYasYaCXaCYaCZaseaDaaCYaseavyavyawQaDbaDbaDcaDbaDdaDeaDfavGaDgaBLaDhaDiaDjaseaspaykaylaDkaDlaDmaxfaDnaDoaDnaDnaDpaDnaDnaDnaDnaDoaDnaDpaDqaDnaDnaDnaDraDsaDnaDnaDnaDtaDuaDnaDoauRauRakxaDvaDwaDxaDwaDyaDzaDAaDBaDCaDDaDEaipaDFaDGaDHaDIaDJaDKaDLaDMaDNaDOaBmaDPaDQaDRaDSaxQaDTaqzaBpaDUaBraxQaBsaDVaDWaBuaxQaBuaDXaDYaqzaaaaqzaDZaEaaCUamEaacaaAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaaaaacacUaifaseaEbaEcaEdaEeaEfaEgaEhaEiasYaEjaEhaseavyavyawQaEkaElaEmaEnaDdaEoaEpavGaEqaEraEsaEtaEuaEvaEwaExaylaDkaDlaDmaEyaEyaEyaEyaEzaEAaEzaEyaEyaEBaEBaECaEDaEEaEBaEBaEBaEBaEBaEFaEFaEFaEGaEFaEFaEFavRaEHavRaEIaEJaEKaELaEMaENaBdaEOaEPaEQaEQaEQaEQaEQaEQaERaESaBmaETaEUaEVaEWaBmaEXanSatWaEYaxQaDTaqzaEZaFaaCNaFbaCLaFcaFdaBuaAoaFeaFfaFgawCaAqaAraFhaCUaCUamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacacUaFiaseaFjavyaFkaFlaFmaFnaFoaFpaFqavyavyaFravyavyawQaFsaFtaFuaFvaFwavGaFxaFyavIaFzaFAaFBaFCasYaFDaFEaylaDkaFFaDmaEyaFGaFHaFIaFJaFKaFLaFMaEyaFNaFOaFPaFQaFRaFSaFTaFUaFVaEBaFWaFXaFYaFZaGaaGaaGbawuaGcawuaBdaGdaDwaGeaDwaGfaBdaGgaEPaGhaGiaGjaGkaGlaEQaGmaGnaGoaGpaGqaEVaGraBmaGsaGtatWaqzaqzaGuaqzaGvaFaaGwaxQaCLaFcaGxaBuaBuaxQaxQaGyaqzaaaamEamEamEamEamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacacUadpaseaGzaGAaGBaGCaGDaGEaEtaEtaGFaEtaEtaGGaGHaGIawQaGJaFvaFvaGKaDdaGLaAHaGMaGNaDdaGOaGPaGQaGRaGRaGRaGSaGSaGSaGSaGSaGTaGUaGVaFJaGWaGXaGYaEyaGZaHaaHbaHcaHdaHeaHeaHeaHeaHfaGaaHgaHhaHiaHhaHjaGbaHkaHlaHmaBdaHnaHoaHpaHqaHraBdaoNaEPaHsaHtaHuaHuaHvaHwaHxaHyaBmaHzaHAaEVaHBaBmaHCaHDatWaHEaHFaHGaHFaHHaFaaHIaxQaHJaFcaHKaBuaHLaAkaAkaHMaHNaHOaHPaHQaHRaHRamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaaaaaaaaacaacaaaaaaaaaaaaaaaaacaacaaaaaaaaaaacaaaahJaaaaacaacacUaBxacYaByaBzaBAaBBaBCaseaBDaBEaseaBFaBGaseavyavyawQaBHaBIaBJaBKasoaBLaBLaBMaBLaBLaBLaBLaBLasoaBNaBOaBPaBQaBQaBRaBSaBTaBUaBVaBVaBWaBXaBXaBXaBYaBXaBXaBZaBVaBVaCaaCbaCcaCdaCeaCeaCeaCfaCgaCgaCgaChauRakxaCjaCiaClaCkaCnaCmaCoaCpaCqaCraCsaCtaCuaCvamhaCwaCxaCyaCzaCAaCBaCCaBmaCDaCEaCFaCGaCHaCIaqzaCJaCKaCLaCMaCNaCOaCPaBuaCQaCRaxPaCSaveaxTaxUaCTaCUaCUamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaAaaAahJaaAahJaaAaaAaaAaaAaaAaaAaaAaaAahJaaAaaAaaAaaAaaaaaaaaaacUaCVaseaseaCWasYasYasYaCXaCYaCZaseaDaaCYaseavyavyawQaDbaDbaDcaDbaDdaDeaDfavGaDgaBLaDhaDiaDjaseaspaykaylaDkaDlaDmaxfaDnaDoaDnaDnaDpaDnaDnaDnaDnaDoaDnaDpaDqaDnaDnaDnaDraDsaDnaDnaDnaDtaDuaDnaDoauRauRakxaDwaDvaDxaDvaDzaDyaDAaDBaDCaDDaDEaipaDFaDGaDHaDIaDJaDKaDLaDMaDNaDOaBmaDPaDQaDRaDSaxQaDTaqzaBpaDUaBraxQaBsaDVaDWaBuaxQaBuaDXaDYaqzaaaaqzaDZaEaaCUamEaacaaAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaaaaacacUaifaseaEbaEcaEdaEeaEfaEgaEhaEiasYaEjaEhaseavyavyawQaEkaElaEmaEnaDdaEoaEpavGaEqaEraEsaEtaEuaEvaEwaExaylaDkaDlaDmaEyaEyaEyaEyaEzaEAaEzaEyaEyaEBaEBaECaEDaEEaEBaEBaEBaEBaEBaEFaEFaEFaEGaEFaEFaEFavRaEHavRaEJaEIaELaEKaENaEMaBdaEOaEPaEQaEQaEQaEQaEQaEQaERaESaBmaETaEUaEVaEWaBmaEXanSatWaEYaxQaDTaqzaEZaFaaCNaFbaCLaFcaFdaBuaAoaFeaFfaFgawCaAqaAraFhaCUaCUamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacacUaFiaseaFjavyaFkaFlaFmaFnaFoaFpaFqavyavyaFravyavyawQaFsaFtaFuaFvaFwavGaFxaFyavIaFzaFAaFBaFCasYaFDaFEaylaDkaFFaDmaEyaFGaFHaFIaFJaFKaFLaFMaEyaFNaFOaFPaFQaFRaFSaFTaFUaFVaEBaFWaFXaFYaFZaGaaGaaGbawuaGcawuaBdaGdaDvaGeaDvaGfaBdaGgaEPaGhaGiaGjaGkaGlaEQaGmaGnaGoaGpaGqaEVaGraBmaGsaGtatWaqzaqzaGuaqzaGvaFaaGwaxQaCLaFcaGxaBuaBuaxQaxQaGyaqzaaaamEamEamEamEamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacacUadpaseaGzaGAaGBaGCaGDaGEaEtaEtaGFaEtaEtaGGaGHaGIawQaGJaFvaFvaGKaDdaGLaAHaGMaGNaDdaGOaGPaGQaGRaGRaGRaGSaGSaGSaGSaGSaGTaGUaGVaFJaGWaGXaGYaEyaGZaHaaHbaHcaHdaHeaHeaHeaHeaHfaGaaHgaHhaHiaHhaHjaGbaHkaHlaHmaBdaHnaHpaHoaHraHqaBdaoNaEPaHsaHtaHuaHuaHvaHwaHxaHyaBmaHzaHAaEVaHBaBmaHCaHDatWaHEaHFaHGaHFaHHaFaaHIaxQaHJaFcaHKaBuaHLaAkaAkaHMaHNaHOaHPaHQaHRaHRamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUajWaseaHSavyaHTaHUaHVaHWaHWaHWaHWaHWaHWaHWaHXazwawQaHYaHZaHZaHYaDdaBLaBLaBLaBLaBLaIaaIbaIcaIdaIeaIgaIfaIiaIhaIjaIkaIlaImaIlaInaIoaIpaIqaEyaIraHbaHbaIsaItaIuaIuaIvaIwaIxaIyaHgaIzaIAaIBaICaIDaIEaIFaIGaBdaIHaIIaIIaIIaIIaBdaIJaIKaILaIMaINaIOaIPaIQaIRaISaBmaITaIUaEVaIVaBmaHCaIWatWaIXaxQaDTaxQaIYaIZaJaaxQaJbaJcaJdaBuaxQaxQaxQaJeaqzaaaaqzaJfaJgaHRamEaacaaAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUadpaseaJhaJiaJjaJkaJlaHWadPaJnaJoaJpaJqaJravyavyaJsaJtavyavyaJuaJvaJwaJxaJxaJyaJxaJzaJAaJBaJCaJDaJEaJFaJHaJHaJGaJJaJKaJLaJMaJKaJNaJOaJPaJQaJRaJSaJSaJTaJUaJVaJVaJWaJXaIxaJYaHgaJZaKaaJZaKbaKcaKdaKeaKfaBdaKgaKgaKgaKgaKgaBdaKhaEPaKiaHuaHuaKjaHvaHwaKkaKlaBmaKmaEVaKnaKoaBmaKpaKqatWaKraxQaDTaxQaIYaxQaKsaKtaKuaKvaKwaKxaAkaAkaAkaKyaHNaHOaKzaKAaHRaHRamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUadpaseaseaseaKBaHWaHWaHWaKCaKDaKEaKFaKGaJravyavyaKHavyavyavyavyavyaFravyaKIaKJaKKaFlaKLaJmaKNaKOaKPaJIaKOaKOaKOaIkaKSaKTaKUaKVaKWaKXaKYaKZaLaaLbaLaaLcaLdaLeaLfaLgaLhaLiaLjaLjaLkaLlaLmaLnaGbaLoaGcagXaBdaKgaLpaLqaKgaLraBdaLsaEPaLtaLuaLvaLwaGiaEQaLxaLyaBhaBhaBhaBhaBhaBhaLzaLzatWatWatWaLAaxQaIYaxQaDTaxQaLBaLCaLDaBuaAoaLEaLFaCIaqzaaaamEamEamEamEamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUadpaseaseaseaKBaHWaHWaHWaKCaKDaKEaKFaKGaJravyavyaKHavyavyavyavyavyaFravyaKIaKJaKKaFlaKLaJmaKNaKOaKPaJIaKOaKOaKOaIkaKSaKTaKUaKVaKWaKXaKYaKZaLaaLbaLaaLcaLdaLeaLfaLgaLhaLiaLjaLjaLkaLlaLmaLnaGbaLoaGcagXaBdaKgaLqaLpaKgaLraBdaLsaEPaLtaLuaLvaLwaGiaEQaLxaLyaBhaBhaBhaBhaBhaBhaLzaLzatWatWatWaLAaxQaIYaxQaDTaxQaLBaLCaLDaBuaAoaLEaLFaCIaqzaaaamEamEamEamEamEaaaaaAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUaLGaLHaLIaLJaLKaHWaLLaHWaLMaLNaLOaLPaLQaLRaLSaLSaLTaLUavyavyavyavyaLVavyaLWaLXaLWavyaLYaKQaMaaLZaMcaMbaMgaMgaMdaMiaMjaMkaMlaMmaMnaMoaMnaMpaIxaMqaIxaMraMsaMtaMuaMvaMwaEBaMxaMyaMzaGbaMAaMBaGbaMCaMDaMEaBdaKgaKgaKgaKgaKgaBdaMFaMGaMHaMHaMHaMIaEQaEQaHyaHyaMJaaaaacaaaaaaaacaaaaaaaacaaaatWaMKaxQaIYaxQaDTaAoaMLaAkaAkaFfaFfaLEaLFaMMatWaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzacIacIacJadpaMNaHWaMOaMPaMQaMRaMSaMTaMUaJraMVaMWaMXaMYaMZaNaaNbaNcaseaNdaNeaNfaNgaMeaNiaseaGRaMfaKOaJIaKOaKOaMhaGSaMmaMmaNmaMmaNnaNoaNpaNqaNnaNoaNpaMraMraNraMraMraMraMraGbaGbaNsaGbaNtaNuaNvaNwaNxaNyaBdaBdaNzaNzaNzaBdaBdaNAaNBaNCaNDaNEaNFaNGaBgaNxaNxaMJaaaaNHaNHaNHaNHaNHaNHaNHaaaatWaNIaNJaNKaNJaNLaNMaNNaNOaNJaNJaNJaNJaNJaNPatWaacaaAaaAaaAaaAaaAaacatZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUadpaNQaHWaHWaHWaHWaNRaHWaNSaHWaHWaseaseaNTaNUaNVaNWaNXaNWaNVaNYavyaNZaOaaIaaIbaOcaGRaNhaKOaNjaKOaNkaGRaGRaOgaOhaOiaOjaOkaOhaOlaOmaOkaOhaOlaOnaOoaOpaOkaOhaOhaOqaNxaNxaNxaOraNxaOsaNxaOtaOuaOuaOvaOwaOxaOxaOxaOyaOzaOAaOBaOCaODaOCaOEaOFaBgaNxaHyaMJaacaNHaOGaOHaOIaOJaOKaNHaacatWaOLaxQaOMaONaOOaOPaKwaOQaORaOSaOTaOUaOVaOWatWaacaacaaaaacaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacacUaOXaOYacYaOZaPaaseaPbaPcaPdaPeaPfaPfaNeaPgaPhaNVaPiaPjaPkaNWaPlavyaPmaPnaIaaIbaKMaIkaPoaNlaKRaNlaPqaIkaPraPsaPtaPuaOhaOhaOhaOhaOhaOhaOhaOhaOhaOhaPvaOhaOhaOhaOqaNxaNxaNxaNxaPwaPxaNxaPyaPzaPzaPzaPzaPAaNxaPBaPCaOCaOCaOBaPDaPEaPFaOEaOCaOCaHyaNxaMJaaaaNHaPGaPHaPIaPJaPKaNHaaaatWaPLaPLaPMaPLaPLaPNaPOaPPaPLatWatWatWatWatWatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzacIacIacJadpaMNaHWaMOaMPaMQaMRaMSaMTaMUaJraMVaMWaMXaMYaMZaNaaNbaNcaseaNdaNeaNfaNgaMeaNiaseaGRaMfaKOaJIaKOaKOaMhaGSaMmaMmaNmaMmaNnaNoaNpaNqaNnaNoaNpaMraMraNraMraMraMraMraGbaGbaNsaGbaNtaNuaNvaNwaNxaNyaBdaBdaBdaBdaBdaBdaBdaNAaNBaNCaNDaNEaNFaNGaBgaNxaNxaMJaaaaNHaNHaNHaNHaNHaNHaNHaaaatWaNIaNJaNKaNJaNLaNMaNNaNOaNJaNJaNJaNJaNJaNPatWaacaaAaaAaaAaaAaaAaacatZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacacUadpaNQaHWaHWaHWaHWaNRaHWaNSaHWaHWaseaseaNTaNUaNVaNWaNXaNWaNVaNYavyaNZaOaaIaaIbaOcaGRaNhaKOaNjaKOaNkaGRaGRaOgaOhaOiaOjaOkaOhaOlaOmaOkaOhaOlaOnaOoaOpaOkaOhaOhaOqaNxaNxaNxaOraNxaOsaNxaOtaOuaOuaOvaOuaOuaOuaOuaNlaOzaOAaOBaOCaODaOCaOEaOFaBgaNxaHyaMJaacaNHaOGaOHaOIaOJaOKaNHaacatWaOLaxQaOMaONaOOaOPaKwaOQaORaOSaOTaOUaOVaOWatWaacaacaaaaacaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacacUaOXaOYacYaOZaPaaseaPbaPcaPdaPeaPfaPfaNeaPgaPhaNVaPiaPjaPkaNWaPlavyaPmaPnaIaaIbaKMaIkaPoaNzaKRaNzaPqaIkaPraPsaPtaPuaOhaOhaOhaOhaOhaOhaOhaOhaOhaOhaPvaOhaOhaOhaOqaNxaNxaNxaNxaPwaPxaNxaPyaPzaPzaPzaPzaPAaNxaPBaPCaOCaOCaOBaPDaPEaPFaOEaOCaOCaHyaNxaMJaaaaNHaPGaPHaPIaPJaPKaNHaaaatWaPLaPLaPMaPLaPLaPNaPOaPPaPLatWatWatWatWatWatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaPQaPQaPQaPRaPSaPSaPTaPUaPVaseaPWavyaJjaGHavyavyaNeaPXaPhaNVaPYaPZaQaaNWaQbaQcaQdaQeaIaaIbaKMaQfaQgaKOaKRaKOaQhaQiaQjaOhaOhaQkaQlaQlaQlaQlaQlaQlaQlaQlaQlaQmaQnaOhaOhaOhaOqaNxaNxaQoaNxaNxaNxaNxaQpaNxaNxaNxaNxaQqaNxaQraNxaOCaQsaQtaQuaQvaQwaQxaQyaOCaQzaNxaMJaaaaNHaQAaQBaQCaQBaQDaNHaaaatWaQEaQEaQFaQGaQHaQIaQJaQKaQLaQMaQNaQOaQPatWaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaaaaPQaQQaQRaQSaQTaQUaQVaQWaQXaseaQYavyaQZaGAavyavyaRaaRbaPhaNVaRcaRdaReaNWaRfaRfaRgaRfaObaRiaKMaIkaRjaOdaKRaOdaRlaIkaRmaOgaOhaRnaRoaRoaRoaRoaRoaRoaRoaRoaRoaRpaOhaOhaOhaRqaRraRraRraRraRraRraRsaRtaRuaRvaRwaRraRraRraRxaRxaRxaOCaQsaRyaRzaRAaRzaRBaQyaOCaHyaHyaMJaaaaNHaRCaRDaREaRDaRFaNHaaaatWaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaRQaRRaRSatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaaaaPQaQQaQRaQSaQTaQUaQVaQWaQXaseaOwavyaQZaGAavyavyaRaaRbaPhaNVaRcaRdaReaNWaRfaRfaRgaRfaObaRiaKMaIkaRjaOdaKRaOdaRlaIkaRmaOgaOhaRnaRoaRoaRoaRoaRoaRoaRoaRoaRoaRpaOhaOhaOhaRqaRraRraRraRraRraRraRsaRtaRuaRvaRwaRraRraRraRxaRxaRxaOCaQsaRyaRzaRAaRzaRBaQyaOCaHyaHyaMJaaaaNHaRCaRDaREaRDaRFaNHaaaatWaRGaRHaRIaRJaRKaRLaRMaRNaROaRPaRQaRRaRSatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaRTaRUaRVaRVaRVaRWaQVaebaRXaseaRYaRZaSaavyavyavyaNeaSbaPhaNVaScaSdaSeaNWavyavyaCYavyavyaSfaSgaGRaOeaKOaKRaKOaOfaGRaGRaPsaOhaRnaRoaSkaSlaSmaSnaSmaSoaSpaRoaSqaQlaSraOhaOhaRraSsaStaSuaSvaSwaSxaSxaSyaSzaSzaSAaSBaRraNxaNxaSCaOCaSDaSEaSFaSGaSHaSIaSJaOCaHyaHyaMJaacaNHaSKaSLaSMaSNaSOaNHaacatWaSPaSPaSQaxQaxQaBuaSRaSSaSTaSUaSVaSWaSXatWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaRTaSYaSZaPpaRVaRhaQVaebaTbaseaTcaTdaTeaTfaTgaThaNeaTiaTjaNVaTkaTlaTmaNWaTnaToaToaTpavyavyaTqaGRaRkaSiaShaTaaSjaGRaGRaOhaOhaRnaRoaTwaTxaTyaTyaTyaTzaTAaRoaRoaRoaRpaOhaOhaRraTBaSxaSxaSxaSxaTCaSxaSxaSxaSxaTDaTEaRraNxaNxaNxaOCaTFaTGaTHaTIaTHaTJaTKaOCaNxaNxaMJaaaaNHaTLaNHaTMaNHaTNaNHaaaatWaTOaTOaTPaTQaTRaTSaTTaTUaTVaTWaTXaTYaTZatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaRTaSYaSZaPpaRVaRhaQVaebaTbaseaTcaTdaTeaTfaTgaThaNeaTiaTjaNVaTkaTlaTmaNWaTnaToaToaTpavyavyaTqaGRaOxaSiaShaTaaSjaGRaGRaOhaOhaRnaRoaTwaTxaTyaTyaTyaTzaTAaRoaRoaRoaRpaOhaOhaRraTBaSxaSxaSxaSxaTCaSxaSxaSxaSxaTDaTEaRraNxaNxaNxaOCaTFaTGaTHaTIaTHaTJaTKaOCaNxaNxaMJaaaaNHaTLaNHaTMaNHaTNaNHaaaatWaTOaTOaTPaTQaTRaTSaTTaTUaTVaTWaTXaTYaTZatWaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaacaacaRTaRTaRTaSYaPQaUaaUbbclaQVaebadpaseaEgaseaUdaseaUeaseaseaUfaUgaUhaUiaUjaUhaUhaUkavxavxavxaFraFravxaGRaGRaGRaGRaGRaGRaGRaGRaUmaOhaRnaRoaUnaUoaTzaTzaTzaTzaUpaUqaUraUqaOhaOhaOhaRtaUsaUtaUuaSxaUvaUwaUxaSxaSxaSxaUyaUzaRraNxaNxaNxaOCaUAaQwaUBaUCaUDaQwaUEaOCaNxaHyaMJaaaaacaUFaUGaUHaUIaUJaacaaaatWatWatWaUKaqzaULaUMaUNaUOaUPatWaUQaURaUSatWaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaUTaUUaUVaUWaUXaUYaUZaVaaVbaVcaVdaVeaVfacYaVgaVhaViaVjaVkaVlaVmaVnaVoaVpaVqaVjaVraVsaVsaVsaVsaVsaVsaVuaVvaVwaVxaVxaVxaVxaOqaOhaOhaRnaRoaTwaTxaVyaTzaTzaVzaVAaRoaRoaRoaRpaOhaVBaRraVCaVDaSxaSxaSxaVEaSxaVFaVGaSxaUyaVHaRraNxaNxaNxaOCaVIaVJaVKaVLaVKaVJaVMaOCaNxaNxaMJaMJaMJaVNaVOaVPaVOaVQaMJaMJaMJaVRaVSaNtaVTaVUaVVaVWaVXaVXatWaVYaVZaWaaWbaWbaWbaWbaWbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaPQaPQaPQaPQaPQaWcaWdaWeaPSaWfaWgaWhaWgaWgaWiaWjaWkaWlaWmaWnaWoaWpaWqaWraWsaWtaWuaTraVxaVxaVxaVxaVxaVxaVxaVxaVxaVxaVxaVxaOqaOhaOhaRnaRoaWyaSlaSmaSnaSmaSoaWzaRoaWAaWBaWCaWDaOhaRtaSxaWEaSxaSxaSxaWEaSxaSxaSxaSxaWFaSxaRtaNxaNxaNxaWGaWHaWHaWHaWHaWHaWHaWHaWIaPzaPzaWJaWKaWLaWMaWNaWOaWPaWQaWRaWRaWSaWTaNxaNxaNxaNxaNxaNxaNxaWUaWVaWWaWXaWYaWZaXaaXbaXcaWbabDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5647,10 +5644,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaXdaXdaXdaXdaXdbcabehbeibcabcabejbekbelbembenbeobepaVxaYbaVxaYcbeqbeqbeqbeqaZjberbesbesbesbesaYcbetbbjbeubevbewbcpbcpbcpbcpbexbeybdGbdGbdHbezbdGbdGbeAbdGbbpbeBbeCbeDbeEbeFbeGaXCbeHbeIaXCaXCbeJaNxbamaZwbanbanbanbanbanaZwbaobeKaZzaZzaZzaZzaZzaZCaZzbeLbeMaZEbeNbeObePbeQbeRaZEbeSbeTbeUbaAaZIbeVbcUaYObcUbeWbeXbeXbeXbeXbeXbeXbeXbeXbeXaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacbcabeYbeZbfabfbbfcbfdbfebcabffbfgbfhbfibembdobfjbfkaYbaVxaYcbflbdrbdrbdraZjbfmbdrbdrbdrbfnaYcbfobbjbfpbfqbfrbfsbfsbfsbcpbcpbftbdGbdGbfubfvbfwbfxbfybfzbbpbbpbfAbbpbfBbbpbbpaXCbfCbfDbfEaXCbfFaNxbamaZwbanbanbanbanbanaZwbaobfGbfHbfIbfJbfKbfLbfMbfNbfObfPaZEbfQbfRbdWbfSbfTaZEbfUbfVbfWbfXaZIaZIaZIbfYbfZaXObgabgbbgcbgdbgebgfbggbghbeXaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaabcabgibgjbgkbglbgmbgnbgobcabffbfgbgpbembgqbcabcabgrbgsbgtaYcbgubgubgubguaZjbfmbgvbgvbgvbgvaYcbgwbbjbgxbgybewbcpbcpbcpbgzbgAbbjbgBbdGbgCbfxbgDbgEbgFbgGbgHbgIbgJbgKbgLbgMbgNaXCbfCbgObgPaXCbgQaNxbambdPbanbanbanbanbanbdPbaobapbfHbgRbgSbgSbgTbgUbgSbgVbgWaZEbgXbgYbgZbhabdWaZEbhbbhcbhcbhdbhebhfbhgbhhbhibhjbhkbhlbhmbhnbgfbhobhpbhqbeXaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbcabhrbfabhsbhtbhubhvbhwbcabffbhxbfibfibembhybcabhzaYbbhAaYcbdrbdrbdrbdraZjbhBbhCbhDbhEbhFbhGbhHbbjbhIbhJbfrbfsbfsbfsbhKbfsbbjbhLbhMbhNbdGbezbdGbdGbdGbbpbhObhPbhQbhRbhSbhTaXCbhUbhVbhWaXCbgQaNxbhXaZwbanbanbanbanbanaZwbaobapbhYbgSbgSbhZbiabibbicbgVbidaZEbdWbdXbiebifbdWaZEbigbihbiibijbikbilaZIbimbinbiobipbiqbirbisbitbiubeXbeXbeXaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbcabhrbfabhsbhtbhubhvbhwbcabffbhxbfibfibembhybcabhzaYbbhAaYcbdrbdrbdrbdraZjbhBbhCbhDbhEaOybhGbhHbbjbhIbhJbfrbfsbfsbfsbhKbfsbbjbhLbhMbhNbdGbezbdGbdGbdGbbpbhObhPbhQbhRbhSbhTaXCbhUbhVbhWaXCbgQaNxbhXaZwbanbanbanbanbanaZwbaobapbhYbgSbgSbhZbiabibbicbgVbidaZEbdWbdXbiebifbdWaZEbigbihbiibijbikbilaZIbimbinbiobipbiqbirbisbitbiubeXbeXbeXaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaaaaaaaacaacbcabfabivbfabiwbixbiybfabcabizbiAbiBbiBbiBbiCbcabiDaYbbiEaYcbiFbdrbiGbiHbiIbiJbiKbiGbiLbiMbiNbiObbjbiPbiQbiRbcpbcpbcpbiSbfsbbjbiTbiUbiVbiWbiWbiWbiWbiWbiXbiYbiZbjabjbbjcbjdaXCbjebjfbjgaXCbjhaNxbjiaZwbanbanbanbanbanaZwbjjbjkbjlbjmbjnbjobjpbjqbjobjrbjsaZEaZEbjtaZEbjuaZEaZEbjvbjwbjxbjwbjwbjybjzbjAbjBbjCbeXbjDbjEbjFbgfbjGbeXaacaaaaaaaaaaaaaaaaacaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabcabcabcabcabcabcabcabjHbehbcbbcabcabjIbjJbjKbdobdobcabcabepaYbbjLaYcbjMbdrbiJbdrbdrbjNbjObiJbjPbjQbiNbetbbjbjRbjSbfsbfsbfsbfsbjTbjUbbjbjVbjWbdGbjXbjYbjZbkabkbbbpbkcbkdbkebKLbkgbkhaXCbkibkjbkkaXCbklaNxbjiaZwbanbanbanbanbanaZwbaobkmbfHbknbkobicbkpbkqbkrbgVbksbktbkubkvbfHbkwbkxbkybkzbjwbkAbkBbkCbkDbjzbkEbkFbkGbkHbkIbhmbkJbkKbgfbeXaacaaaaaaaaaaaaaaaaacaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdobkLbkMbkNbkObkPbkQbkRbkSbkTbkUbkVbkWbiBbiBbkXbkYbcabkZbepaYbaVxaYcblabdrblbblcbdrbldblebiJbjPbjQbiNblfbbjblgblhblgbbjbbjbbjblibbjbbjbbpbbpbbpbbpbbpbbpbbpbbpbbpbljbfAblkbllblmbbpaXCbeHblnaXCaXCbloaNxbjiaZwaZwaZwaZwaZwaZwaZwbaoblpbfHblqblrblsbltblsblublvblwblxblyblzblAblBblCblDblEblEblFblGblEblHblIblJblKblLbipblMblNblObhpblPbeXaacaacaaaaaaaacaaaaacaaaaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabcabcabcabcabcabcabcabjHbehbcbbcabcabjIbjJbjKbdobdobcabcabepaYbbjLaYcbjMbdrbiJbdrbdrbjNbjObiJbjPbjQbiNbetbbjbjRbjSbfsbfsbfsbfsbjTbjUbbjbjVbjWbdGbjXbjYbjZbkabkbbbpbkcbkdbkebKLbkgbkhaXCbkibkjbkkaXCbklaNxbjiaZwbanbanbanbanbanaZwbaobkmbfHbknbkobicbkpbkqbkrbgVbksbktbkubkvbfHbkwbkxbkybkzbjwbkAbkBbkCbkDbjzbkEbkFbkGbkHaQYbhmbkJbkKbgfbeXaacaaaaaaaaaaaaaaaaacaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdobkLbkMbkNbkObkPbkQbkRbkSbkTbkUbkVbkWbiBbiBbkXbkYbcabkZbepaYbaVxaYcblabdrblbblcbdrbldaRkbiJbjPbjQbiNblfbbjblgblhblgbbjbbjbbjblibbjbbjbbpbbpbbpbbpbbpbbpbbpbbpbbpbljbfAblkbllblmbbpaXCbeHblnaXCaXCbloaNxbjiaZwaZwaZwaZwaZwaZwaZwbaoblpbfHblqblrblsbltblsblublvblwblxblyblzblAblBblCblDblEblEblFblGblEblHblIblJblKblLbipblMblNblObhpblPbeXaacaacaaaaaaaacaaaaacaaaaaaaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablQbdobdoblRbemblSblTbemblUblVblWblXblWblYblZbmabembmbbmcbcabmdbepaYbaVxaYcaYcaYcaYcaYcbmeaYcaYcaYcbmfaYcbiNbetbbjbmgbmhbmibmjbmkbmlbmmbmkbmnbmobmpbmqbmrbmsbmtbmubmvbmwbmxbmybmzbmAbmBbmCbmDbmEbmFbmGbmHbmIbmJbmKbmLbmMbmNbmObmPbmQaZwbaobmRbmSbmTbmUbmVbmWbmXbmYbmZbnabnbbncbndbmSbnebnfbngbnhbnibnjbnkbnlbnmbnnbnobnpbnqbnrbnsbntbnubeXbeXbeXbjzbjzbjzbjzbjzbjzbjzbjzbjzbjzbjzbjzbjzbjzaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnvbnwbnvbnxbnybnzbnAbembnBbnCbnDbcabnEbnFbembnGbdobdobdobcabcabepaYbaVxbnHbnIbnJbnKaYcbnLbnMaYcbnNbnObnPbnQbnRbbjbnSbnTbnUbnVbnWbnXbnYbnZbbjboabobbobbnPbobbocbodbckboeboebofbogbohboiboiboibojboiboiboibokaNxbambdPbolbapbombapbonbdPbaobapbooboobooboobooboobooboobooboobooboobooboobopboqbjwborbosbotbjwbjwbjzboubovbowbeXboxboybozbeXboAbjzboBboCboDboCboEbjzbjzbjzboBboCboEboFboFbjzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboGboHboGboIbembnzboJboKbelbnCboLbcaboMbnFbemboNbdoboObemboPboQbepaYbboRboSboTboUboVaYcboWboXboYboZbpabpbbpcbpdbpebpfbpgbpebpebpfbpebphbpibpebpjbpbbpkbplbpmbpbbpnbpobppbpqbprbpsbptbpubpvbpwbpxbpybpzbpAbpBbpCbpDbpEbpEbpEbpEbpEbpFaZwbaobapbpGbpHboobpIbpJbpKboobpLbpMbpKboobpNbpNboobpObpPbjwbpQbpRbpSbpTbpUbjzbpVbpWbpXbpYbpZbqabqbbqcbqdbqcbqebqfbqgbqfbqhboCbqiboCbqjbqfbqgbqfboFbjzbqkaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5676,7 +5673,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaAafnaaabGDbJabGFaaabGDbJabGFaacbGDbJabGFaaabGDbJabGFaacaacaacaacbNUbNVbNVbNVbNVbNWbNXbNYbNZbOabObbOcbMRbOdbMTbLIbLJbLIbOebOfbLNbLNbOgbLPbKxaVxbOhbGSbOibOjbOkbOlbOmbOnbKBbOobOpbOqbOrbOsbOtbOubOvbOwbOxbMdccebNpbOzbNpccfbOAbOBbHnbNtbOCbODbOEbOFbOGbOHbOIbOIbOJbOKbOLbOMbONbOObMrbOPbLdbOQbNHbNHbOQbLfbNJbORbOSbOTbOUbLgbOVbjybOWbNRbOXbOYbjwbOZbPabPbbPbbPcbMMaaaaaaaacaaaaacagkaaaaaaaacbPdbPebPfbPgbPhaacafnaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaabGDbJabGFaaabGDbJabGFaaabGDbJabGFaacbGDbJabGFaacaaabNUbNUbNUbPibPjbPkbPlbEqbPmbPnbPobMTbMTbPpbMRbPqbMTbMUbPrbPsbLNbLNbLNbLNbLNbPtbKxaVxbhAbGSbPubPvbPvbPvbPwbPxbPxbPybPzbPAbPxbPxbPxbPxbPxbPxbPxbKKccgbPCbPDbNpcchbKKbPFbPGbMkbPHbPIbPJbPIbPKbPLbPMbPNbPObPPbPQbPRbPSbPTbMrbwfbLdbNGbPUbPVbNIbLfbNJbMxbPWbNLbPXbLgbPYbjybPZbQabQbbiibjwbQcbQdbQebQfbNRbMMaacaaaaaaaaaaaaaaaaaaaaaaacbQgbQhbQiaekaelaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbQjbQkbQlbQmbQnbQlbQmbQmbQnbQlbQmbQmbQnbQlbQmbQmbQnbQlbQmbQobQpbQqbQpbQrbQsbQtbQubQvbMTbMTbMTbMTbQwbQxbQybQzbMTbLIbQAbLNbLNbLNbQBbQCbQCbQDbQEbQFbQGbGSbOibOibOibQHbQIbPxbQJbQKbQLbQMbQNbQObQObQPbQQbQRbQSbKKbKKbKKbKKbQTbQUbKKbQVbQWbHnbQXbHnbQYbHnbHnbQZbRabRbbMrbRcbRdbRebPSbPTbMrbwfbLdbNGbRfbRgbNIbLfbwgbMxbRhbRibRjbRkbRlbjybRmbRnbRobRnbRpbRqbRrbRrbRsbRtbMMaacaacaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbGDbRwbGFaaabGDbRwbGFaacbGDbRwbGFaaabGDbRwbGFaacaaabNUbNUbNUbRxbRybRzbNVbRAbMTbRBbRCbRDbREbRFbRGbRHbRIbRJbRKbRLbRMbRNbRObLNbOgbLPbKxbRPbqxbGSbGSbGSbGSbGSbGTbPxbRQbRRbRSbRTbRUbRVbRWbRXbRYbRZbSabSbbScbSdbKKbSebSfbKKbSgbShbSibSjbSkbHnbSlbSmbSnbSobSpbMrbSqbSrbMrbMrbMrbMrbSsbStbSubSubSubSubSvbSwbLgbLgbSxbLgbLgbSybjybSzbSAbSBbSCbjwbSDbSEbSFbSGbSHbMMaacaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacbGDbRwbGFaaabGDbRwbGFaacbGDbRwbGFaaabGDbRwbGFaacaaabNUbNUbNUbRxbRybRzbNVbRAbMTbRBbRCbRDbREbRFbRGbRHbRIbRJbRKbRLbRMbRNbRObLNbOgbLPbKxbRPbqxbGSbGSbGSbGSbGSbGTbPxaTubRRbRSbRTbRUbRVbRWbRXbRYbRZbSabSbbScbSdbKKbSebSfbKKbSgbShbSibSjbSkbHnbSlbSmbSnbSobSpbMrbSqbSrbMrbMrbMrbMrbSsbStbSubSubSubSubSvbSwbLgbLgbSxbLgbLgbSybjybSzbSAbSBbSCbjwbSDbSEbSFbSGbSHbMMaacaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaAaacaaabGDbRwbGFaaabGDbRwbGFaaabGDbRwbGFaacbGDbRwbGFaacaacaacaacbNUbNVbNVbNVbNVbSIbMTbSJbSKbMTbSLbSMbSNbSObMTbSPbLJbSQbSRbSSbLNbLNbMYbLPbKxaVxbqxbSTaaaaacaaabSUbVZbPxbPxbSVbSWbPxbSXbSYbSWbSWbSXbSZbSWbSUbTabScbKKbKKbKKbKKbTbbTcbTdbTebTfbTgbThbTibTjbTkbTbbTlbTmbTnbTobTpbTobTqbwgbwgbTrbwgbwgbwgbwgbwgbTqbTobTsbjwbTtbTubTvblEblEblEblEblEbTwbjwbjwbMMbMMbMMaacaacaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacbGDbRwbGFaaabGDbRwbGFafnbGDbRwbGFaacbGDbRwbGFaaaaacaacaacaacaacaaaaacbEpbEqbMTbTxbTybMTbTzbTAbTBbTCbTDbTEbTFbTGbTHbTIbLNbLNbMYbLPbKxaVxbTJbSTaacaacaaabSUbPxbPxbTKbTLbTMbPxbTNbWObTPbSWbTQbTObTRbSUbScbScbScbTSbScbPxbTTbTUbTVbTWbTXbTYbTZbUabUbbUcbUdbTlbUebUfbwgbUgbwgbwgbwgbwgbUhbUibUibUibUjbUkbUkbUlbUmbUnbUobUpbUqbUrbUsbUtbijbfVbUubMMaacaacaacaaaaacaaaaaaaaaaaaaaaaaaaaaaaabUvbRvaaaaacbUvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahJaaabGDbRwbGFaaabGDbRwbGFaacbGDbRwbGFaaabGDbRwbGFaacaacaaaafnaaaaaaaaaaaabEpbEqbMTbMTbUwbMTbMTbMTbUxbUxbMTbLIbUybUzbUAbUAbUBbUBbUAbUAbUCbUDbUEbUzbUzaacaacbSUbUFbPxbUGbUHbUIbPxbUGbTObUJbSWbXybTObUKbSUbULbUMbUNbSUbUObPxaaaaacaaabUPbUbbUcbUbbUdaacaaaaaabLebUebUfbUQbURbUSbUTbUUbUVbUWbUXbUYbUTbUZbUTbVabUfbVbbVcbVdbVebVfbVgbVhbVibVibVibVjbViaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5684,7 +5681,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaabGDbRwbGFaaabGDbRwbGFaaabGDbRwbGFaacbGDbRwbGFaaaaaAaaaaaaaaaaaaaaaaacbEpbVPbVQbVRbVSbVTbVUbKvbMYbMYbVVbLIbUybUzbXzbVvbVvbVvbVvbVvbVubVvbVXbVYbUzaaaaaabSUbXYbWabWObUHbWbbTObTObTObTObWcbTObWObWdbSUaUnbWeaUnbSUabDbWfaaaaacafnaaaaaaaacaaaaaaaacaaaaaabLebWgbWhbWibVEaaabWjbWkbWlbWlbWlbWmbWnaaabVEbWobWpbWqbVibWrbWsbWtbWubWvbWwbWxbWybVNbViaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabUvbRvaaaaacbUvaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaabGDbRwbGFaaabGDbRwbGFaaabGDbRwbGFaaabGDbRwbGFaaaaaAaaaaaaaaaaaaaaaaacbEpbEpbEpbWzbWAbWzbEpbKvbKvbWBbKvbWCbWDbWEbWFbWGbVvbVvbVvbVvbWHbWIbWJbWKbUzaaaaaabSUbWLbWMbTObUHbTObTObWNbTObTObXZbTObTObWPbSUaWybdaaWzaaaabDaacaaaaacaaaaaaaaaaaaaaaafnaaaaaaaacbLebWQbWRbWSbVEbVEbWTaSlbWUbWUbWUaSobWVbVEbVEbWSbWWbVGbWXbWYbWsbWZbXabXbbXcbXdbXebVNbViaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahJaaabGDbXfbGFaaabGDbXfbGFaacbGDbXfbGFaaabGDbXfbGFaaaaaAaacaaaaaaaacaacaacaacaacbEpbXgbXhbXgbEpaacbKvbXibXjbXkbXlbUzbXmbXnbXobXpbXqbXrbXsbXtbXubXvbUzaacaacbSUbSUbSUbXwbXxbTObTObYdbYLbXAbTObXBbTObXCbSUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacbVEbWQbUfbXDbXEbXDbXFaTzaTzaTzaTzaTzbXFbXDbXEbXDbUfbVGbWXbWsbXGbWsbWsbXHbXIbXJbXKbVNbViaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaaacaacaaaaaaaaaaacaaaaaaaaaaaaaacaaaaaaaaaaacaaaaaAaacaacaacaacaaaaaaaaaaacbEpbEpbEpbEpbEpaaabKvbXLbXjbXjbXjbUzbXMbXNbXObXPbXQbXRbXSbXTbXUbXVbUzaaaaacbWfaacbSUbXWbXXbTObXAbYMbYObTObTObXAbYabSUbSUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVEbYbbWRbVEbVEbVEaVAaTzbYcbYcbYcaTzaVAbVEbVEbVEbWWbYebVibYfbYgbYhbYibYjbYkbYlbVNbVNbViaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaaaacaacaaaaaaaaaaacaaaaaaaaaaaaaacaaaaaaaaaaacaaaaaAaacaacaacaacaaaaaaaaaaacbEpbEpbEpbEpbEpaaabKvbXLbXjbXjbXjbUzbXMbXNbXObXPbXQbXRbXSbXTbXUbXVbUzaaaaacbWfaacbSUbXWbXXbTObXAbYMbYObTObTObXAaTvbSUbSUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVEbYbbWRbVEbVEbVEaVAaTzbYcbYcbYcaTzaVAbVEbVEbVEbWWbYebVibYfbYgbYhbYibYjbYkbYlbVNbVNbViaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabRubRvaaaaacbRuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaAaaAaaAaaAaaAaaAahJaaAaaAaaAaaAaaAaaAahJahJaaAaaAaaAahJaacaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaacaaaaacaaaaaabUzbXMbVvbVvbVvbVvbYmbVvbVvbVvbYnbUzaacagkaacaiabSUbYobYpbTObTObYqbTObTObTObWObYrbSUaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbVEbYsbYtbYubYvbVEaTAbYwaTzaTzaTzbYxaTAbVEbYybYubYzbYAbVibVibVibVibVibVibVibVibVibVibViaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabYBbYCbYDbYEbYFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaaaaaaaaaaacaaaaaabUzbYGbVvbVvbVvbVvbVvbVvbVvbVvbYHbYIaaaaaaaacaiabSUbYJbYKbTObTObYPbZfbYNbZAbYPbSUbYQaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbVEbYsbUfbwgbYRbVEaSmbYSbYcbYcbYcaTzaSmbVEbYTbwgbUfbwgbUgbwgbYUbwgbYVbYWbTlaacaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabYXbYYbYZbZabZbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafnaaabUzbZcbVvbZdbVvbZdbZebZdbZdbZdbYHbYIaacaacaacaaabSUbZBbZgbTObTObZhbZibScbScbZjbSUaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacbLebZkbZlbwgbZmbVEaSmbZnaTzbZoaTzaTzaSmbVEbZpbwgbZlbwgbUgbUTbUTbwgbUTbZqbTlaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaAaaBaacbZrbZsbZtbZubZraacaaBaaAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/Efficiencystation/z2.dmm b/_maps/map_files/Efficiencystation/z2.dmm index 6d7d0b4aaef..abacae28d62 100644 --- a/_maps/map_files/Efficiencystation/z2.dmm +++ b/_maps/map_files/Efficiencystation/z2.dmm @@ -500,9 +500,9 @@ "jF" = (/obj/effect/decal/remains/human,/obj/effect/decal/cleanable/blood/splatter,/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "jG" = (/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/turf/simulated/shuttle/wall{icon_state = "swall_f5"; dir = 2},/area/wizard_station) "jH" = (/turf/unsimulated/wall/fakedoor{name = "Squad 3 Pod"},/area/wizard_station) -"jI" = (/obj/structure/closet/emcloset,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) +"jI" = (/turf/unsimulated/wall,/area/centcom/ferry{name = "ERT Ready Room"}) "jJ" = (/obj/machinery/door/airlock/external{name = "Arrival Airlock"},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) -"jK" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 4},/area/centcom/ferry) +"jK" = (/obj/structure/rack,/obj/item/weapon/shield/riot,/obj/item/weapon/shield/riot,/turf/unsimulated/floor{tag = "icon-warning"; icon_state = "warning"; dir = 2; heat_capacity = 1},/area/centcom/ferry{name = "ERT Ready Room"}) "jL" = (/obj/machinery/door/airlock/centcom{name = "Transport Shuttle"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry) "jM" = (/obj/structure/stool/bed/chair/wood/wings{tag = "icon-wooden_chair_wings (NORTH)"; icon_state = "wooden_chair_wings"; dir = 1},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "jN" = (/obj/structure/cult/pylon,/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) @@ -512,7 +512,7 @@ "jR" = (/turf/unsimulated/floor{tag = "icon-cultdamage4"; icon_state = "cultdamage4"},/area/wizard_station) "jS" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) "jT" = (/turf/unsimulated/floor{tag = "icon-warning (SOUTHWEST)"; icon_state = "warning"; dir = 10; heat_capacity = 1},/area/centcom/ferry) -"jU" = (/turf/unsimulated/floor{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6; heat_capacity = 1},/area/centcom/ferry) +"jU" = (/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) "jV" = (/obj/structure/door_assembly{anchored = 1; icon_state = "door_as_uranium1"; name = "Corridor A"},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "jW" = (/turf/unsimulated/wall/normal{tag = "icon-uranium15"; icon_state = "uranium15"},/area/wizard_station) "jX" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'; name = "Corridor A"},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) @@ -521,7 +521,7 @@ "ka" = (/obj/structure/grille,/obj/machinery/door/poddoor/shutters{id = "syndieshutters"; name = "blast shutters"},/obj/structure/window/reinforced/fulltile,/turf/simulated/shuttle/plating,/area/space) "kb" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/space) "kc" = (/obj/machinery/door/airlock/external{name = "Ferry Airlock"; req_access_txt = "0"},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) -"kd" = (/turf/unsimulated/floor{icon_state = "greencorner"},/area/centcom/ferry) +"kd" = (/obj/structure/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) "ke" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "green"},/area/centcom/control) "kf" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 8},/area/centcom/control) "kg" = (/turf/unsimulated/floor{icon_state = "greencorner"},/area/centcom/control) @@ -751,7 +751,7 @@ "ow" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "ox" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{icon_state = "swall2"; dir = 2},/area/space) "oy" = (/obj/structure/table,/obj/item/weapon/gun/syringe{pixel_x = 1; pixel_y = 2},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) -"oz" = (/obj/structure/table,/obj/item/weapon/reagent_containers/syringe/antitoxin,/obj/item/weapon/reagent_containers/syringe/antitoxin{pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/antitoxin{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) +"oz" = (/obj/structure/rack,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) "oA" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oB" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oC" = (/obj/structure/table,/obj/item/device/sbeacondrop/bomb{pixel_y = 5},/obj/item/device/sbeacondrop/bomb,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) @@ -761,7 +761,7 @@ "oG" = (/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor,/area/space) "oH" = (/obj/machinery/telecomms/allinone{intercept = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oI" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) -"oJ" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 6; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) +"oJ" = (/obj/structure/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) "oK" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor,/area/space) "oL" = (/obj/machinery/computer/atmos_alert,/turf/simulated/shuttle/floor,/area/space) "oM" = (/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/weapon/storage/firstaid/regular{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) @@ -853,6 +853,91 @@ "qu" = (/obj/structure/table,/obj/machinery/door_control{id = "thunderdomehea"; name = "Heavy Supply Control"; pixel_y = 0; req_access_txt = "102"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeadmin) "qv" = (/obj/structure/table,/obj/machinery/door_control{id = "thunderdome"; name = "Main Blast Doors Control"; pixel_y = 0; req_access_txt = "102"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeadmin) "qw" = (/obj/structure/table,/obj/machinery/door_control{id = "thunderdomegen"; name = "General Supply Control"; pixel_y = 0; req_access_txt = "102"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome/tdomeadmin) +"qx" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/teargas,/obj/item/weapon/storage/box/flashbangs,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qy" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 6},/area/centcom/ferry{name = "ERT Ready Room"}) +"qz" = (/obj/machinery/door/airlock/centcom{name = "Equipment Room"; opacity = 1; req_access_txt = "0"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qA" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qB" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/weapon/weldingtool/largetank,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qC" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qD" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qE" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qF" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/weapon/weldingtool/largetank,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qG" = (/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qH" = (/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qI" = (/obj/mecha/combat/gygax,/turf/unsimulated/floor{icon_state = "recharge_floor"; name = "mech bay recharge floor"; tag = "icon-recharge_floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qJ" = (/obj/machinery/mech_bay_recharge_port,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qK" = (/obj/mecha/working/ripley,/turf/unsimulated/floor{icon_state = "recharge_floor"; name = "mech bay recharge floor"; tag = "icon-recharge_floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qL" = (/obj/machinery/mech_bay_recharge_port{tag = "icon-recharge_port (WEST)"; icon_state = "recharge_port"; dir = 8},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qM" = (/obj/structure/reagent_dispensers/fueltank,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qN" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qO" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/weapon/weldingtool/largetank,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qP" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/tool/sleeper,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qQ" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 8},/area/centcom/ferry{name = "ERT Ready Room"}) +"qR" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows2"; dir = 8},/area/centcom/ferry{name = "ERT Ready Room"}) +"qS" = (/turf/unsimulated/wall/fakeglass{icon_state = "fakewindows"; dir = 4},/area/centcom/ferry{name = "ERT Ready Room"}) +"qT" = (/obj/machinery/suit_storage_unit/ertMed,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qU" = (/obj/structure/rack,/obj/item/clothing/glasses/hud/health,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/fire{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/o2{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/reagent_containers/hypospray/combat/nanites,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qV" = (/obj/structure/rack,/obj/item/weapon/storage/box/emps,/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qW" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qX" = (/obj/structure/mirror{pixel_y = 28},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qY" = (/obj/structure/rack,/obj/item/device/aicard,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/obj/item/device/flash/handheld,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"qZ" = (/obj/mecha/medical/odysseus,/turf/unsimulated/floor{icon_state = "recharge_floor"; name = "mech bay recharge floor"; tag = "icon-recharge_floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"ra" = (/obj/machinery/mech_bay_recharge_port{on = 1},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rb" = (/obj/machinery/door/poddoor{name = "Emergency Response Team Armoury"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rc" = (/obj/structure/closet/syndicate/ertEngi,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rd" = (/obj/structure/closet/syndicate/ertSec,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"re" = (/obj/structure/closet/syndicate/ertMed,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rf" = (/obj/structure/table/reinforced,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rg" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/stock_parts/cell/high,/obj/item/weapon/stock_parts/cell/high,/obj/item/weapon/stock_parts/cell/high,/obj/item/weapon/stock_parts/cell/high,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rh" = (/obj/structure/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/extinguisher,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/weapon/soap/nanotrasen,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"ri" = (/turf/unsimulated/floor{dir = 8; icon_state = "red"},/area/centcom/ferry) +"rj" = (/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) +"rk" = (/obj/machinery/door/airlock/glass{name = "Medical Equipment"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rl" = (/obj/machinery/door/airlock/glass{name = "Misc. Equipment"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rm" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/clothing/glasses/hud/security/night,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rn" = (/obj/structure/table/reinforced,/obj/item/ammo_box/a357,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"ro" = (/obj/structure/rack,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/belt/security,/obj/item/device/flash/handheld,/obj/item/weapon/grenade/flashbang,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rp" = (/obj/effect/landmark{name = "Emergencyresponseteam"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rq" = (/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rr" = (/turf/unsimulated/floor{tag = "icon-blue (NORTH)"; icon_state = "blue"; dir = 1},/area/centcom/ferry{name = "ERT Ready Room"}) +"rs" = (/turf/unsimulated/floor{tag = "icon-bluecorner (EAST)"; icon_state = "bluecorner"; dir = 4},/area/centcom/ferry{name = "ERT Ready Room"}) +"rt" = (/turf/unsimulated/floor{tag = "icon-bluecorner (NORTH)"; icon_state = "bluecorner"; dir = 1},/area/centcom/ferry{name = "ERT Ready Room"}) +"ru" = (/turf/unsimulated/floor{tag = "icon-neutralcorner (EAST)"; icon_state = "neutralcorner"; dir = 4},/area/centcom/ferry{name = "ERT Ready Room"}) +"rv" = (/turf/unsimulated/floor{tag = "icon-neutral (NORTH)"; icon_state = "neutral"; dir = 1},/area/centcom/ferry{name = "ERT Ready Room"}) +"rw" = (/turf/unsimulated/floor{tag = "icon-neutralcorner (NORTH)"; icon_state = "neutralcorner"; dir = 1},/area/centcom/ferry{name = "ERT Ready Room"}) +"rx" = (/obj/machinery/door/airlock/centcom{name = "Commander's Room"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"ry" = (/turf/unsimulated/floor,/area/centcom/ferry{name = "ERT Ready Room"}) +"rz" = (/obj/machinery/door/airlock/centcom{name = "ERT Ready Room"; opacity = 1; req_access_txt = "0"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rA" = (/obj/machinery/suit_storage_unit/ertCom,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rB" = (/turf/unsimulated/floor{icon_state = "red"; dir = 2},/area/centcom/ferry{name = "ERT Ready Room"}) +"rC" = (/turf/unsimulated/floor{tag = "icon-redcorner"; icon_state = "redcorner"; dir = 2},/area/centcom/ferry{name = "ERT Ready Room"}) +"rD" = (/turf/unsimulated/floor{tag = "icon-redcorner (WEST)"; icon_state = "redcorner"; dir = 8},/area/centcom/ferry{name = "ERT Ready Room"}) +"rE" = (/turf/unsimulated/floor{tag = "icon-yellowcorner"; icon_state = "yellowcorner"; dir = 2},/area/centcom/ferry{name = "ERT Ready Room"}) +"rF" = (/turf/unsimulated/floor{tag = "icon-yellow"; icon_state = "yellow"; dir = 2},/area/centcom/ferry{name = "ERT Ready Room"}) +"rG" = (/turf/unsimulated/floor{tag = "icon-yellowcorner (WEST)"; icon_state = "yellowcorner"; dir = 8},/area/centcom/ferry{name = "ERT Ready Room"}) +"rH" = (/obj/structure/closet/emcloset,/turf/unsimulated/floor{tag = "icon-warning (SOUTHEAST)"; icon_state = "warning"; dir = 6; heat_capacity = 1},/area/centcom/ferry) +"rI" = (/obj/machinery/door/airlock/glass{name = "Security Equipment"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rJ" = (/obj/machinery/door/airlock/glass{name = "Engineering Equipment"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rK" = (/obj/mecha/combat/marauder{operation_req_access = null},/turf/unsimulated/floor{icon_state = "recharge_floor"; name = "mech bay recharge floor"; tag = "icon-recharge_floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rL" = (/obj/machinery/door/poddoor{name = "Death Squad Equipment Room"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rM" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rN" = (/obj/machinery/suit_storage_unit/ertSec,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rO" = (/obj/structure/rack,/obj/item/weapon/storage/box/handcuffs,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/storage/belt/security,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/shield/riot/tele,/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine,/obj/item/device/flash/handheld,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rP" = (/obj/machinery/suit_storage_unit/ertEngi,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rQ" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/clothing/glasses/meson,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/device/multitool,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/rcd{matter = 200; name = "military rapid-construction-device (RCD)"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rR" = (/obj/structure/rack,/obj/item/weapon/storage/belt/utility/full,/obj/item/clothing/glasses/meson,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/device/multitool,/obj/item/weapon/rcd,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/rcd_ammo,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/grenade/chem_grenade/metalfoam,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/rcd{matter = 90; name = "military rapid-construction-device (RCD)"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rS" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rT" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,/obj/item/mecha_parts/mecha_equipment/repair_droid,/obj/item/weapon/weldingtool/largetank,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rU" = (/obj/structure/table/reinforced,/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rV" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/night,/obj/item/clothing/glasses/hud/security/sunglasses,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rW" = (/obj/structure/table/reinforced,/obj/item/weapon/stock_parts/cell/high,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/stack/sheet/plasteel{amount = 50},/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rX" = (/obj/machinery/door/airlock/centcom{name = "Deathsquad Equipment Room"; opacity = 1; req_access_txt = "0"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rY" = (/obj/structure/rack,/obj/item/clothing/suit/space/deathsquad,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/clothing/mask/gas/sechailer/swat,/obj/item/clothing/head/helmet/space/deathsquad,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"rZ" = (/obj/structure/rack,/obj/item/clothing/suit/space/deathsquad,/obj/item/weapon/gun/energy/pulse_rifle,/obj/item/clothing/mask/gas/sechailer/swat,/obj/item/clothing/head/helmet/space/deathsquad,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"sa" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"sb" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry{name = "ERT Ready Room"}) +"sc" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 6; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -3},/obj/item/weapon/storage/pill_bottle/epinephrine{pixel_x = 3; pixel_y = -2},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) +"sd" = (/obj/structure/table,/obj/item/weapon/reagent_containers/syringe/charcoal,/obj/item/weapon/reagent_containers/syringe/charcoal{pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/charcoal{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababadaeaeaeaeaeafaeaeaeaeaeafaeaeaeaeaeafaeaeaeaeaeag @@ -974,82 +1059,82 @@ abababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababcucvcwabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababcxcyczcAcBcCababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababcDcEcFcGcHcIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababcJcKcLcMcNcOcPcQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababcRcSabcTcUcVcWcXcYcZababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababdaababdbdcdddeabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababdfdgdhdidjdkdldmabababababababababababababababababababababababababababababababababababababababababababababdndndndndndndndndndndndndndndndndnabdododododododododoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababdpdqdrdsdtdudvdwdxdydzababababababababababababababababababababababababababababababababababababababababababdndAdndAdndAdndAdndAdndAdndAdndAdnabdodBdCdCdCdCdCdDdododododododoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababdEdFdGdHdIdJdKdLabdMdNababababababababababababababababababababababababababababababababababababababababababdndndndndndndndndndndndndndndndndnabdodOdPdPdPdPdPdOdodQdQdQdQdQdoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababdRdSdTdUdVdWdXababababababababababababababababababababababababababababababababababababababababababababababdndAdndAdndAdndAdndAdndAdndAdndAdnabdodOdPdPdPdPdPdYdodZeaeaeaeadodoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababebecedeeefegeheiejekelababababababababababababababababababababababababababababababababababababababababababdndndndndndndndndndndndndndndndndnabdodOdPdPdPdPdPemeneoepepepepeqdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababereseteuevewexeyabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdodOdPdPdPdPdPdOezeoepepepepeAdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababeBeCeDeEeFeGeHeIeJeKeLababababababababababababababababababababababababababeMeNeNeOababababababababababababababababababababababababababababababdodOdPdPdPdPePdOeQeoepeRepepeSdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababeTeUeVeWeXeYababababababababababababababababababababababababababababababeMeZfafbfcababababababababababababababababababababababababababababababdodOdPdPdPdPdPdOfdeoepepepepfedoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababfffgfhfifjfkflfmfnfofpababababababababababababeMeNeNeNeNeNfqeNeNeNeNeNeNfrfafafbfsababababababababababababababababababababababababababababababdodOdPdPdPdPdPfteneoepepepepfudoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababfvfwfxfyfzfAfBabababababababababababababababeMfCfDfDfDfDfDfEfFfGfHfIfJfJfKfafafbfLababababababababababababababababababababababababababababababdodOdPdPdPdPdPfMdofNfOfOfOfOdodoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababfPfQfRfSfTababababababababababababababeMeNeNfUfCfJfJfJfJfJfEfVfVfWfXfJfJfYeNeNeNfZababababababababababababababababababababababababababababababdogagbdPdPdPgcgddogegegegegedoabababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababgfggghgigjababababababababababababababgkglgmgnfEgogpfJgpgqfEfVfVgrgsfJfJfEababababababababababababababababababababababababababababababababababdogtgugvgvgvgugwdododododododoabababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgkgxgygygzeNgAgBgCeNfrgDgEgFgEfJfJgGababababababababababababababababababababababababababababababababababdodogHgIgIgIgJdodoabababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababgKababgLabababababababababababababababgkgMgygygNgygygygygygygygygygygygygOgPababababababababababababababababababababababababababababababababababdododododododoababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgkgQgygygRgmfJgygSgSgSgygSgSgSgygTgRababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgkgUgngVfEgWfJgygXgXgXgygXgXgXgygYfEababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgZeNeNfqfChafJgygygygygygygygygyhbgzeNeNeNeOababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgZfChbfJgyfJfJfJgyfJfJfJgyfJfKfafafbfcababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababgZeNgAgOhcgkhcgOhcgkhcgOgChdfafafbfsababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababheabababhfabababhgabhhhifafbfLababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababhheNeNfZababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahjhkhlhmaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnaahohphqhrhsaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnhthuhvhqhwhxaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahxhyhzhwhAhBhxaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahrhshChDhChEhFaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnhnhFhGhHhIhraaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaahJhKhLhMhNhOhqhPhnaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaahQhRhShThUhNhqhVhWhXhnhnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababhYhYhYhYhYhZhZababababababababababababababababababababababababaaaaaaaaaaaaaaaaaahnaahLiaiaibhNhqichVhXaaidieaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababhYifigihhYiihZababhZijhZabababababababababababababababababababaaaaaaaaaaaaaaaaaahPhnaaaahnikilhvimhvhPhnhnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababininininininininininininininininininininininininininininininabababababababababababababababababababababababhYioipiphYhZhZhZhZhZiqhZhZhZhZhZhZababababababababababababababaaaaaaaaaaaaaahEirisitiuiviuiuiriwitiuiuiviuiuaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixixixiyixixixiziAixixixizixixixixixixizixixinabababababababababababababababababiBiCiBababiDhYhYiEhYhYiFiFiFiGiHiHiHiGiFiFiFhZababababababababababababababaaaaaaaaaaaaaaiIiJhqhqiJiIiKiLhqhqhqiMiNiIiOiPhPiQhnhnaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixiyixixixixixixixixixixixizixixixixixizixixixixixinabababababababababababababababababiRiSiRababiDiTiUiViWhYiXiYiZhZiHiHiHhZiXiYiZhZababababababababababababababaaaaaaaaaaaaaajajbhqhqjbjaiQiQhqhqhqhqjcjajdjeiaiajfaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixjgixixixixixiyixixiAizixixizixixiziAixizixinababababababababababababababababjhjiiCjjjkiDiDiRiUiViWhYjljljljmiHiHiHjnjljljlhZababababababababababababababaaaaaaaaaaaaaajojphqhVhqjqichVhqjrhqhqjsjojtjujvjwjxjyaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixixixixiyixixiziAixixizixiAinababababababababababababababababiRjziSjAjjjBjBjiiUiViWhYiHiHiHiHiHiHiHiHiHiHiHhZhZabababababababababababababaaaaaaaaaaaaaajCjbhqhvicjDhvhqhqjEhqhqhqjCjFjGjfjHhJaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixiyixixixixixiAixiziAixizixinababababababababababababababababiRjIiSiSjJiSiSjJiViVjKjLiHiHiHiHiHiHiHiHiHiHiHiqijabababababababababababababaaaaaaaaaaaaaahmjMhqhqjMhmjNhqhVhvhqhqjNhmjOjPjQjRaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixjSjSjSjSjSjSjSixixixixixixixizixixjgiAixixixinababababababababababababababababiRjTiSjUjhjBjBjkiUiViVhYiHiHiHiHiHiHiHiHiHiHiHhZhZabababababababababababababaaaaaaaaaaaaaahrirjVitiujWiuirhCjXhCitiujWiuirhnhnhnaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixjYjZkakakakakajZkbixixixixjgixjSiyjSiyixizixizinababababababababababababababababjjjkkcjhjiiDiDiRiUiVkdhYkekekekfiHiHiHkgkekekehZababababababababababababababaaaaaaaaaaaaaaaaaaikhVaahnaahnkhhOikaaaahnaaaaaaaahnaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixjZkikjkkklkmknknjZkoixixjSininkpkqininjSkrksjSinabababababababababababababababababiRiSiRababiDktiUiViWhYiXiYiZhZiHiHiHhZiXiYiZhZababababababababababababababaaaaaaaaaaaaaaaaaahnhnaakuhVaakvkwikhnaaicaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixjZkxkjkjkykjkjkjjZkoixkzininkAkBkBkAininininininininabababababababababababababababkCkckCababiDhYhYhYhYhYiFiFiFiGiHiHiHiGiFiFiFhZababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnhnaakDhVkEaaaaaahnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixjZkFkjkjkjkGkjkHjZkojgkzinkIkIkIkIkIkJkKkLkMkNkOkPinababababababababababababababdBkQkRkQdDababhZkSkTkThZhZhZhZhZiHiHiHhZhZhZhZhZababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnivirkUitivhnaahnhnaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixkVjZjZjZkWjZjZjZkXixixkYinkZkIlalalbkIkIkIlcldldldinababababababababababababababdOledPlfdOababhZlglglglhlglijlljiHiHiHlkjlhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaiIlllmlniIkujehUlolphnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixjZlqkjlrjZlsjSjSjSltinkIlalulvlakIlwlxkMlylzininabababababababababababababaDlAledPlflAaDablBlglglClDlglEiHiHiHiHiHiHiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaahClFlGlHhClIlJhTlKhqhxaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixjZlLkjlMjZlNlOlOlOkqinkIlalPlQlakIlwlRininininababababababababababababababaDkQledPlfkQaDabhZlglglSlTlglUiHiHiHiHiHiHiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahOhnhmlVlWlXhmhvlYhTlKaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixjYjZjZjZjZjZlLkjlMjZlZmamamamambkIkIkIkIkIkIlwlRininininababababababababababababababaDmcledPlfmcaDabhZmdlgmemflgliiHmgmgmgmgmgiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnivmhirhCitmhivmimjlKaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixjZmkkjkjmljZlLkjlMjZmmmnkplOkqinmolalalakIkIlwmpinmqmrininababababababababababababababdOledPlfdOababhZhZhZhZlimsmtmslihZmuhZlimsliababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahniIhqmvmwmvhqiIaamxaaaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixjZmkkjmymzjZlLkjlMjZjZmAmBkbmCinmDmEmFmEmEkIkIkImGmHmHmIinabababababababababababababaDlAledPlflAaDabababababmtmJmtmJmtiDiDiDmtmJmtababababababababababababababababaaaaaaaaaaaaaaaaaaaaaahnhVmKhqhqhqhqhqmKaaaaaaaahVaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinmLixjZmkkjkjmMjZkjkjkjjZkjkjkjjZkYinmNmOmNmNmPkIkIkIinmQmRmIinabababababababababababababaDkQledPlfkQaDababababablEmslEmslEiDiDiDlEmslEababababababababababababababababaaaaaaaaaaaaaaaaaahnhnhOhqhmmShqhqhqmShmaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixjZmkkjkjkjmTkjkjkjmUkjkjkjjZkzininlxmVmWmXinmYmYinininininabababababababababababababaDmcmZdPlfmcaDabababdBdCnanbncndnckQkQkQncnenfdCngdCdCdDabababababababababababaaaaaaaaaaaaaaaaaaaahniuiunhninininininjaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixjZmkkjkjkjnkkjkjkjnlkjkjnmjZnnmCininininininnononpnqnrnsinababababababababababababababdOntdPlfdOabababdBnunvnvnwkQdPnxnxnxnxnxdPnynzdOnAnBnCdDababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahrirnDnDnDithFaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjYjZjZjZjZjZjZnEkjkjjZjZjZjZjZjZkbnFnFnFnGmCinnHnHnHnHnHnHinababababababababababababababgtnInJnKgwabababnLnMnwnwnwnNdPdPdPdPdPdPdPdPdPdOntntnOkQababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagIgIgIaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZnPnPnQnRnSjZnTkjkjjZnUnVnWnXnYjZixiyixixiAkMnHnHnHnHnHnZinababababababababababababababaDgIgIgIaDabababoanMobobobkQdPocodododododoeoflAogdPlekQababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZkjkjkjmykjohkjkjkjoikjmykjmyojjZixjgiziyjginokokokokokolinababababababababababababababaDaDaDaDaDabababoanMnfdCdCnaomockQkQonkQkQoedPoodPdPopkQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZoqkjkjkjkjorkjkjkjoskjkjkjkjkjjZixixixizkzininininininininababababababababababababababababababababababoanMotouovowdPocnxnxnxnxnxoedPoxdPdPlekQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZoqkjkjoyozjZoAoBoAjZoCoDkjkjkjjZixizixjgkzinabababababababababababababababababababababababababababababoEnMovovoFkQdPdPdPdPdPdPdPdPdPdOoGoGnOkQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZkjkjkjjZjZjZoHoIkjjZjZjZkjkjkjjZixixiyixkzinabababababababababababababababababababababababababababababgtnIotovoJkQnzodododododododnzdOoKoLgcgwabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZoMoNoOjZixjZoPoPoPjZixjZknoQoRjZixixixixkzinababababababababababababababababababababababababababababababgtdCdCdCdCnakQnfnakQnfnakQnfoSdCdCgwababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixjZoPoPoPjZixkVoTgIoUkXixjZoPoPoPjZixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixkVoTgIoUkXixixixixixixixkVoTgIoUkXixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixixixixixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababinininininininininininininininininininininininininababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababoVoVoVoVoVoVoVoVoWoVoVoVoVoVoVoVoVabababababababababoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababoVoYoZoZoZoZoZoYoYoYoZoZoZoZoZoYoVabababababababababoXpapbpcpdpdpbpepfpgphpipjpkpjpjpjploXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababpmoYoYoYpnoYoYoYoYoYoYoYpnoYoYoYpmabababababababababoXpapbpbpbpbpbpopipipipppjpjpjpqpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababoVoYoZoZoZoZoZoYoYoYoZoZoZoZoZoYoVabababababababababoXpapbprpapsptpupipipipipjpjpvpjpwpkoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababoVpxpypypypypypypypypypypypypypzoVabababababababababoXpApipppppppppppipipipipjpjpjpBpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab -ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababpCpCpCpCpCpCpCpCpCpDpEpEpEpEpEpEpEpEpEpEpEpEpEpDpCpCpCpCpCpCpCpCpCaboXpFpipipipipipipipipipipGpjpjpjpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababcxcyczcAcBcCabababababababababababababababababababababababababababababababeMeNeNeOabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababcDcEcFcGcHcIababababababababababababababababababababababababababababababeMeZfafbfcabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababcJcKcLcMcNcOcPcQababababababababababababeMeNeNeNeNeNfqeNeNeNeNeNeNfrfafafbfsabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababcRcSabcTcUcVcWcXcYcZababababababababababababeMfCfDfDfDfDfDfEfFfGfHfIfJfJfKfafafbfLabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababdaababdbdcdddeababababababababababababeMeNeNfUfCfJfJfJfJfJfEfVfVfWfXfJfJfYeNeNeNfZabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababdfdgdhdidjdkdldmabababababababababababgkglgmgnfEgogpfJgpgqfEfVfVgrgsfJfJfEababababababababababababababababdndndndndndndndndndndndndndndndndnabdododododododododoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababdpdqdrdsdtdudvdwdxdydzababababababababgkgxgygygzeNgAgBgCeNfrgDgEgFgEfJfJgGababababababababababababababababdndAdndAdndAdndAdndAdndAdndAdndAdnabdodBdCdCdCdCdCdDdododododododoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababdEdFdGdHdIdJdKdLabdMdNababababababababgkgMgygygNgygygygygygygygygygygygygOgPabababababababababababababababdndndndndndndndndndndndndndndndndnabdodOdPdPdPdPdPdOdodQdQdQdQdQdoababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababdRdSdTdUdVdWdXababababababababababababgkgQgygygRgmfJgygSgSgSgygSgSgSgygTgRababababababababababababababababdndAdndAdndAdndAdndAdndAdndAdndAdnabdodOdPdPdPdPdPdYdodZeaeaeaeadodoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababebecedeeefegeheiejekelababababababababgkgUgngVfEgWfJgygXgXgXgygXgXgXgygYfEababababababababababababababababdndndndndndndndndndndndndndndndndnabdodOdPdPdPdPdPemeneoepepepepeqdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababereseteuevewexeyabababababababababababgZeNeNfqfChafJgygygygygygygygygyhbgzeNeNeNeOababababababababababababababababababababababababababababababdodOdPdPdPdPdPdOezeoepepepepeAdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababeBeCeDeEeFeGeHeIeJeKeLabababababababababababgZfChbfJgyfJfJfJgyfJfJfJgyfJfKfafafbfcababababababababababababababababababababababababababababababdodOdPdPdPdPePdOeQeoepeRepepeSdoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababeTeUeVeWeXeYabababababababababababababababababgZeNgAgOhcgkhcgOhcgkhcgOgChdfafafbfsababababababababababababababababababababababababababababababdodOdPdPdPdPdPdOfdeoepepepepfedoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababfffgfhfifjfkflfmfnfofpabababababababababababababababheabababhfabababhgabhhhifafbfLababababababababababababababababababababababababababababababdodOdPdPdPdPdPfteneoepepepepfudoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababfvfwfxfyfzfAfBababababababababababababababababababababababababababababababhheNeNfZababababababababababababababababababababababababababababababdodOdPdPdPdPdPfMdofNfOfOfOfOdodoabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababfPfQfRfSfTababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdogagbdPdPdPgcgddogegegegegedoabababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababgfggghgigjababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdogtgugvgvgvgugwdododododododoabababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdodogHgIgIgIgJdodoabababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababgKababgLababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdododododododoababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjIjIjIabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahjhkhlhmaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjKjKjKjIjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnaahohphqhrhsaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIkdjUjUjUozjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnhthuhvhqhwhxaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIkdjUjUjUozjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahxhyhzhwhAhBhxaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIoJjUjUjUqxjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahrhshChDhChEhFaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjIjIqyqzqyjIjIjIjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnhnhFhGhHhIhraaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIqBqAqCjUjUjUqEqDqFjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaaaahJhKhLhMhNhOhqhPhnaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababqyjUjUqGjUjUjUqHjUjUjIababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaaaaaaaaaaaaaaaaaaaahQhRhShThUhNhqhVhWhXhnhnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIqJqIqGjUjUjUqHqKqLjIabababababababababababababababababababababababababababababababhYhYhYhYhYhZhZababababababababababababababababababababababababaaaaaaaaaaaaaaaaaahnaahLiaiaibhNhqichVhXaaidieaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjIjIjUjUqMjIjIjIjIabababababababababababababababababababababababababababababababhYifigihhYiihZababhZijhZabababababababababababababababababababaaaaaaaaaaaaaaaaaahPhnaaaahnikilhvimhvhPhnhnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIqOqNqPjUjUjUjIababababababababababjIjIjIjIjIjIjIjIjIjIjIabababababababababababababhYioipiphYhZhZhZhZhZiqhZhZhZhZhZhZababababababababababababababaaaaaaaaaaaaaahEirisitiuiviuiuiriwitiuiuiviuiuaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababqyjUjUqGjUjUjUjIqQqRqRqSjIjIjIjIjIjIjIqTjUjUqUjIqVqXqWqYjIhYhYhYhYabababiBiCiBababiDhYhYiEhYhYiFiFiFiGiHiHiHiGiFiFiFhZababababababababababababababaaaaaaaaaaaaaaiIiJhqhqiJiIiKiLhqhqhqiMiNiIiOiPhPiQhnhnaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIraqZqGjUjUjUjUjUjUjUjUrbjUrcrerdrfjIqTjUjUqUjIrgjUjUrhjIriiVrjiTabababiRiSiRababiDiTiUiViWhYiXiYiZhZiHiHiHhZiXiYiZhZababababababababababababababaaaaaaaaaaaaaajajbhqhqjbjaiQiQhqhqhqhqjcjajdjeiaiajfaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjIjIjIjIjIjIjIjIjIjIjIjUjUjUjUjUjIjIrkrkjIjIjIrlrljIjIriiVrjiRababjhjiiCjjjkiDiDiRiUiViWhYjljljljmiHiHiHjnjljljlhZababababababababababababababaaaaaaaaaaaaaajojphqhVhqjqichVhqjrhqhqjsjojtjujvjwjxjyaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababiDabababiDababjIrnrmroqyjUrprprqjUjUrsrrrrrtjUrurvrvrwjIriiVrjjjjBjBjijziSjAjjjBjBjiiUiViWhYiHiHiHiHiHiHiHiHiHiHiHhZhZabababababababababababababaaaaaaaaaaaaaajCjbhqhvicjDhvhqhqjEhqhqhqjCjFjGjfjHhJaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababiDabababiDababqyjUjUjUrxjUrprprpjUryryryryryryryryryryrzriiViVjJiSiSjJiSiSiSjJiSiSjJiViViWjLiHiHiHiHiHiHiHiHiHiHiHiqijabababababababababababababaaaaaaaaaaaaaahmjMhqhqjMhmjNhqhVhvhqhqjNhmjOjPjQjRaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababiDabababiDababjIrAjUjUqyjUrprprqryjUrCrBrBrDjUrErFrFrGjIriiVrjjhjBjBjkjTiSrHjhjBjBjkiUiViWhYiHiHiHiHiHiHiHiHiHiHiHhZhZabababababababababababababaaaaaaaaaaaaaahrirjVitiujWiuirhCjXhCitiujWiuirhnhnhnaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIjIjIjIjIjIjIjIjIjIjIjIjIjUjUjUjUjUjIjIrIrIjIjIjIrJrJjIjIriiVrjiRababjjjkkcjhjiiDiDiRiUiViWhYkekekekfiHiHiHkgkekekehZababababababababababababababaaaaaaaaaaaaaaaaaaikhVaahnaahnkhhOikaaaahnaaaaaaaahnaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababjIqJrKqGjUjUjUjUjUjUjUjUrLjUrcrerdrMjIrNjUjUrOjIrPjUjUrQjIriiVrjktabababiRiSiRababiDktiUiViWhYiXiYiZhZiHiHiHhZiXiYiZhZababababababababababababababaaaaaaaaaaaaaaaaaahnhnaakuhVaakvkwikhnaaicaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababininininininininininininininininininininininininininininininabababababababababababqyjUjUqGjUjUjUjIqQqRqRqSjIjIjIjIjIjIjIrNjUjUrOjIrPjUjUrRjIhYhYhYhYabababkCkckCababiDhYhYhYhYhYiFiFiFiGiHiHiHiGiFiFiFhZababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnhnaakDhVkEaaaaaahnaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixixixiyixixixiziAixixixizixixixixixixizixixinabababababababababababjIrTrSrUjUjUjUjIababababababababababjIjUrVrVjUjIjUrWrWjUjIababababababdBkQkRkQdDababhZkSkTkThZhZhZhZhZiHiHiHhZhZhZhZhZababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahnivirkUitivhnaahnhnaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixiyixixixixixixixixixixixizixixixixixizixixixixixinabababababababababababjIjIjIjIjUjUqMjIababababababababababjIjIjIjIjIjIjIjIjIjIjIababababababdOledPlfdOababhZlglglglhlglijlljiHiHiHlkjlhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaiIlllmlniIkujehUlolphnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixjgixixixixixiyixixiAizixixizixixiziAixizixinabababababababababababjIqJrKqGjUjUjUjIababababababababababababababababababababababababababaDlAledPlflAaDablBlglglClDlglEiHiHiHiHiHiHiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaahClFlGlHhClIlJhTlKhqhxaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixixixixiyixixiziAixixizixiAinabababababababababababqyjUjUqGjUjUjUjIababababababababababababababababababababababababababaDkQledPlfkQaDabhZlglglSlTlglUiHiHiHiHiHiHiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahOhnhmlVlWlXhmhvlYhTlKaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixiyixixixixixiAixiziAixizixinabababababababababababjIrTrSrUjUjUjUjIababababababababababababababababababababababababababaDmcledPlfmcaDabhZmdlgmemflgliiHmgmgmgmgmgiHhZababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahnivmhirhCitmhivmimjlKaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixjSjSjSjSjSjSjSixixixixixixixizixixjgiAixixixinabababababababababababjIjIjIjIqyrXqyjIjIababababababababababababababababababababababababababdOledPlfdOababhZhZhZhZlimsmtmslihZmuhZlimsliababababababababababababababababaaaaaaaaaaaaaaaaaaaaaaaahniIhqmvmwmvhqiIaamxaaaahnaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixjYjZkakakakakajZkbixixixixjgixjSiyjSiyixizixizinabababababababababababababjIrYjUjUjUrZjIabababababababababababababababababababababababababaDlAledPlflAaDabababababmtmJmtmJmtiDiDiDmtmJmtababababababababababababababababaaaaaaaaaaaaaaaaaaaaaahnhVmKhqhqhqhqhqmKaaaaaaaahVaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixjZkikjkkklkmknknjZkoixixjSininkpkqininjSkrksjSinabababababababababababababjIrYjUjUjUrZjIabababababababababababababababababababababababababaDkQledPlfkQaDababababablEmslEmslEiDiDiDlEmslEababababababababababababababababaaaaaaaaaaaaaaaaaahnhnhOhqhmmShqhqhqmShmaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixjZkxkjkjkykjkjkjjZkoixkzininkAkBkBkAininininininininabababababababababababjIrYjUjUjUrZjIabababababababababababababababababababababababababaDmcmZdPlfmcaDabababdBdCnanbncndnckQkQkQncnenfdCngdCdCdDabababababababababababaaaaaaaaaaaaaaaaaaaahniuiunhninininininjaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixjZkFkjkjkjkGkjkHjZkojgkzinkIkIkIkIkIkJkKkLkMkNkOkPinabababababababababababjIjIjUjUjUjIjIababababababababababababababababababababababababababdOntdPlfdOabababdBnunvnvnwkQdPnxnxnxnxnxdPnynzdOnAnBnCdDababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaahrirnDnDnDithFaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixkVjZjZjZkWjZjZjZkXixixkYinkZkIlalalbkIkIkIlcldldldinabababababababababababjIsajUjUjUsbjIababababababababababababababababababababababababababgtnInJnKgwabababnLnMnwnwnwnNdPdPdPdPdPdPdPdPdPdOntntnOkQababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagIgIgIaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixjZlqkjlrjZlsjSjSjSltinkIlalulvlakIlwlxkMlylzininabababababababababababjIsajUjUjUsbjIababababababababababababababababababababababababababaDgIgIgIaDabababoanMobobobkQdPocodododododoeoflAogdPlekQababababababababababaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixjZlLkjlMjZlNlOlOlOkqinkIlalPlQlakIlwlRininininababababababababababababjIsajUjUjUsbjIababababababababababababababababababababababababababaDaDaDaDaDabababoanMnfdCdCnaomockQkQonkQkQoedPoodPdPopkQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixjYjZjZjZjZjZlLkjlMjZlZmamamamambkIkIkIkIkIkIlwlRininininababababababababababababjIjIjIjIjIjIjIababababababababababababababababababababababababababababababababababoanMotouovowdPocnxnxnxnxnxoedPoxdPdPlekQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixjZmkkjkjmljZlLkjlMjZmmmnkplOkqinmolalalakIkIlwmpinmqmrininababababababababababababababababababababababababababababababababababababababababababababababababababababoEnMovovoFkQdPdPdPdPdPdPdPdPdPdOoGoGnOkQabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixjZmkkjmymzjZlLkjlMjZjZmAmBkbmCinmDmEmFmEmEkIkIkImGmHmHmIinababababababababababababababababababababababababababababababababababababababababababababababababababababgtnIotovsckQnzodododododododnzdOoKoLgcgwabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinmLixjZmkkjkjmMjZkjkjkjjZkjkjkjjZkYinmNmOmNmNmPkIkIkIinmQmRmIinabababababababababababababababababababababababababababababababababababababababababababababababababababababgtdCdCdCdCnakQnfnakQnfnakQnfoSdCdCgwababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixjZmkkjkjkjmTkjkjkjmUkjkjkjjZkzininlxmVmWmXinmYmYinininininabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixjZmkkjkjkjnkkjkjkjnlkjkjnmjZnnmCininininininnononpnqnrnsinabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjYjZjZjZjZjZjZnEkjkjjZjZjZjZjZjZkbnFnFnFnGmCinnHnHnHnHnHnHinabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZnPnPnQnRnSjZnTkjkjjZnUnVnWnXnYjZixiyixixiAkMnHnHnHnHnHnZinabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZkjkjkjmykjohkjkjkjoikjmykjmyojjZixjgiziyjginokokokokokolinabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZoqkjkjkjkjorkjkjkjoskjkjkjkjkjjZixixixizkzininininininininabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZoqkjkjoysdjZoAoBoAjZoCoDkjkjkjjZixizixjgkzinababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZkjkjkjjZjZjZoHoIkjjZjZjZkjkjkjjZixixiyixkzinababababababababababababababababababababababababababababababababababababababababababababababababababoVoVoVoVoVoVoVoVoWoVoVoVoVoVoVoVoVabababababababababoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZoMoNoOjZixjZoPoPoPjZixjZknoQoRjZixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababoVoYoZoZoZoZoZoYoYoYoZoZoZoZoZoYoVabababababababababoXpapbpcpdpdpbpepfpgphpipjpkpjpjpjploXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixjZoPoPoPjZixkVoTgIoUkXixjZoPoPoPjZixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababpmoYoYoYpnoYoYoYoYoYoYoYpnoYoYoYpmabababababababababoXpapbpbpbpbpbpopipipipppjpjpjpqpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixkVoTgIoUkXixixixixixixixkVoTgIoUkXixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababoVoYoZoZoZoZoZoYoYoYoZoZoZoZoZoYoVabababababababababoXpapbprpapsptpupipipipipjpjpvpjpwpkoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinixixixixixixixixixixixixixixixixixixixixixixkzinababababababababababababababababababababababababababababababababababababababababababababababababababoVpxpypypypypypypypypypypypypypzoVabababababababababoXpApipppppppppppipipipipjpjpjpBpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab +abababababababababababababababababababababababababababababababababinininininininininininininininininininininininininababababababababababababababababababababababababababababababababababababababababababpCpCpCpCpCpCpCpCpCpDpEpEpEpEpEpEpEpEpEpEpEpEpEpDpCpCpCpCpCpCpCpCpCaboXpFpipipipipipipipipipipGpjpjpjpjpjoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababpCpHpIpJpJpJpJpJpKpLpEpEpEpEpEpEpEpEpEpEpEpEpEpMpKpNpNpNpNpNpIpOpCaboXpFpipipipipipipipipppipGpPpPpPpQpPoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababpCpHpIpJpRpJpRpJpKpLpEpEpEpEpEpEpEpEpEpEpEpEpEpMpKpNpSpNpSpNpIpOpCaboXpTpipipipipipipipppUpppGpVpVpVpVpVoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababpCpHpIpJpJpWpJpJpKpLpEpEpEpEpEpXpYpXpEpEpEpEpEpMpKpNpNpZpNpNpIpOpCaboXoXqaqbqbqcoXoXoXoXoXoXoXoXoXoXoXoXoXabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab @@ -1111,3 +1196,4 @@ abababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab ababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababab "} + diff --git a/_maps/map_files/Efficiencystation/z7.dmm b/_maps/map_files/Efficiencystation/z7.dmm index 31afa30770f..dc4dab951db 100644 --- a/_maps/map_files/Efficiencystation/z7.dmm +++ b/_maps/map_files/Efficiencystation/z7.dmm @@ -581,7 +581,7 @@ "li" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/spacecontent/a5{name = "Syndicate Scouting Ship"}) "lj" = (/turf/simulated/wall/r_wall,/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) "lk" = (/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) -"ll" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) +"ll" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/charcoal,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) "lm" = (/obj/structure/table,/obj/item/stack/sheet/mineral/uranium{amount = 10},/obj/item/weapon/wrench,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 5},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) "ln" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/mask/gas,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/weapon/pickaxe,/turf/simulated/floor/plating{tag = "icon-warnplatecorner (NORTH)"; icon_state = "warnplatecorner"; dir = 1},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) "lo" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/structure/sign/vacuum{pixel_y = 32},/turf/simulated/floor/plating{tag = "icon-warnplatecorner"; icon_state = "warnplatecorner"; dir = 2},/area/turret_protected/tcomsat{name = "\improper Syndicate Mini Base"}) @@ -1124,3 +1124,4 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} + diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index 8ede060b3cc..2deb6a9ba0c 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -1246,7 +1246,7 @@ "xX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small,/obj/machinery/processor,/turf/simulated/floor/wood,/area/crew_quarters/bar) "xY" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/wood,/area/crew_quarters/bar) "xZ" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"ya" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"ya" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/morphine,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "yb" = (/obj/structure/table,/obj/machinery/light,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "yc" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_se"; name = "southeast of station"; turf_type = /turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"}; width = 18},/turf/space,/area/space) "yd" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/plating,/area/hallway/primary/central) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index d1ff2b07c89..99f2902a4c9 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -418,7 +418,7 @@ "aib" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aic" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aid" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"aie" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) +"aie" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/morphine,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aif" = (/obj/machinery/camera{c_tag = "Prison Sanitatium"; dir = 1; network = list("SS13","Prison"); pixel_x = 0; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aig" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/security/prison) "aih" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) @@ -6426,7 +6426,7 @@ "ctD" = (/obj/effect/landmark{name = "blobstart"},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine,/area/toxins/explab) "ctE" = (/obj/machinery/r_n_d/experimentor,/turf/simulated/floor/engine,/area/toxins/explab) "ctF" = (/obj/machinery/camera{c_tag = "Telescience Test Chamber"; dir = 1; network = list("SS13","RD")},/obj/machinery/light,/obj/structure/sign/nosmoking_2{pixel_y = -32},/turf/simulated/floor/engine,/area/toxins/explab) -"ctG" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"ctG" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/morphine,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "ctH" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "ctI" = (/obj/structure/table/reinforced,/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 5013f51b1ae..9b2b4ce6d12 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -741,7 +741,7 @@ "om" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'; name = "Corridor A"},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "on" = (/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/weapon/storage/firstaid/regular{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oo" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) -"op" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) +"op" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/obj/item/weapon/reagent_containers/glass/bottle/morphine,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oq" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/space) "or" = (/obj/machinery/teleport/station,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "os" = (/obj/machinery/teleport/hub/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 34d7f4ec827..9a237d24be0 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -256,26 +256,31 @@ //Move a single element from position fromIndex within a list, to position toIndex +//All elements in the range [1,toIndex) before the move will be before the pivot afterwards +//All elements in the range [toIndex, L.len+1) before the move will be after the pivot afterwards +//In other words, it's as if the range [fromIndex,toIndex) have been rotated using a <<< operation common to other languages. +//fromIndex and toIndex must be in the range [1,L.len+1] //This will preserve associations ~Carnie /proc/moveElement(list/L, fromIndex, toIndex) + if(fromIndex == toIndex || fromIndex+1 == toIndex) //no need to move + return if(fromIndex > toIndex) - ++fromIndex + ++fromIndex //since a null will be inserted before fromIndex, the index needs to be nudged right by one L.Insert(toIndex, null) L.Swap(fromIndex, toIndex) L.Cut(fromIndex, fromIndex+1) -//Move elements [fromIndex,fromIndex+len) to [toIndex,toIndex+len) -//This will preserve associations and is much faster than copying to a new list -//or checking for associative lists and manually copying elements ~Carnie +//Move elements [fromIndex,fromIndex+len) to [toIndex-len, toIndex) +//Same as moveElement but for ranges of elements +//This will preserve associations ~Carnie /proc/moveRange(list/L, fromIndex, toIndex, len=1) var/distance = abs(toIndex - fromIndex) - if(len > distance) //there are more elements to be moved than the distance to be moved. Therefore the same result can be achieved (with fewer operations) by moving elements between where we are and where we are going - if(fromIndex < toIndex) - toIndex += len - else - fromIndex += len + if(len >= distance) //there are more elements to be moved than the distance to be moved. Therefore the same result can be achieved (with fewer operations) by moving elements between where we are and where we are going. The result being, our range we are moving is shifted left or right by dist elements + if(fromIndex <= toIndex) + return //no need to move + fromIndex += len //we want to shift left instead of right for(var/i=0, i (toIndex)){L.Insert((toIndex), null);L.Swap((fromIndex)+1, (toIndex));L.Cut((fromIndex)+1, (fromIndex)+2);}else{L.Insert((toIndex)+1, null);L.Swap((fromIndex), (toIndex)+1);L.Cut((fromIndex), (fromIndex)+1);} #define fetchElement(L, i) (associative) ? L[L[i]] : L[i] //Minimum sized sequence that will be merged. Anything smaller than this will use binary-insertion sort. @@ -115,7 +114,7 @@ var/datum/sortInstance/sortInstance = new() //in other words, find where the pivot element should go using bisection search while(left < right) var/mid = (left + right) >> 1 //round((left+right)/2) - if(call(cmp)(pivot, fetchElement(L,mid)) < 0) + if(call(cmp)(fetchElement(L,mid), pivot) > 0) right = mid else left = mid+1 @@ -372,23 +371,23 @@ var/datum/sortInstance/sortInstance = new() proc/mergeLo(base1, len1, base2, len2) //ASSERT(len1 > 0 && len2 > 0 && base1 + len1 == base2) + var/cursor1 = base1 + var/cursor2 = base2 + //degenerate cases if(len2 == 1) - moveElement(L, base2, base1) + moveElement(L, cursor2, cursor1) return if(len1 == 1) - moveElement(L, base1, base2+len2-1) + moveElement(L, cursor1, cursor2+len2) return //Move first element of second run - moveElement(L, base2, base1) //L[dest++] = L[cursor2++] + moveElement(L, cursor2++, cursor1++) --len2 - var/cursor1 = base1+1 - var/cursor2 = base2+1 - outer: while(1) var/count1 = 0 //# of times in a row that first run won @@ -399,9 +398,7 @@ var/datum/sortInstance/sortInstance = new() do //ASSERT(len1 > 1 && len2 > 0) if(call(cmp)(fetchElement(L,cursor2), fetchElement(L,cursor1)) < 0) - moveElement(L, cursor2, cursor1) - ++cursor2 - ++cursor1 + moveElement(L, cursor2++, cursor1++) --len2 ++count2 @@ -466,8 +463,7 @@ var/datum/sortInstance/sortInstance = new() if(len1 == 1) //ASSERT(len2 > 0) - - moveRange(L, cursor2, cursor1, len2) + moveElement(L, cursor1, cursor2+len2) //else //ASSERT(len2 == 0) @@ -477,22 +473,20 @@ var/datum/sortInstance/sortInstance = new() proc/mergeHi(base1, len1, base2, len2) //ASSERT(len1 > 0 && len2 > 0 && base1 + len1 == base2) + var/cursor1 = base1 + len1 - 1 //start at end of sublists + var/cursor2 = base2 + len2 - 1 + //degenerate cases if(len2 == 1) moveElement(L, base2, base1) return if(len1 == 1) - moveElement(L, base1, base2+len2-1) + moveElement(L, base1, cursor2+1) return - var/cursor1 = base1 + len1 - 1 - var/cursor2 = base2 + len2 - 1 - - moveElement(L, cursor1, cursor2) + moveElement(L, cursor1--, cursor2-- + 1) --len1 - --cursor1 - --cursor2 outer: while(1) @@ -503,10 +497,7 @@ var/datum/sortInstance/sortInstance = new() do //ASSERT(len1 > 0 && len2 > 1) if(call(cmp)(fetchElement(L,cursor2), fetchElement(L,cursor1)) < 0) - moveElement(L, cursor1, cursor2) - - --cursor1 - --cursor2 + moveElement(L, cursor1--, cursor2-- + 1) --len1 ++count1 @@ -533,11 +524,12 @@ var/datum/sortInstance/sortInstance = new() count1 = len1 - gallopRight(fetchElement(L,cursor2), base1, len1, len1-1) //should cursor1 be base1? if(count1) cursor1 -= count1 + + moveRange(L, cursor1+1, cursor2+1, count1) //cursor1+1 == cursor2 by definition + cursor2 -= count1 len1 -= count1 - moveRange(L, cursor1+1, cursor2+1, count1) - if(len1 == 0) break outer @@ -546,7 +538,7 @@ var/datum/sortInstance/sortInstance = new() if(--len2 == 1) break outer - count2 = len2 - gallopLeft(fetchElement(L,cursor1), base1+len1, len2, len2-1) + count2 = len2 - gallopLeft(fetchElement(L,cursor1), cursor1+1, len2, len2-1) if(count2) cursor2 -= count2 len2 -= count2 @@ -554,9 +546,7 @@ var/datum/sortInstance/sortInstance = new() if(len2 <= 1) break outer - moveElement(L, cursor1, cursor2) - --cursor1 - --cursor2 + moveElement(L, cursor1--, cursor2-- + 1) --len1 if(len1 == 0) @@ -573,7 +563,6 @@ var/datum/sortInstance/sortInstance = new() //ASSERT(len1 > 0) cursor1 -= len1 - cursor2 -= len1 moveRange(L, cursor1+1, cursor2+1, len1) //else @@ -664,5 +653,4 @@ var/datum/sortInstance/sortInstance = new() #undef MIN_GALLOP #undef MIN_MERGE -#undef moveElement #undef fetchElement \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index d56c8421f2d..44a81c6a884 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -33,7 +33,7 @@ BONUS switch(A.stage) if(1, 2) if(H.facial_hair_style == "Shaved") - H.facial_hair_style = "Adam Jensen Beard" + H.facial_hair_style = "Jensen Beard" H.update_hair() if(3, 4) if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard") && !(H.facial_hair_style == "Full Beard")) diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index aeb76b340c4..c4cf94b0956 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -30,8 +30,8 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(5) - if (M.reagents.get_reagent_amount("morphine") < 30) - M.reagents.add_reagent("morphine", 10) + if (M.reagents.get_reagent_amount("ephedrine") < 30) + M.reagents.add_reagent("ephedrine", 10) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) M << "[pick("You feel restless.", "You feel like running laps around the station.")]" diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index f5c0b4d5d33..d0822f3e127 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -3,8 +3,8 @@ max_stages = 4 spread_text = "On contact" spread_flags = CONTACT_GENERAL - cure_text = "Alkysine" - cures = list("alkysine") + cure_text = "Mannitol" + cures = list("mannitol") agent = "Cryptococcus Cosmosis" viable_mobtypes = list(/mob/living/carbon/human) disease_flags = CAN_CARRY|CAN_RESIST diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 6df8582e325..c24e13668e0 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -3,8 +3,8 @@ max_stages = 4 spread_text = "On contact" spread_flags = CONTACT_GENERAL - cure_text = "Ryetalyn" - cures = list("ryetalyn") + cure_text = "Mutadone" + cures = list("mutadone") disease_flags = CAN_CARRY|CAN_RESIST agent = "S4E1 retrovirus" viable_mobtypes = list(/mob/living/carbon/human) diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index bc22d9641bf..c5eb3cea9e2 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -20,7 +20,7 @@ ..() agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]" if(prob(40)) - cures = list("ryetalyn") + cures = list("mutadone") else restcure = 1 diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index c6d5253ee01..9a2b80739f7 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -534,8 +534,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/glass/bottle/charcoal, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin, + /obj/item/weapon/reagent_containers/glass/bottle/morphine, + /obj/item/weapon/reagent_containers/glass/bottle/morphine, /obj/item/weapon/reagent_containers/glass/bottle/morphine, /obj/item/weapon/reagent_containers/glass/bottle/morphine, /obj/item/weapon/reagent_containers/glass/bottle/morphine, diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index c25fb4d9653..4fec23faac0 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -311,7 +311,7 @@ var/list/uplink_items = list() name = "Poison Kit" desc = "An assortment of nasty chemicals." item = /obj/item/weapon/storage/box/syndie_kit/chemical - cost = 2 + cost = 6 surplus = 50 /datum/uplink_item/stealthy_weapons/detomatix diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index e69d8f861a1..ceb7fc8e311 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -10,7 +10,7 @@ /obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user) user << "We cleanse impurities from our form." - user.reagents.add_reagent("ryetalyn", 10) + user.reagents.add_reagent("mutadone", 10) user.reagents.add_reagent("potass_iodide", 10) user.reagents.add_reagent("charcoal", 20) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 78e49d45605..93c6a3753c9 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -169,8 +169,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(!iscultist(user)) user << "You can't mouth the arcane scratchings without fumbling over them." return - if(!user.can_speak() && (user.mind && !user.mind.miming)) - user << "You are unable to speak the words of the rune." + var/message = "You are unable to speak the words of the rune." + if(!user.can_speak(message) && (user.mind && !user.mind.miming)) + user << message return if(!word1 || !word2 || !word3 || prob(user.getBrainLoss())) return fizzle(user) diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 93ec09810de..a19846888be 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -134,8 +134,9 @@ fingerprints = pick_fingerprints() */ - src.text += "

The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently." + src.text += "

The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently." src.text += "It would be in your best interests to suspect everybody, as these undercover operatives could have implants which trigger them to have their memories removed until they are needed. He, or she, could even be a high ranking officer." + src.text += "
" /* src.text += "After some investigation, we " if(traitor_name) @@ -173,8 +174,9 @@ else traitor_name = pick_mob() */ - src.text += "

It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can." + src.text += "

It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can." src.text += "Watch out for the following: praying to an unfamilar god, preaching the word of \[REDACTED\], sacrifices, magical dark power, living constructs of evil and a portal to the dimension of the underworld." + src.text += "
" /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been converted " src.text += "and instilled with the idea of the flimsiness of the real world, seeking to destroy it. " @@ -213,8 +215,9 @@ else traitor_name = src.pick_mob() */ - src.text += "

It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector." + src.text += "

It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector." src.text += "Watch out for suspicious activity among the crew and make sure that all heads of staff report in periodically." + src.text += "
" /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been brainwashed " src.text += "at a recent conference, and their department should be closely monitored for signs of mutiny. " @@ -228,26 +231,30 @@ src.text += "

Syndicate forces may be supplying opposing criminal organizations within your sector in an attempt at destabilizing our operations." src.text += "Ensure law and order is maintained on the station and be on the lookout for violent confrontations between station factions." src.text += "Central Command retains an interest in any criminal leaders captured by station security. The execution or exile of these persons are ill-advised." + src.text += "
" /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) var/SWF_desc = pick(SWF_names) - src.text += "

The evil Space Wizards Federation have recently broke their most feared wizard, known only as \"[SWF_desc]\" out of space jail. " + src.text += "

The evil Space Wizards Federation have recently broke their most feared wizard, known only as \"[SWF_desc]\" out of space jail. " src.text += "He is on the run, last spotted in a system near your present location. If anybody suspicious is located aboard, please " src.text += "approach with EXTREME caution. Centcom also recommends that it would be wise to not inform the crew of this, due to their fearful nature." src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells." + src.text += "
" /datum/intercept_text/proc/build_nuke(datum/mind/correct_person) src.text += "

Centcom recently recieved a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc " src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe " src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but " src.text += "the most trusted crew-members." + src.text += "
" /datum/intercept_text/proc/build_malf(datum/mind/correct_person) var/a_name = pick(src.anomalies) - src.text += "

A [a_name] was recently picked up by a nearby stations sensors in your sector. If it came into contact with your ship or " + src.text += "

A [a_name] was recently picked up by a nearby stations sensors in your sector. If it came into contact with your ship or " src.text += "electrical equipment, it may have had hazardarous and unpredictable effect. Closely observe any non carbon based life forms " src.text += "for signs of unusual behaviour, but keep this information discreet at all times due to this possibly dangerous scenario." + src.text += "
" /datum/intercept_text/proc/build_changeling(datum/mind/correct_person) var/cname = pick(src.changeling_names) @@ -275,10 +282,10 @@ changeling_name = src.pick_mob() */ - src.text += "

We have received a report that a dangerous alien lifeform known only as \"[cname]\" may have infiltrated your crew. " + src.text += "

We have received a report that a dangerous alien lifeform known only as \"[cname]\" may have infiltrated your crew. " /* src.text += "Our intelligence suggests a [prob_right_job]% chance that a [changeling_job] on board your station has been replaced by the alien. " src.text += "Additionally, the report indicates a [prob_right_dude]% chance that [changeling_name] may have been in contact with the lifeform at a recent social gathering. " */ - src.text += "These lifeforms are assosciated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " - src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!" + src.text += "These lifeforms are associated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " + src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!" diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index a64291d805d..610708a9454 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -16,10 +16,9 @@ var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except ephedrine, coz ephedrine is always avalible - var/list/possible_chems = list(list("stoxin", "salbutamol", "salglu_solution", "salglu_solution"), - list("stoxin", "salbutamol", "salglu_solution", "salglu_solution", "oculine"), - list("stoxin", "salbutamol", "salglu_solution", "salglu_solution", "oculine", "charcoal", "ryetalyn", "alkysine", "pen_acid")) - + var/list/possible_chems = list(list("morphine", "salbutamol", "salglu_solution"), + list("morphine", "salbutamol", "salglu_solution", "oculine"), + list("morphine", "salbutamol", "salglu_solution", "oculine", "charcoal", "mutadone", "mannitol", "pen_acid")) /obj/machinery/sleeper/New() ..() component_parts = list() @@ -228,4 +227,4 @@ if(state_open) icon_state = "sleeper-open" else - icon_state = "sleeper" + icon_state = "sleeper" \ No newline at end of file diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index ae846787d06..68ca61280e7 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -47,6 +47,10 @@ /obj/machinery/atmospherics/unary/cryo_cell/process() ..() + if(occupant) + if(occupant.health >= 100) + on = 0 + open_machine() if(!node || !is_operational()) return if(!on) @@ -61,7 +65,6 @@ if(occupant) if(occupant.stat != 2) process_occupant() - if(abs(temperature_archived-air_contents.temperature) > 1) parent.update = 1 diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 2ee4138a9ab..9fc80e1f630 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -170,29 +170,13 @@ Nah if(href_list["dmake"]) if(!wait) var/p_type = text2num(href_list["dmake"]) - var/obj/structure/disposalconstruct/C = new (src.loc) - switch(p_type) - if(0) - C.ptype = 0 - if(1) - C.ptype = 1 - if(2) - C.ptype = 2 - if(3) - C.ptype = 4 - if(4) - C.ptype = 5 - if(5) - C.ptype = 6 - C.density = 1 - if(6) - C.ptype = 7 - C.density = 1 - if(7) - C.ptype = 8 - C.density = 1 - if(8) - C.ptype = 9 + var/obj/structure/disposalconstruct/C = new (src.loc,p_type+1) + + if(!C.can_place()) + usr << "There's not enough room to build that here!" + qdel(C) + return + C.add_fingerprint(usr) C.update() wait = 1 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7f2c6744342..100afc2041b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -765,10 +765,10 @@ product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access_txt = "5" products = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 4, - /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, + /obj/item/weapon/reagent_containers/glass/bottle/morphine = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,/obj/item/weapon/reagent_containers/hypospray/medipen = 5, /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, /obj/item/device/sensor_device = 2) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/charcoal = 6) + contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/morphine = 4,/obj/item/weapon/reagent_containers/pill/charcoal = 6) //This one's from bay12 @@ -970,7 +970,7 @@ /obj/item/clothing/under/suit_jacket/really_black=2,/obj/item/clothing/under/pants/jeans=3,/obj/item/clothing/under/pants/classicjeans=2, /obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2, /obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2, - /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1, + /obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/track=1, /obj/item/clothing/tie/scarf/red=1,/obj/item/clothing/tie/scarf/green=1,/obj/item/clothing/tie/scarf/darkblue=1, /obj/item/clothing/tie/scarf/purple=1,/obj/item/clothing/tie/scarf/yellow=1,/obj/item/clothing/tie/scarf/orange=1, /obj/item/clothing/tie/scarf/lightblue=1,/obj/item/clothing/tie/scarf/white=1,/obj/item/clothing/tie/scarf/black=1, diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 67e34d91428..b16acd7a48e 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -528,33 +528,18 @@ var/global/list/RPD_recipes=list( user << "Building Pipes..." playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) + var/obj/structure/disposalconstruct/C = new (A,p_type+1) + + if(!C.can_place()) + user << "There's not enough room to build that here!" + qdel(C) + return 0 + activate() - var/obj/structure/disposalconstruct/C = new (A) // This may still produce runtimes, but I checked and /obj/structure/disposalconstruct // DOES have a dir property, inherited from /obj/structure. - N3X C.dir=p_dir - switch(p_type) - if(0) - C.ptype = 0 - if(1) - C.ptype = 1 - if(2) - C.ptype = 2 - if(3) - C.ptype = 4 - if(4) - C.ptype = 5 - if(5) - C.ptype = 6 - C.density = 1 - if(6) - C.ptype = 7 - C.density = 1 - if(7) - C.ptype = 8 - C.density = 1 - if(8) - C.ptype = 9 + C.add_fingerprint(usr) C.update() return 1 diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 5e4e26cbabd..9955c1c7b4b 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -17,6 +17,8 @@ density = 0 anchored = 0 layer = 2.8 + var/framestack = /obj/item/stack/rods + var/framestackamount = 2 /obj/structure/table_frame/attackby(var/obj/item/I, mob/user) if(istype(I, /obj/item/weapon/wrench)) @@ -24,7 +26,8 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/rods(src.loc) + for(var/i = 1, i <= framestackamount, i++) + new framestack(get_turf(src)) qdel(src) return if(istype(I, /obj/item/stack/sheet/plasteel)) @@ -60,16 +63,12 @@ name = "wooden table frame" desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this." icon_state = "wood_frame" + framestack = /obj/item/stack/sheet/mineral/wood + framestackamount = 2 /obj/structure/table_frame/wood/attackby(var/obj/item/I, mob/user) if(istype(I, /obj/item/weapon/wrench)) - user << "Now disassembling [src]." - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - if(do_after(user, 30)) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - new /obj/item/stack/sheet/mineral/wood(src.loc) - qdel(src) - return + ..() if(istype(I, /obj/item/stack/sheet/mineral/wood)) var/obj/item/stack/sheet/mineral/wood/W = I user << "Now adding [W] to [src]." diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 30317abac0e..3042fc6c383 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -25,6 +25,8 @@ var/framestack = /obj/item/stack/rods var/buildstack = /obj/item/stack/sheet/metal var/busy = 0 + var/buildstackamount = 1 + var/framestackamount = 2 /obj/structure/table/New() ..() @@ -333,8 +335,10 @@ /obj/structure/table/proc/table_destroy(var/destroy_type, var/mob/user) if(destroy_type == TBL_DESTROY) - new framestack(src.loc) - new buildstack(src.loc) + for(var/i = 1, i <= framestackamount, i++) + new framestack(get_turf(src)) + for(var/i = 1, i <= buildstackamount, i++) + new buildstack(get_turf(src)) qdel(src) return @@ -343,7 +347,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20)) new frame(src.loc) - new buildstack(src.loc) + for(var/i = 1, i <= buildstackamount, i++) + new buildstack(get_turf(src)) qdel(src) return @@ -351,8 +356,10 @@ user << "Now deconstructing [src]." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 40)) - new framestack(src.loc) - new buildstack(src.loc) + for(var/i = 1, i <= framestackamount, i++) + new framestack(get_turf(src)) + for(var/i = 1, i <= buildstackamount, i++) + new buildstack(get_turf(src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) return diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index e75d03cb4d8..53e796746ed 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -54,20 +54,6 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/greatcoat - name = "greatcoat" - desc = "A Nazi greatcoat." - icon_state = "nazi" - item_state = "nazi" - - -/obj/item/clothing/suit/johnny_coat - name = "johnny~~ coat" - desc = "Johnny~~" - icon_state = "johnny" - item_state = "johnny" - - /obj/item/clothing/suit/justice name = "justice suit" desc = "this pretty much looks ridiculous" //Needs no fixing @@ -214,7 +200,7 @@ name = "bomber jacket" desc = "Aviators not included." icon_state = "bomberjacket" - item_state = "johnny" + item_state = "brownjsuit" allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 58d5cb563e1..581cb073d03 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -13,7 +13,7 @@ name = "emergency firesuit" desc = "A suit that helps protect against fire and heat." icon_state = "fire" - item_state = "fire_suit" + item_state = "ro_suit" w_class = 4 gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 28ad8e42ad1..2753980a5f1 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -3,9 +3,9 @@ /obj/item/clothing/under/rank/bartender desc = "It looks like it could use some more flair." name = "bartender's uniform" - icon_state = "ba_suit" - item_state = "ba_suit" - item_color = "ba_suit" + icon_state = "bar_suit" + item_state = "bar_suit" + item_color = "bar_suit" /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. @@ -136,7 +136,7 @@ name = "black suit" desc = "A professional black suit. Nanotrasen Investigation Bureau approved!" icon_state = "blacksuit" - item_state = "ba_suit" + item_state = "bar_suit" item_color = "blacksuit" can_adjust = 1 diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 5947065bf55..3fd2cc664f7 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -117,48 +117,3 @@ icon_state = "scrubspurple" item_color = "scrubspurple" can_adjust = 0 - - - -/* - * Medsci, unused (i think) stuff - */ -/obj/item/clothing/under/rank/geneticist_new - desc = "It's made of a special fiber that provides minor protection against biohazards." - name = "geneticist's jumpsuit" - icon_state = "genetics_new" - item_state = "w_suit" - item_color = "genetics_new" - permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - can_adjust = 0 - -/obj/item/clothing/under/rank/chemist_new - desc = "It's made of a special fiber that provides minor protection against biohazards." - name = "chemist's jumpsuit" - icon_state = "chemist_new" - item_state = "w_suit" - item_color = "chemist_new" - permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - can_adjust = 0 - -/obj/item/clothing/under/rank/scientist_new - desc = "Made of a special fiber that gives special protection against biohazards and small explosions." - name = "scientist's jumpsuit" - icon_state = "scientist_new" - item_state = "w_suit" - item_color = "scientist_new" - permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - can_adjust = 0 - -/obj/item/clothing/under/rank/virologist_new - desc = "Made of a special fiber that gives increased protection against biohazards." - name = "virologist's jumpsuit" - icon_state = "virologist_new" - item_state = "w_suit" - item_color = "virologist_new" - permeability_coefficient = 0.50 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - can_adjust = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 88cc52f77bd..97dde6868a0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -134,13 +134,6 @@ fitted = 0 can_adjust = 0 -/obj/item/clothing/under/johnny - name = "johnny~~ jumpsuit" - desc = "Johnny~~" - icon_state = "johnny" - item_color = "johnny" - can_adjust = 0 - /obj/item/clothing/under/rainbow name = "rainbow" desc = "rainbow" @@ -186,7 +179,6 @@ icon_state = "really_black_suit" item_state = "bl_suit" item_color = "black_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/female name = "executive suit" @@ -201,7 +193,6 @@ icon_state = "red_suit" item_state = "r_suit" item_color = "red_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/charcoal name = "charcoal suit" @@ -209,7 +200,6 @@ icon_state = "charcoal_suit" item_state = "charcoal_suit" item_color = "charcoal_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/navy name = "navy suit" @@ -217,7 +207,6 @@ icon_state = "navy_suit" item_state = "navy_suit" item_color = "navy_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/burgundy name = "burgundy suit" @@ -225,7 +214,6 @@ icon_state = "burgundy_suit" item_state = "burgundy_suit" item_color = "burgundy_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/checkered name = "checkered suit" @@ -233,7 +221,6 @@ icon_state = "checkered_suit" item_state = "checkered_suit" item_color = "checkered_suit" - can_adjust = 0 /obj/item/clothing/under/suit_jacket/tan name = "tan suit" @@ -241,7 +228,13 @@ icon_state = "tan_suit" item_state = "tan_suit" item_color = "tan_suit" - can_adjust = 0 + +/obj/item/clothing/under/suit_jacket/white + name = "white suit" + desc = "A white suit and jacket with a black shirt. You wanna play rough? OKAY!." + icon_state = "white_suit" + item_state = "white_suit" + item_color = "white_suit" /obj/item/clothing/under/blackskirt name = "black skirt" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index db060397c5a..15e4aa194a5 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -52,12 +52,6 @@ icon_state = "tanpants" item_color = "tanpants" -/obj/item/clothing/under/pants/blue - name = "blue pants" - desc = "Stylish blue pants. These go well with a lot of clothes." - icon_state = "bluepants" - item_color = "bluepants" - /obj/item/clothing/under/pants/track name = "track pants" desc = "A pair of track pants, for the athletic." diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm index 92e19a356da..cd97b0eccc8 100644 --- a/code/modules/food&drinks/recipes/drinks_recipes.dm +++ b/code/modules/food&drinks/recipes/drinks_recipes.dm @@ -441,7 +441,7 @@ name = "Neurotoxin" id = "neurotoxin" result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, "stoxin" = 1) + required_reagents = list("gargleblaster" = 1, "morphine" = 1) result_amount = 2 /datum/chemical_reaction/snowwhite diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 36e7d97b11d..b757827c5da 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -844,14 +844,14 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() ..() reagents.add_reagent("nutriment", 1) reagents.add_reagent("charcoal", 3+round(potency / 3, 1)) - reagents.add_reagent("stoxin", 3+round(potency / 3, 1)) + reagents.add_reagent("morphine", 3+round(potency / 3, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Anti-Toxin: [reagents.get_reagent_amount("charcoal")]%" - user << "- Sleep Toxin: [reagents.get_reagent_amount("stoxin")]%" + user << "- Morphine: [reagents.get_reagent_amount("morphine")]%" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita seed = /obj/item/seeds/amanitamycelium diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index b90e2886ea3..53eaa53884f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -184,19 +184,6 @@ else message = "[src] hugs \himself." - if ("johnny") - var/M - if (param) - M = param - if (!M) - param = null - else - if(miming) - message = "[src] takes a drag from a cigarette and blows \"[M]\" out in smoke." - else - message = "[src] says, \"[M], please. He had a family.\" [src.name] takes a drag from a cigarette and blows \his name out in smoke." - m_type = 2 - if ("me") if(silent) return @@ -316,7 +303,7 @@ m_type = 2 if ("help") //This can stay at the bottom. - src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, johnny, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn" + src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tremble, twitch, twitch_s, wave, whimper, wink, yawn" else ..(act) diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 42d05eb5d08..fa45d328e39 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -65,7 +65,7 @@ melee_damage_upper = 10 poison_per_bite = 10 var/atom/cocoon_target - poison_type = "stoxin" + poison_type = "morphine" var/fed = 0 //hunters have the most poison and move the fastest, so they can find prey diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 02e8befd05e..7d26a965f30 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -85,7 +85,7 @@ else if(backbag == 3) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) if(BARTENDER) - clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "bar_suit_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY) if(backbag == 2) @@ -134,7 +134,7 @@ if(backbag == 3) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) if(CARGOTECH) - clothes_s = new /icon('icons/mob/uniform.dmi', "cargo_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) if(backbag == 2) clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index fe87d9dc4ba..8b42ef1bcb8 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -274,7 +274,7 @@ icon_state = "hair_reversemohawk" /datum/sprite_accessory/hair/jensen - name = "Adam Jensen Hair" + name = "Jensen Hair" icon_state = "hair_jensen" /datum/sprite_accessory/hair/gelled @@ -542,7 +542,7 @@ icon_state = "facial_gt" /datum/sprite_accessory/facial_hair/jensen - name = "Adam Jensen Beard" + name = "Jensen Beard" icon_state = "facial_jensen" /datum/sprite_accessory/facial_hair/dwarf diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 2d5ead77aff..bbc692383da 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -322,7 +322,7 @@ /obj/item/weapon/paper/Toxin name = "paper- 'Chemical Information'" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" + info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tMorphine T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" /obj/item/weapon/paper/courtroom name = "paper- 'A Crash Course in Legal SOP on SS13'" diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index df2f366af0e..e37f7ecfa38 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -70,7 +70,7 @@ /obj/item/weapon/pen/sleepy/New() create_reagents(55) - reagents.add_reagent("stoxin", 30) + reagents.add_reagent("morphine", 30) reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10) ..() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index f47f1163eb4..d5929c607e4 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -48,7 +48,7 @@ name = "kinetic speargun" desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy." icon_state = "speargun" - item_state = "misteratmos" //professional asset reuse + item_state = "speargun" w_class = 4 force = 10 can_suppress = 0 diff --git a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm index 2570f4232e7..aacabb4a04d 100644 --- a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm +++ b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm @@ -10,6 +10,8 @@ datum/reagent/nicotine description = "Stun reduction per cycle, slight stamina regeneration buff. Overdoses become rapidly deadly." reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 + overdose_threshold = 35 + addiction_threshold = 30 datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -18,11 +20,14 @@ datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob) M << "[smoke_message]" M.AdjustStunned(-1) M.adjustStaminaLoss(-1*REM) - if(volume > 35) - if(prob(20)) - M << "You feel like you smoked too much." - M.adjustToxLoss(1*REM) - M.adjustOxyLoss(1*REM) + ..() + return + +datum/reagent/nicotine/overdose_process(var/mob/living/M as mob) + if(prob(20)) + M << "You feel like you smoked too much." + M.adjustToxLoss(1*REM) + M.adjustOxyLoss(1*REM) ..() return @@ -32,6 +37,8 @@ datum/reagent/crank description = "2x stun reduction per cycle. Warms you up, makes you jittery as hell." reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 + overdose_threshold = 20 + addiction_threshold = 10 datum/reagent/crank/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -41,13 +48,33 @@ datum/reagent/crank/on_mob_life(var/mob/living/M as mob) M.AdjustParalysis(-2) M.AdjustStunned(-2) M.AdjustWeakened(-2) - if(volume > 20) - M.adjustBrainLoss(rand(1,10)*REM) - M.adjustToxLoss(rand(1,10)*REM) - M.adjustBruteLoss(rand(1,10)*REM) + ..() + return +datum/reagent/crank/overdose_process(var/mob/living/M as mob) + M.adjustBrainLoss(rand(1,10)*REM) + M.adjustToxLoss(rand(1,10)*REM) + M.adjustBruteLoss(rand(1,10)*REM) ..() return +datum/reagent/crank/addiction_act_stage1(var/mob/living/M as mob) + M.adjustBrainLoss(rand(1,10)*REM) + ..() + return +datum/reagent/crank/addiction_act_stage2(var/mob/living/M as mob) + M.adjustToxLoss(rand(1,10)*REM) + ..() + return +datum/reagent/crank/addiction_act_stage3(var/mob/living/M as mob) + M.adjustBruteLoss(rand(1,10)*REM) + ..() + return +datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob) + M.adjustBrainLoss(rand(1,10)*REM) + M.adjustToxLoss(rand(1,10)*REM) + M.adjustBruteLoss(rand(1,10)*REM) + ..() + return /datum/chemical_reaction/crank name = "Crank" id = "crank" @@ -63,8 +90,8 @@ datum/reagent/crank/on_mob_life(var/mob/living/M as mob) description = "Cools and calms you down, occasional BRAIN and TOX damage." reagent_state = LIQUID color = "#60A584" // rgb: 96, 165, 132 - var/cycle_count = 0 - var/overdosed + overdose_threshold = 20 + addiction_threshold = 15 /datum/reagent/krokodil/on_mob_life(var/mob/living/M as mob) @@ -72,22 +99,40 @@ datum/reagent/crank/on_mob_life(var/mob/living/M as mob) var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.") if(prob(5)) M << "[high_message]" + ..() + return + +/datum/reagent/krokodil/overdose_process(var/mob/living/M as mob) if(prob(10)) M.adjustBrainLoss(rand(1,5)*REM) M.adjustToxLoss(rand(1,5)*REM) - if(cycle_count == 10) - M.adjustBrainLoss(rand(1,10)*REM) - M.adjustToxLoss(rand(1,10)*REM) - if(cycle_count == 20) + ..() + return + + +/datum/reagent/krokodil/addiction_act_stage1(var/mob/living/M as mob) + M.adjustBrainLoss(rand(1,5)*REM) + M.adjustToxLoss(rand(1,5)*REM) + ..() + return +/datum/reagent/krokodil/addiction_act_stage2(var/mob/living/M as mob) + if(prob(25)) M << "Your skin feels loose..." - if(cycle_count == 50) - M << "Your skin falls off!" + ..() + return +/datum/reagent/krokodil/addiction_act_stage3(var/mob/living/M as mob) + if(prob(25)) + M << "Your skin starts to peel away..." + M.adjustBruteLoss(3*REM) + ..() + return +/datum/reagent/krokodil/addiction_act_stage4(var/mob/living/carbon/human/M as mob) + if(!istype(M.dna.species, /datum/species/skeleton)) + M << "Your skin falls off! Holy shit!" M.adjustBruteLoss(rand(50,80)*REM) // holy shit your skin just FELL THE FUCK OFF hardset_dna(M, null, null, null, null, /datum/species/skeleton) - if(volume > 20) - overdosed = 1 - if(overdosed) - cycle_count++ + else + M.adjustBruteLoss(5*REM) ..() return diff --git a/code/modules/reagents/Chemistry-Goon-Medicine.dm b/code/modules/reagents/Chemistry-Goon-Medicine.dm index 82eec77c59c..db68b5cbaa0 100644 --- a/code/modules/reagents/Chemistry-Goon-Medicine.dm +++ b/code/modules/reagents/Chemistry-Goon-Medicine.dm @@ -59,15 +59,15 @@ datum/reagent/styptic_powder/on_mob_life(var/mob/living/M as mob) datum/reagent/salglu_solution name = "Saline-Glucose Solution" id = "salglu_solution" - description = "33% chance per cycle of healing 1 point each of BRUTE and BURN damage." + description = "33% chance per cycle of healing 3 point each of BRUTE and BURN damage." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(prob(33)) - M.adjustBruteLoss(-1*REM) - M.adjustFireLoss(-1*REM) + if(prob(50)) + M.adjustBruteLoss(-3*REM) + M.adjustFireLoss(-3*REM) ..() return @@ -81,8 +81,8 @@ datum/reagent/synthflesh datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) if(!M) M = holder.my_atom if(method == TOUCH) - M.heal_organ_damage(volume*REM,0) - M.adjustFireLoss((volume-(volume*2)*REM)) + M.adjustBruteLoss(-(1*volume)*REM) + M.adjustFireLoss(-(1*volume)*REM) M << "You feel your burns healing and your flesh knitting together!" ..() return @@ -90,16 +90,16 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo datum/reagent/charcoal name = "Charcoal" id = "charcoal" - description = "Heals 2 TOX damage per cycle." + description = "Heals 3 TOX damage per cycle and purges other chemicals slowly." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(-1.5*REM) + M.adjustToxLoss(-3*REM) for(var/datum/reagent/R in M.reagents.reagent_list) if(R != src) - M.reagents.remove_reagent(R.id,0.5) + M.reagents.remove_reagent(R.id,1) ..() return @@ -148,6 +148,7 @@ datum/reagent/omnizine reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 0.2 + overdose_threshold = 30 datum/reagent/omnizine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -158,6 +159,14 @@ datum/reagent/omnizine/on_mob_life(var/mob/living/M as mob) ..() return +datum/reagent/omnizine/overdose_process(var/mob/living/M as mob) + M.adjustToxLoss(3*REM) + M.adjustOxyLoss(3*REM) + M.adjustBruteLoss(3*REM) + M.adjustFireLoss(3*REM) + ..() + return + datum/reagent/calomel name = "Calomel" id = "calomel" @@ -242,6 +251,7 @@ datum/reagent/sal_acid description = "If BRUTE damage is under 50, 50% chance to heal one unit." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 + overdose_threshold = 25 datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -251,6 +261,13 @@ datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob) ..() return +datum/reagent/sal_acid/overdose_process(var/mob/living/M as mob) + if(M.getBruteLoss() < 50) + if(prob(50)) + M.adjustBruteLoss(2*REM) + ..() + return + /datum/chemical_reaction/sal_acid name = "Salicyclic Acid" id = "sal_acid" @@ -315,12 +332,12 @@ datum/reagent/ephedrine reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 0.3 + overdose_threshold = 45 + addiction_threshold = 30 datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.status_flags |= GOTTAGOFAST - if(M.losebreath >= 10) - M.losebreath = max(10, M.losebreath-5) M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) @@ -328,6 +345,38 @@ datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob) ..() return +datum/reagent/ephedrine/overdose_process(var/mob/living/M as mob) + if(prob(33)) + M.adjustToxLoss(1*REM) + M.losebreath++ + ..() + return + +datum/reagent/ephedrine/addiction_act_stage1(var/mob/living/M as mob) + if(prob(33)) + M.adjustToxLoss(2*REM) + M.losebreath += 2 + ..() + return +datum/reagent/ephedrine/addiction_act_stage2(var/mob/living/M as mob) + if(prob(33)) + M.adjustToxLoss(3*REM) + M.losebreath += 3 + ..() + return +datum/reagent/ephedrine/addiction_act_stage3(var/mob/living/M as mob) + if(prob(33)) + M.adjustToxLoss(4*REM) + M.losebreath += 4 + ..() + return +datum/reagent/ephedrine/addiction_act_stage4(var/mob/living/M as mob) + if(prob(33)) + M.adjustToxLoss(5*REM) + M.losebreath += 5 + ..() + return + /datum/chemical_reaction/ephedrine name = "Ephedrine" id = "ephedrine" @@ -365,17 +414,66 @@ datum/reagent/morphine reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 var/cycle_count = 0 + overdose_threshold = 30 + addiction_threshold = 25 + datum/reagent/morphine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.status_flags |= GOTTAGOFAST if(cycle_count == 36) - M.sleeping += 1 - if(volume > 20) + M.drowsyness += 1 + cycle_count++ + ..() + return + +datum/reagent/morphine/overdose_process(var/mob/living/M as mob) + if(prob(33)) var/obj/item/I = M.get_active_hand() if(I) M.drop_item() - cycle_count++ + M.Dizzy(1) + M.Jitter(1) + ..() + return + +datum/reagent/morphine/addiction_act_stage1(var/mob/living/M as mob) + if(prob(33)) + var/obj/item/I = M.get_active_hand() + if(I) + M.drop_item() + M.Dizzy(2) + M.Jitter(2) + ..() + return +datum/reagent/morphine/addiction_act_stage2(var/mob/living/M as mob) + if(prob(33)) + var/obj/item/I = M.get_active_hand() + if(I) + M.drop_item() + M.adjustToxLoss(1*REM) + M.Dizzy(3) + M.Jitter(3) + ..() + return +datum/reagent/morphine/addiction_act_stage3(var/mob/living/M as mob) + if(prob(33)) + var/obj/item/I = M.get_active_hand() + if(I) + M.drop_item() + M.adjustToxLoss(2*REM) + M.Dizzy(4) + M.Jitter(4) + ..() + return +datum/reagent/morphine/addiction_act_stage4(var/mob/living/M as mob) + if(prob(33)) + var/obj/item/I = M.get_active_hand() + if(I) + M.drop_item() + M.adjustToxLoss(3*REM) + M.Dizzy(5) + M.Jitter(5) ..() return @@ -418,6 +516,7 @@ datum/reagent/atropine reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 0.2 + overdose_threshold = 35 datum/reagent/atropine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -436,6 +535,14 @@ datum/reagent/atropine/on_mob_life(var/mob/living/M as mob) ..() return +datum/reagent/atropine/overdose_process(var/mob/living/M as mob) + if(prob(50)) + M.adjustToxLoss(2*REM) + M.Dizzy(1) + M.Jitter(1) + ..() + return + /datum/chemical_reaction/atropine name = "Atropine" id = "atropine" @@ -450,6 +557,7 @@ datum/reagent/epinephrine reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 metabolization_rate = 0.2 + overdose_threshold = 30 datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -466,7 +574,15 @@ datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob) M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) - M.sleeping -= 1 + M.sleeping = 0 + ..() + return + +datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob) + if(prob(33)) + M.adjustStaminaLoss(5*REM) + M.adjustToxLoss(2*REM) + M.losebreath++ ..() return @@ -497,15 +613,13 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, M.gib() else if(M.stat == DEAD) var/mob/dead/observer/ghost = M.get_ghost() - var/total_burn = 0 - var/total_brute = 0 - var/health = M.health M.visible_message("[M]'s body convulses a bit.") - for(var/obj/item/organ/limb/O in M.organs) - total_brute += O.brute_dam - total_burn += O.burn_dam if(M.health <= config.health_threshold_dead && !M.suiciding && !ghost && !(NOCLONE in M.mutations)) M.stat = 1 + M.adjustBruteLoss(-10) + M.adjustFireLoss(-10) + M.adjustOxyLoss(-10) + M.adjustToxLoss(-10) dead_mob_list -= M living_mob_list |= list(M) M.emote("gasp") @@ -640,4 +754,33 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac name = "Mutadone" id = "mutadone" description = "Chance to remove genetic disabilities." - color = "#C8A5DC" // rgb: 200, 165, 220 \ No newline at end of file + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/antihol + name = "Antihol" + id = "antihol" + description = "A powerful oxidizer that reacts with ethanol." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/antihol/on_mob_life(var/mob/living/M as mob) + M.dizziness = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.confused = 0 + M.reagents.remove_reagent("ethanol", 8) + M.adjustToxLoss(-0.2*REM) + ..() + +/datum/chemical_reaction/antihol + name = "antihol" + id = "antihol" + result = "antihol" + required_reagents = list("ethanol" = 1, "charcoal" = 1) + result_amount = 2 + +/datum/chemical_reaction/cryoxadone + name = "Cryoxadone" + id = "cryoxadone" + result = "cryoxadone" + required_reagents = list("stable_plasma" = 1, "acetone" = 1, "mutagen" = 1) + result_amount = 3 diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm index 33752902ea8..62b5a848c9a 100644 --- a/code/modules/reagents/Chemistry-Goon-Other.dm +++ b/code/modules/reagents/Chemistry-Goon-Other.dm @@ -101,4 +101,50 @@ datum/reagent/acetone result = "ash" required_reagents = list("oil" = 1) result_amount = 1 - required_temp = 480 \ No newline at end of file + required_temp = 480 + +datum/reagent/colorful_reagent + name = "Colorful Reagent" + id = "colorful_reagent" + description = "A solution." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + var/list/potential_colors = list("#FF0000","#0000FF","#008000","#FFFF00") + +/datum/chemical_reaction/colorful_reagent + name = "colorful_reagent" + id = "colorful_reagent" + result = "colorful_reagent" + required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1) + result_amount = 5 + +datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume) + if(M) + M.color = pick(potential_colors) + ..() + return +datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume) + if(O) + O.color = pick(potential_colors) + ..() + return +datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume) + if(T) + T.color = pick(potential_colors) + ..() + return + + +datum/reagent/triple_citrus + name = "Triple Citrus" + id = "triple_citrus" + description = "A solution." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + +/datum/chemical_reaction/triple_citrus + name = "triple_citrus" + id = "triple_citrus" + result = "triple_citrus" + required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1) + result_amount = 5 \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm index 1f7f0e8b3a5..dc8268a2d51 100644 --- a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm @@ -124,6 +124,8 @@ datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull_times) for(var/atom/movable/X in orange(range, T)) + if(istype(X, /obj/effect)) + continue // stop pulling smoke and hotspots please if(istype(X, /atom/movable)) if((X) && !X.anchored) if(setting_type) diff --git a/code/modules/reagents/Chemistry-Goon-Toxins.dm b/code/modules/reagents/Chemistry-Goon-Toxins.dm index 355962d588a..6423c1571eb 100644 --- a/code/modules/reagents/Chemistry-Goon-Toxins.dm +++ b/code/modules/reagents/Chemistry-Goon-Toxins.dm @@ -26,25 +26,27 @@ datum/reagent/histamine reagent_state = LIQUID color = "#CF3600" // rgb: 207, 54, 0 metabolization_rate = 0.2 + overdose_threshold = 30 datum/reagent/histamine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(volume >= 30) - M.adjustOxyLoss(pick(2,5)*REM) - M.adjustBruteLoss(pick(2,5)*REM) - M.adjustToxLoss(pick(2,5)*REM) - if(volume < 30) - switch(pick(1, 2, 3)) - if(1) - M << "You are unable to look straight!" - M.Dizzy(10) - if(2) - M.emote("cough") - var/obj/item/I = M.get_active_hand() - if(I) - M.drop_item() - if(3) - M.adjustBruteLoss(5*REM) + switch(pick(1, 2, 3)) + if(1) + M << "You are unable to look straight!" + M.Dizzy(10) + if(2) + M.emote("cough") + var/obj/item/I = M.get_active_hand() + if(I) + M.drop_item() + if(3) + M.adjustBruteLoss(1*REM) + ..() + return +datum/reagent/histamine/overdose_process(var/mob/living/M as mob) + M.adjustOxyLoss(pick(2,5)*REM) + M.adjustBruteLoss(pick(2,5)*REM) + M.adjustToxLoss(pick(2,5)*REM) ..() return @@ -156,4 +158,41 @@ datum/reagent/questionmark/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.adjustToxLoss(1*REM) ..() - return \ No newline at end of file + return + +datum/reagent/itching_powder + name = "Itching Powder" + id = "itching_powder" + description = "Lots of annoying random effects, chances to do BRUTE damage from scratching. 6% chance to decay into 1-3 units of histamine." + reagent_state = LIQUID + color = "#CF3600" // rgb: 207, 54, 0 + metabolization_rate = 0.3 + +/datum/reagent/itching_powder/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) + if(method == TOUCH) + M.reagents.add_reagent("itching_powder", volume) + return + +datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(prob(rand(5,50))) + M << "You scratch at your head." + M.adjustBruteLoss(0.2*REM) + if(prob(rand(5,50))) + M << "You scratch at your leg." + M.adjustBruteLoss(0.2*REM) + if(prob(rand(5,50))) + M << "You scratch at your arm." + M.adjustBruteLoss(0.2*REM) + if(prob(6)) + M.reagents.add_reagent("histamine",rand(1,3)) + M.reagents.remove_reagent("itching_powder",1) + ..() + return + +/datum/chemical_reaction/itching_powder + name = "Itching Powder" + id = "itching_powder" + result = "itching_powder" + required_reagents = list("fuel" = 1, "ammonia" = 1) + result_amount = 2 \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 2e5fb825a15..17e51b1f63d 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -11,7 +11,9 @@ datum/reagents var/maximum_volume = 100 var/atom/my_atom = null var/chem_temp = 150 - var/last_tick = 0 + var/last_tick = 1 + var/addiction_tick = 1 + var/list/datum/reagent/addiction_list = new/list() datum/reagents/New(maximum=100) maximum_volume = maximum @@ -197,12 +199,46 @@ datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/p datum/reagents/proc/metabolize(var/mob/M) if(last_tick == 3) - last_tick = 0 + last_tick = 1 for(var/A in reagent_list) var/datum/reagent/R = A if(M && R) if(M.reagent_check(R) != 1) + if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0) + R.overdosed = 1 + M << "You feel like you took too much of [R.name]!" + if(R.volume >= R.addiction_threshold && !is_type_in_list(R, addiction_list) && R.addiction_threshold > 0) + var/datum/reagent/new_reagent = new R.type() + addiction_list.Add(new_reagent) + if(R.overdosed) + R.overdose_process(M) + if(is_type_in_list(R,addiction_list)) + for(var/datum/reagent/addicted_reagent in addiction_list) + if(istype(R, addicted_reagent)) + addicted_reagent.addiction_stage = -15 // you're satisfied for a good while. R.on_mob_life(M) + if(addiction_tick == 6) + addiction_tick = 1 + for(var/A in addiction_list) + var/datum/reagent/R = A + if(M && R) + if(R.addiction_stage < 0) + R.addiction_stage++ + if(R.addiction_stage >= 0 && R.addiction_stage <= 10) + R.addiction_act_stage1(M) + R.addiction_stage++ + if(R.addiction_stage >= 10 && R.addiction_stage <= 20) + R.addiction_act_stage2(M) + R.addiction_stage++ + if(R.addiction_stage >= 20 && R.addiction_stage <= 30) + R.addiction_act_stage3(M) + R.addiction_stage++ + if(R.addiction_stage > 30 && R.addiction_stage <= 40) + R.addiction_act_stage4(M) + if(R.addiction_stage > 40) + M << "You feel like you've gotten over your need for [R.name]." + addiction_list.Remove(R) + addiction_tick++ last_tick++ update_total() diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index ab4f165efd9..3533e2f79ef 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -1294,9 +1294,11 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) if(beaker) if(beaker.reagents.chem_temp > temperature) beaker.reagents.chem_temp = max(beaker.reagents.chem_temp-rate, temperature) + beaker.reagents.handle_reactions() state_change = 1 else if(beaker.reagents.chem_temp < temperature) beaker.reagents.chem_temp = min(beaker.reagents.chem_temp+rate, temperature) + beaker.reagents.handle_reactions() state_change = 1 if(state_change) SSnano.update_uis(src) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm index d8f1fd0d318..1f1c086844e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm @@ -24,6 +24,10 @@ datum/reagent var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!) var/metabolization_rate = REAGENTS_METABOLISM var/overrides_metab = 0 + var/overdose_threshold = 0 + var/addiction_threshold = 0 + var/addiction_stage = 0 + var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick. datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some if(!istype(M, /mob/living)) @@ -88,6 +92,31 @@ datum/reagent/proc/on_merge(var/data) datum/reagent/proc/on_update(var/atom/A) return +// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects +datum/reagent/proc/overdose_process(var/mob/living/M as mob) + return + +datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob) + if(prob(30)) + M << "You feel like some [name] right about now." + return + +datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob) + if(prob(30)) + M << "You feel like you need [name]. You just can't get enough." + return + +datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) + if(prob(30)) + M << "You have an intense craving for [name]." + return + +datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) + if(prob(30)) + M << "You're not feeling good at all! You really need some [name]." + return + + datum/reagent/blood data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null) name = "Blood" diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index 34509773034..8d1a446a249 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -137,27 +137,15 @@ datum/reagent/medicine/cryoxadone color = "#C8A5DC" // rgb: 200, 165, 220 datum/reagent/medicine/cryoxadone/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD && M.bodytemperature < 170) - M.adjustCloneLoss(-1) - M.adjustOxyLoss(-3) - M.heal_organ_damage(3,3) - M.adjustToxLoss(-3) - ..() - return - -datum/reagent/medicine/clonexadone - name = "Clonexadone" - id = "clonexadone" - description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/clonexadone/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD && M.bodytemperature < 170) + if(M.stat != DEAD && M.bodytemperature < 270) M.adjustCloneLoss(-3) - M.adjustOxyLoss(-3) + M.adjustOxyLoss(-10) M.heal_organ_damage(3,3) + M.adjustBruteLoss(-3) + M.adjustFireLoss(-3) M.adjustToxLoss(-3) M.status_flags &= ~DISFIGURED + ..() return diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 10e37a7f979..fef938a2ab3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -222,30 +222,6 @@ datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, if(!C.wear_mask) // If not wearing a mask C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason -datum/reagent/toxin/stoxin - name = "Sleep Toxin" - id = "stoxin" - description = "An effective hypnotic used to treat insomnia." - color = "#E895CC" // rgb: 232, 149, 204 - toxpwr = 0 - -datum/reagent/toxin/stoxin/on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - switch(data) - if(1 to 12) - if(prob(5)) M.emote("yawn") - if(12 to 15) - M.eye_blurry = max(M.eye_blurry, 10) - if(15 to 25) - M.drowsyness = max(M.drowsyness, 20) - if(25 to INFINITY) - M.Paralyse(20) - M.drowsyness = max(M.drowsyness, 30) - data++ - ..() - return - - datum/reagent/toxin/spore name = "Spore Toxin" id = "spore" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index e6ad594a341..3350a40de13 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -150,21 +150,6 @@ silicate required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1) result_amount = 3 -/datum/chemical_reaction/cryoxadone - name = "Cryoxadone" - id = "cryoxadone" - result = "cryoxadone" - required_reagents = list("salbutamol" = 1, "water" = 1, "oxygen" = 1) - result_amount = 3 - -/datum/chemical_reaction/clonexadone - name = "Clonexadone" - id = "clonexadone" - result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1) - required_catalysts = list("plasma" = 5) - result_amount = 2 - /datum/chemical_reaction/spaceacillin name = "Spaceacillin" id = "spaceacillin" @@ -179,20 +164,6 @@ silicate required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1) result_amount = 2 -/datum/chemical_reaction/ethylredoxrazine - name = "Ethylredoxrazine" - id = "ethylredoxrazine" - result = "ethylredoxrazine" - required_reagents = list("oxygen" = 1, "charcoal" = 1, "carbon" = 1) - result_amount = 3 - -/datum/chemical_reaction/ethanoloxidation - name = "ethanoloxidation" //Kind of a placeholder in case someone ever changes it so that chemicals - id = "ethanoloxidation" // react in the body. Also it would be silly if it didn't exist. - result = "water" - required_reagents = list("ethylredoxrazine" = 1, "ethanol" = 1) - result_amount = 2 - /datum/chemical_reaction/glycerol name = "Glycerol" id = "glycerol" diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index cd43f507f55..8d7f580761e 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -32,12 +32,6 @@ icon_state = "bottle12" list_reagents = list("cyanide" = 30) -/obj/item/weapon/reagent_containers/glass/bottle/stoxin - name = "sleep-toxin bottle" - desc = "A small bottle of sleep toxins. Just the fumes make you sleepy." - icon_state = "bottle20" - list_reagents = list("stoxin" = 30) - /obj/item/weapon/reagent_containers/glass/bottle/morphine name = "morphine bottle" desc = "A small bottle of morphine." @@ -55,8 +49,7 @@ name = "charcoal bottle" desc = "A small bottle of charcoal." icon_state = "bottle17" - list_reagents = list("salglu_solution" = 30) - + list_reagents = list("charcoal" = 30) /obj/item/weapon/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index bece546df2e..15bfa91ce58 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -100,7 +100,7 @@ obj/item/weapon/reagent_containers/hypospray/combat/nanites name = "stimpack medipen" desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor at the cost of some shortness of breath." icon_state = "stimpen" - list_reagents = list("morphine" = 9, "lexorin" = 1) + list_reagents = list("ephedrine" = 9, "lexorin" = 1) /obj/item/weapon/reagent_containers/hypospray/medipen/morphine name = "morphine medipen" diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index ac7987afa5b..467549b99e2 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -24,9 +24,9 @@ /obj/item/weapon/reagent_containers/pill/patch/styptic name = "styptic powder patch" desc = "Helps with brute injuries." - list_reagents = list("styptic_powder" = 25) + list_reagents = list("styptic_powder" = 50) /obj/item/weapon/reagent_containers/pill/patch/silver_sulf name = "silver sulfadiazine patch" desc = "Helps with burn injuries." - list_reagents = list("silver_sulfadiazine" = 25) + list_reagents = list("silver_sulfadiazine" = 50) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 9bff7d70d64..3ebf7ffbc07 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -83,17 +83,17 @@ icon_state = "pill16" list_reagents = list("adminordrazine" = 50) -/obj/item/weapon/reagent_containers/pill/stox - name = "sleeping pill" +/obj/item/weapon/reagent_containers/pill/morphine + name = "morphine pill" desc = "Commonly used to treat insomnia." icon_state = "pill8" - list_reagents = list("stoxin" = 50) + list_reagents = list("morphine" = 30) /obj/item/weapon/reagent_containers/pill/stimulant name = "stimulant pill" desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!" icon_state = "pill19" - list_reagents = list("morphone" = 10, "ethylredoxrazine" = 10, "coffee" = 30) + list_reagents = list("ephedrine" = 10, "ethylredoxrazine" = 10, "coffee" = 30) /obj/item/weapon/reagent_containers/pill/salbutamol name = "salbutamol pill" diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index de04a918ec0..5e6c22a9533 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -17,7 +17,14 @@ var/dpdir = 0 // directions as disposalpipe var/base_state = "pipe-s" - // update iconstate and dpdir due to dir and type +/obj/structure/disposalconstruct/New(var/loc, var/pipe_type) + ..(loc) + if(pipe_type) + ptype = pipe_type + if(!is_pipe()) // bins/chutes/outlets are dense + density = 1 + +// update iconstate and dpdir due to dir and type /obj/structure/disposalconstruct/proc/update() var/flip = turn(dir, 180) var/left = turn(dir, 90) @@ -66,7 +73,7 @@ dpdir = dir | left | flip - if(ptype<6 || ptype>8) + if(is_pipe()) icon_state = "con[base_state]" else icon_state = base_state @@ -148,7 +155,7 @@ /obj/structure/disposalconstruct/attackby(var/obj/item/I, var/mob/user) var/nicetype = "pipe" - var/ispipe = 0 // Indicates if we should change the level of this pipe + var/ispipe = is_pipe() // Indicates if we should change the level of this pipe src.add_fingerprint(user) switch(ptype) if(6) @@ -159,10 +166,8 @@ nicetype = "delivery chute" if(9, 10) nicetype = "sorting pipe" - ispipe = 1 else nicetype = "pipe" - ispipe = 1 var/turf/T = src.loc if(T.intact) @@ -181,7 +186,7 @@ density = 1 user << "You detach the [nicetype] from the underfloor." else - if(ptype>=6 && ptype <= 8) // Disposal or outlet + if(!is_pipe()) // Disposal or outlet if(CP) // There's something there if(!istype(CP,/obj/structure/disposalpipe/trunk)) user << "The [nicetype] requires a trunk underneath it in order to work." @@ -247,7 +252,7 @@ var/obj/structure/disposalpipe/trunk/Trunk = CP Trunk.linked = P - else if(ptype==8) // Disposal outlet + else if(ptype==8) // Disposal chute var/obj/machinery/disposal/deliveryChute/P = new /obj/machinery/disposal/deliveryChute(src.loc) src.transfer_fingerprints_to(P) @@ -258,3 +263,20 @@ else user << "You need to attach it to the plating first!" return + +/obj/structure/disposalconstruct/proc/is_pipe() + return !(ptype >=6 && ptype <= 8) + +//helper proc that makes sure you can place the construct (i.e no dense objects stacking) +/obj/structure/disposalconstruct/proc/can_place() + if(is_pipe()) + return 1 + + for(var/obj/structure/disposalconstruct/DC in get_turf(src)) + if(DC == src) + continue + + if(!DC.is_pipe()) //there's already a chute/outlet/bin there + return 0 + + return 1 diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 4ba51c93667..ecc7e0cc484 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -27,7 +27,7 @@ // find the attached trunk (if present) and init gas resvr. /obj/machinery/disposal/New() ..() - stored = new /obj/structure/disposalconstruct(0,0,0) + stored = new /obj/structure/disposalconstruct(0,6) // 6 = disposal unit trunk_check() air_contents = new/datum/gas_mixture() @@ -462,7 +462,6 @@ var/turf/T = loc stored.loc = T src.transfer_fingerprints_to(stored) - stored.ptype = 6 // 6 = disposal unit stored.anchored = 0 stored.density = 1 stored.update() @@ -1273,9 +1272,8 @@ if(do_after(user,20)) if(!src || !W.isOn()) return user << "You've sliced the floorweld off \the [src]." - var/obj/structure/disposalconstruct/C = new (src.loc) + var/obj/structure/disposalconstruct/C = new (src.loc, 7) // 7 = outlet src.transfer_fingerprints_to(C) - C.ptype = 7 // 7 = outlet C.update() C.anchored = 1 C.density = 1 diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 0229323eea1..8e88eb4d0a0 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -239,6 +239,7 @@ /obj/machinery/disposal/deliveryChute/New() ..() + stored.ptype = 8 // 8 = Delivery chute spawn(5) trunk = locate() in loc if(trunk) @@ -332,18 +333,14 @@ return else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1) var/obj/item/weapon/weldingtool/W = I + if(W.remove_fuel(0,user)) playsound(loc, 'sound/items/Welder2.ogg', 100, 1) user << "You start slicing the floorweld off the delivery chute." if(do_after(user,20)) if(!src || !W.isOn()) return + Deconstruct() user << "You sliced the floorweld off the delivery chute." - var/obj/structure/disposalconstruct/C = new (loc) - C.ptype = 8 // 8 = Delivery chute - C.update() - C.anchored = 1 - C.density = 1 - qdel(src) return else return diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 1c8e6e5ae77..ff5e33b0ef3 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -112,7 +112,7 @@ build_path = /obj/item/weapon/circuitboard/chem_dispenser category = list ("Medical Machinery") -/datum/design/chem_dispenser +/datum/design/chem_heater name = "Machine Design (Chemical Heater Board)" desc = "The circuit board for a chemical heater." id = "chem_heater" diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index c6ed0a4f8f3..0a9128fdfb7 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -35,6 +35,7 @@ Note: Must be placed west/left of and R&D console to function. "Electronics", "Weapons", "Ammo", + "Firing Pins" ) reagents = new() diff --git a/html/changelog.html b/html/changelog.html index 8d98adef4de..29773d7a69b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,54 @@ --> +
+

17 January 2015

+

Cheridan updated:

+ +

Firecage updated:

+ +

Iamgoofball (Look Ma, I didn't mispell my name this time!) updated:

+ +

Steelpoint updated:

+ +

phil235 updated:

+ +

sawu-tg updated:

+ +
+

14 January 2015

Boggart updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index c6fe77f8dee..cf0cd9963d3 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -2264,3 +2264,56 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Adds a Traitor Poison Kit! - rscadd: Adds Morphine Medipens! - rscadd: Adds Morphine bottles to Cargo! +2015-01-17: + Cheridan: + - tweak: The lockbox system for R&D has been replaced with a firing pin system. + Ask the Warden or HoS for firing pins to allow normal operation of your firearms. + Want to test them out at the range? Try printing a test-range pin. + - tweak: Nuke Ops have used this new technology to lock some of their heavier weapons + so that crew cannot use them. These implants replace their explosive implants. + - rscadd: Explosive implants are now purchasable in the uplink, and are much stronger. + Firecage: + - rscadd: NanoTrasen would like to report that our Mechanical Engineers at NTEngiCore + has recently upgraded the capacity of the machines known as Biogenerators. They + are now have the added ability to create various belts, and also weed/plantkillers + and cartons of milk and cream! + Iamgoofball (Look Ma, I didn't mispell my name this time!): + - rscadd: Replaced Star Trek chemistry with Goon Chemistry. + - rscadd: 'Emergency Medic''s Handbook Tip 1: Styptic Powder = BRUTE, Silver Sulfadiazine + = BURN, Charcoal = TOX, Salbutamol = OXY' + - rscadd: 'In recipes that used removed reagents, they have been replaced with their + goon chemistry counterpart:' + - rscadd: Hyperzine -> Morphine + - rscadd: Inaprovaline -> Epinephrine + - rscadd: Kelotane -> Saline-Glucose Solution + - rscadd: Bicardine -> Saline-Glucose Solution + - rscadd: Dermaline -> Saline-Glucose Solution + - rscadd: Dexalin -> Salbutamol + - rscadd: Dexalin Plus -> Salbutamol + - rscadd: Tricordrazine -> Omnizine + - rscadd: Anti-Toxin -> Charcoal + - rscadd: Hydronalin -> Penetic Acid + - rscadd: Arithrazine -> Penetic Acid + - rscadd: Imidazoline -> Oculine + - rscadd: Mannitol -> Alkysine + - rscadd: Ryetalyn -> Mutadone + Steelpoint: + - rscadd: The Emergency Response Team project has been activated by Nanotrasen. + The ERT are a seven man squad that can be deployed by the Central Command (admins) + to attempt to rescue the station from a overwhelming threat, or to render assistance + in dealing with a significant problem. + - rscadd: The ERT consists of a single Commander, two Security Officers, two Engineering + Officers and two Medical Officers. The Commander is preselected when the squad + is being spawned in, however the remaining six officers are free to select their + role in the squad. + - rscadd: Two new Pulse gun variants have been added to the game. They are the Pulse + Carbine and the Pulse Pistol, both have significantly smaller ammunition capacities + than the Pulse Rifle, however they both can fit in a backpack and the pistol + can fit in a pocket. All ERT Officers have a Pulse Pistol for a sidearm, however + the Security Officers get a Pulse Carbine as their primary longarm. + phil235: + - rscadd: The two library consoles are now real buildable computers. The circuitboard + design is available in R&D. + sawu-tg: + - rscadd: Added a new R&D machine, to replace the telescience room. The Machine + is based on RND and various interdepartmental creations. diff --git a/html/changelogs/Cheridan.yml b/html/changelogs/Cheridan.yml index 809e6fef1c4..d26cc7b9ac2 100644 --- a/html/changelogs/Cheridan.yml +++ b/html/changelogs/Cheridan.yml @@ -1,5 +1,2 @@ author: Cheridan -changes: - - tweak: "The lockbox system for R&D has been replaced with a firing pin system. Ask the Warden or HoS for firing pins to allow normal operation of your firearms. Want to test them out at the range? Try printing a test-range pin. - - tweak: "Nuke Ops have used this new technology to lock some of their heavier weapons so that crew cannot use them. These implants replace their explosive implants. - - rscadd: "Explosive implants are now purchasable in the uplink, and are much stronger." +changes: [] diff --git a/html/changelogs/FIRECAGE-PR-6969.yml b/html/changelogs/FIRECAGE-PR-6969.yml deleted file mode 100644 index f91da05e8c9..00000000000 --- a/html/changelogs/FIRECAGE-PR-6969.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Firecage - -delete-after: True - -changes: - - rscadd: "NanoTrasen would like to report that our Mechanical Engineers at NTEngiCore has recently upgraded the capacity of the machines known as Biogenerators. They are now have the added ability to create various belts, and also weed/plantkillers and cartons of milk and cream!" diff --git a/html/changelogs/Iamgoofball.yml b/html/changelogs/Iamgoofball.yml deleted file mode 100644 index 0b4f9dbab1f..00000000000 --- a/html/changelogs/Iamgoofball.yml +++ /dev/null @@ -1,20 +0,0 @@ -author: Iamgoofball (Look Ma, I didn't mispell my name this time!) -delete-after: true -changes: - - rscadd: "Replaced Star Trek chemistry with Goon Chemistry." - - rscadd: "Emergency Medic's Handbook Tip 1: Styptic Powder = BRUTE, Silver Sulfadiazine = BURN, Charcoal = TOX, Salbutamol = OXY" - - rscadd: "In recipes that used removed reagents, they have been replaced with their goon chemistry counterpart:" - - rscadd: "Hyperzine -> Morphine" - - rscadd: "Inaprovaline -> Epinephrine" - - rscadd: "Kelotane -> Saline-Glucose Solution" - - rscadd: "Bicardine -> Saline-Glucose Solution" - - rscadd: "Dermaline -> Saline-Glucose Solution" - - rscadd: "Dexalin -> Salbutamol" - - rscadd: "Dexalin Plus -> Salbutamol" - - rscadd: "Tricordrazine -> Omnizine" - - rscadd: "Anti-Toxin -> Charcoal" - - rscadd: "Hydronalin -> Penetic Acid" - - rscadd: "Arithrazine -> Penetic Acid" - - rscadd: "Imidazoline -> Oculine" - - rscadd: "Mannitol -> Alkysine" - - rscadd: "Ryetalyn -> Mutadone" \ No newline at end of file diff --git a/html/changelogs/Steelpoint-PR-6966.yml b/html/changelogs/Steelpoint-PR-6966.yml deleted file mode 100644 index 9af7ada7f75..00000000000 --- a/html/changelogs/Steelpoint-PR-6966.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscdel (general adding of nice things) -# rscadd (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. -author: Steelpoint - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "The Emergency Response Team project has been activated by Nanotrasen. The ERT are a seven man squad that can be deployed by the Central Command (admins) to attempt to rescue the station from a overwhelming threat, or to render assistance in dealing with a significant problem." - - rscadd: "The ERT consists of a single Commander, two Security Officers, two Engineering Officers and two Medical Officers. The Commander is preselected when the squad is being spawned in, however the remaining six officers are free to select their role in the squad." - - rscadd: "Two new Pulse gun variants have been added to the game. They are the Pulse Carbine and the Pulse Pistol, both have significantly smaller ammunition capacities than the Pulse Rifle, however they both can fit in a backpack and the pistol can fit in a pocket. All ERT Officers have a Pulse Pistol for a sidearm, however the Security Officers get a Pulse Carbine as their primary longarm." diff --git a/html/changelogs/iamgoofball-goonchem3.yml b/html/changelogs/iamgoofball-goonchem3.yml new file mode 100644 index 00000000000..ed917f1f27e --- /dev/null +++ b/html/changelogs/iamgoofball-goonchem3.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscdel (general adding of nice things) +# rscadd (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# +author: Iamgoofball +delete-after: True +changes: + - rscadd: "Addiction and Overdosing has been added to Chemistry." + - rscadd: "Deal with Overdosing by purging the ODing chemical with Calomel or Penetic Acid." + - rscadd: "Deal with Addiction by either going cold turkey on it and weathering the effects, eventually causing the addiction to subside, or by taking more of the addictive substance to keep the effects down." + - rscadd: "Cryoxadane was heavily buffed. Clonex was removed as it was merged into Cryox." + - rscadd: "Fixes a shitton of stuff adding Morphine instead of Ephedrine. Sorry, miners." + - rscadd: "Fixes instances of Alkysine not being replaced with Mannitol. Same with Ryetalyn being replaced with Mutadone." + - rscadd: "Adds Itching Powder. Welding Fuel and Ammonia." + - rscadd: "Adds Antihol. Ethanol and Charcoal." + - rscadd: "Adds Triple Citrus. Lemon Juice, Lime Juice, and Orange Juice." + - rscadd: "Adds Colorful Reagent. Stable Plasma, Triple Citrus, " + - rscadd: "Morphine replaces sleep toxin now, not Hyperzine. Hyperzine is replaced by Ephedrine now." + - rscadd: "Cryotubes will now autoeject you once you are fully healed." + - rscadd: "Synthflesh damage values have been fixed." + - rscadd: "Charcoal has been buffed to heal 3 TOX damage a cycle and it purges other chemicals faster." + - rscadd: "Saline-Glucose Solution has been buffed. It now has a 50% chance per cycle to heal 3 BRUTE and BURN per tick." + - rscadd: "Fixes Strange Reagent revivals dying right after being revived. They'll still need immediate medical treatment, however." + - rscadd: "Cryoxadone has had a recipe change. It is now Stable Plasma, Acetone, and Unstable Mutagen." \ No newline at end of file diff --git a/html/changelogs/phil235 - LibraryComputer.yml b/html/changelogs/phil235 - LibraryComputer.yml deleted file mode 100644 index c90c604a43f..00000000000 --- a/html/changelogs/phil235 - LibraryComputer.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: phil235 -delete-after: True - - -changes: - - - rscadd: "The two library consoles are now real buildable computers. The circuitboard design is available in R&D." \ No newline at end of file diff --git a/html/changelogs/sawu-tg-PR-6914.yml b/html/changelogs/sawu-tg-PR-6914.yml deleted file mode 100644 index 168feedb90d..00000000000 --- a/html/changelogs/sawu-tg-PR-6914.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: sawu-tg - -delete-after: True - -changes: - - rscadd: "Added a new R&D machine, to replace the telescience room. The Machine is based on RND and various interdepartmental creations." \ No newline at end of file diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index b8f19bf080c..6fd59d0f965 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index d8b02e4e920..902ea60b68b 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e83029f9fe5..f70ce1eafaf 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 43dcda058a5..acb1e00589c 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 21b71bf0c87..65a0027ff4d 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 9cee4e8a3bb..fdc8ccdd1a8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ