diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index f292f1f4089..4e46687815e 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -178,7 +178,6 @@ /obj/item/clothing/gloves/force = TRADER_BLACKLIST_ALL, /obj/item/clothing/gloves/swat/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/gloves/black/fluff = TRADER_BLACKLIST_ALL, - /obj/item/clothing/gloves/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/gloves/yellow/typec = TRADER_BLACKLIST, /obj/item/clothing/gloves/swat/bst = TRADER_BLACKLIST, /obj/item/clothing/gloves/watch/fluff = TRADER_BLACKLIST_ALL, @@ -196,11 +195,9 @@ /obj/item/clothing/head/radiation = TRADER_BLACKLIST, /obj/item/clothing/head/tajaran = TRADER_BLACKLIST, /obj/item/clothing/head/welding = TRADER_BLACKLIST, - /obj/item/clothing/head/soft/sec/corp/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/det/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/winterhood = TRADER_BLACKLIST_ALL, - /obj/item/clothing/head/hairflower/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/beret/engineering/fluff = TRADER_BLACKLIST_ALL ) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 6f99873f650..af1744d1553 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -231,6 +231,7 @@ enabled = value else if(href_list["command"] == "lethal") lethal = value + lethal_icon = value else if(href_list["command"] == "check_synth") check_synth = value else if(href_list["command"] == "check_weapons") diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index a34577a29bb..bcba720ddce 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -5,6 +5,9 @@ icon_state = "d66" w_class = 1 var/sides = 6 + var/weighted = FALSE //if this dice can cheat or something + var/favored_number = 1 //related to the var above + var/weighted_value = 70 //what is the chance of falling on the favored number attack_verb = list("diced") /obj/item/weapon/dice/New() @@ -12,7 +15,12 @@ /obj/item/weapon/dice/throw_impact(atom/hit_atom) ..() - var/result = rand(1, sides) + var/result + if((weighted) && (prob(weighted_value))) + result = favored_number + else + result = rand(1, sides) + var/comment = "" if(sides == 20 && result == 20) comment = "Nat 20!" diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 048b9d2cf30..5a1f7920163 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -683,11 +683,9 @@ var/list/global/random_stock_large = list( var/list/allgloves = typesof(/obj/item/clothing/gloves) var/list/exclusion = list(/obj/item/clothing/gloves, - /obj/item/clothing/gloves/fluff, /obj/item/clothing/gloves/swat/bst, - /obj/item/clothing/gloves/swat/fluff/hawk_gloves, - /obj/item/clothing/gloves/fluff/stone_ring, - /obj/item/clothing/gloves/black/fluff/kathleen_glove, + /obj/item/clothing/gloves/swat/fluff, + /obj/item/clothing/gloves/black/fluff, /obj/item/clothing/gloves/powerfist, /obj/item/clothing/gloves/claws) exclusion += typesof(/obj/item/clothing/gloves/rig) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a785333fb16..8c210e649ce 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -316,37 +316,6 @@ item_state = "earmuffs" slot_flags = SLOT_EARS | SLOT_TWOEARS -/////////////////////////////////////////////////////////////////////// -//Glasses -/* -SEE_SELF // can see self, no matter what -SEE_MOBS // can see all mobs, no matter what -SEE_OBJS // can see all objs, no matter what -SEE_TURFS // can see all turfs (and areas), no matter what -SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are - // in a lit area (via pixel_x,y or smooth movement), can see those pixels -BLIND // can't see anything -*/ -/obj/item/clothing/glasses - name = "glasses" - icon = 'icons/obj/clothing/glasses.dmi' - w_class = 2.0 - body_parts_covered = EYES - slot_flags = SLOT_EYES - var/vision_flags = 0 - var/darkness_view = 0//Base human is 2 - var/see_invisible = -1 - sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Resomi" = 'icons/mob/species/resomi/eyes.dmi' - ) - species_restricted = list("exclude","Vaurca Breeder") - -/obj/item/clothing/glasses/update_clothing_icon() - if (ismob(src.loc)) - var/mob/M = src.loc - M.update_inv_glasses() - /////////////////////////////////////////////////////////////////////// //Gloves /obj/item/clothing/gloves diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index efe40dfba32..751b99dd0dc 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,12 +1,24 @@ - +/////////////////////////////////////////////////////////////////////// +//Glasses +/* +SEE_SELF // can see self, no matter what +SEE_MOBS // can see all mobs, no matter what +SEE_OBJS // can see all objs, no matter what +SEE_TURFS // can see all turfs (and areas), no matter what +SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are + // in a lit area (via pixel_x,y or smooth movement), can see those pixels +BLIND // can't see anything +*/ /obj/item/clothing/glasses name = "glasses" icon = 'icons/obj/clothing/glasses.dmi' - //w_class = 2.0 - //slot_flags = SLOT_EYES - //var/vision_flags = 0 - //var/darkness_view = 0//Base human is 2 + w_class = 2.0 + slot_flags = SLOT_EYES + body_parts_covered = EYES + var/vision_flags = 0 + var/darkness_view = 0//Base human is 2 var/prescription = 0 + var/see_invisible = -1 var/toggleable = 0 var/off_state = "degoggles" var/active = 1 @@ -14,6 +26,17 @@ var/obj/screen/overlay = null var/obj/item/clothing/glasses/hud/hud = null // Hud glasses, if any var/activated_color = null + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/eyes.dmi', + "Resomi" = 'icons/mob/species/resomi/eyes.dmi' + ) + species_restricted = list("exclude","Vaurca Breeder") + +/obj/item/clothing/glasses/update_clothing_icon() + if (ismob(src.loc)) + var/mob/M = src.loc + M.update_inv_glasses() + /obj/item/clothing/glasses/attack_self(mob/user) if(toggleable) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index f774e356b09..4c98c612e40 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -25,11 +25,6 @@ All custom items with worn sprites must follow the contained sprite system: http desc = "Inside the pocket watch, there is a collection of numbers, displaying '[worldtime2text()]'. On the inside of the lid, there is another sequence of numbers etched into the lid itself." -/obj/item/clothing/head/soft/sec/corp/fluff/mendoza_cap //Mendoza's cap - Chance Mendoza - loow - name = "well-worn corporate security cap" - desc = "A baseball hat in corporate colors.\"C. Mendoza\" is embroidered in fine print on the bill. On the underside of the cap, in dark ink, the phrase \"Gamble till you're Lucky!\" is written in loopy cursive handwriting." - - /obj/item/clothing/head/fluff/ziva_bandana //Ziva's Bandana - Ziva Ta'Kim - sierrakomodo name = "old bandana" desc = "An old orange-ish-yellow bandana. It has a few stains from engine grease, and the color has been dulled." @@ -116,11 +111,6 @@ All custom items with worn sprites must follow the contained sprite system: http slot_flags = SLOT_MASK | SLOT_TIE -/obj/item/clothing/ears/skrell/purple_skrell_cloth_male/fluff/dompesh_cloth //Skrell Purple Head Cloth - Shkor-Dyet Dom'Pesh - mofo1995 - name = "male skrell purple head cloth" - desc = "A set of purple headcloths fit for a skrell's head tails. This one has a small SAMPLe logo on the interior of each cloth, perfect for scientific skrell." - - /obj/item/weapon/fluff/kiara_altar //Pocket Altar - Kiara Branwen - nursiekitty name = "pocket altar" desc = "A black tin box with a symbol painted over it. It shimmers in the light." @@ -158,11 +148,6 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder, /obj/item/clothing/accessory/badge/fluff/bell_badge) -/obj/item/clothing/under/syndicate/tacticool/fluff/jaylor_turtleneck //Borderworlds Turtleneck - Jaylor Rameau - evilbrage - name = "borderworlds turtleneck" - desc = "A loose-fitting turtleneck, common among borderworld pilots and criminals. One criminal in particular is missing his, apparently." - - /obj/item/weapon/melee/fluff/tina_knife //Consecrated Athame - Tina Kaekel - tainavaa name = "consecrated athame" desc = "An athame used in occult rituals. The double-edged dagger is dull. The handle is black with a pink/white occult design strewn about it, and \"Tina\" is inscribed into it in decorated letters." @@ -396,10 +381,6 @@ All custom items with worn sprites must follow the contained sprite system: http usr.update_inv_wear_suit() -/obj/item/clothing/head/beret/centcom/officer/fluff/fabian_beret //Worn Security Beret - Fabian Goellstein - mirkoloio - name = "worn security beret" - desc = "A NT Asset Protection Force Beret. It has the NT APF insignia on it as well as the Name \"Goellstein\" inside." - /obj/item/clothing/head/fluff/vittorio_fez //Black Fez - Vittorio Giurifiglio - tytostyris name = "black fez" @@ -473,18 +454,13 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "barcia_flask" -/obj/item/clothing/gloves/fluff/stone_ring //Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso +/obj/item/clothing/ring/fluff/stone_ring //Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso name = "thunder dome pendant ring" desc = "It appears to be a Collectors edition Thunder dome Pendant ring from the IGTDL's show rumble in the red planet in 2444. It has a decorative diamond center with a image of the Intergalactic belt in the center." icon = 'icons/obj/custom_items/stone_ring.dmi' icon_state = "stone_ring" item_state = "stone_ring" contained_sprite = TRUE - clipped = TRUE - species_restricted = null - gender = NEUTER - body_parts_covered = null - fingerprint_chance = 100 /obj/item/clothing/under/dress/fluff/sayyidah_dress //Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk @@ -655,11 +631,6 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/head/soft/sec/corp/fluff/karson_cap //Karson's Cap - Eric Karson - dronzthewolf - name = "well-worn corporate security cap" - desc = "A well-worn corporate security cap. The name \"Karson\" is written on the underside of the brim, it is well-worn at the point where it has shaped to the owner's head." - - /obj/item/sign/fluff/triaka_atimono //Framed Zatimono - Azkuyua Triaka - jackboot name = "framed zatimono" desc = "A framed Zatimono, a Unathi standard worn into battle similar to an old-Earth Sashimono. This one is slightly faded." @@ -692,16 +663,6 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "zohjar_uniform" contained_sprite = TRUE -/obj/item/clothing/suit/storage/toggle/labcoat/tajaran/fluff/zohjar_jacket //People's Republic Medical Officer Coat - Zohjar Rasateir - lordraven001 - name = "people's republic medical officer coat" - desc = "A sterile insulated coat made of leather stitched over fur. It has two gold lapels indicating Officer rank. \ - The a white armband with a scarlet line in the center indicates that the person wearing this coat is medically trained." - - -/obj/item/clothing/suit/storage/tajaran/fluff/maksim_coat //Tajaran Naval Officer's Coat - Maksim Vasilyev - aimlessanalyst - name = "tajaran naval officer coat" - desc = "A thick wool coat from Adhomai, calling back to days long past." - /obj/item/sign/fluff/iskanz_atimono //Framed Zatimono - Iskanz Sal'Dans - zundy name = "framed zatimono" @@ -831,11 +792,6 @@ All custom items with worn sprites must follow the contained sprite system: http badge_string = "NanoTrasen Security Department" -/obj/item/clothing/head/hairflower/fluff/aquila_pin //Magnetic Flower Pin - Aquila - nandastar - name = "magnetic flower pin" - desc = "That's a magnet in the shape of a hair flower pin. Smells nice." - - /obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth name = "\improper LR-31MTA beret" desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \ @@ -1164,6 +1120,7 @@ All custom items with worn sprites must follow the contained sprite system: http if(..(user, 1)) user << "It is [active ? "on" : "off"]." + /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/fluff/leonce_cognac //Old Earth Luxury Cognac - Francois Leonce - driecg36 name = "old earth luxury cognac" desc = "An unusually shaped crystal bottle, covered in elaborate etchings displaying the symbol of the house that produced it. Inside is a smooth, amber liquor, \ @@ -2039,4 +1996,46 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A. on = FALSE update_icon() playsound(src, "spark", 50, 1, -1) - ..() \ No newline at end of file + ..() + + +/obj/item/clothing/head/fluff/jix_wrap //Dull Headwraps - JIX - kyres1 + name = "dull headwraps" + desc = "A sturdy, dull brown cloth." + icon = 'icons/obj/custom_items/jix_items.dmi' + icon_state = "jix_wrap" + item_state = "jix_wrap" + contained_sprite = TRUE + +/obj/item/clothing/suit/fluff/jix_robes //Dull Robes - JIX - kyres1 + name = "dull robes" + desc = "A set of drab robes which look particularly old, though in good condition. It consists of two pieces, loosely connected and separating at the center." + icon = 'icons/obj/custom_items/jix_items.dmi' + icon_state = "jix_robes" + item_state = "jix_robes" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + contained_sprite = TRUE + + +/obj/item/clothing/mask/fluff/ird_mask //Titanium Faceplate - IRD - kyres1 + name = "titanium faceplate" + desc = "An odd mask seeming to mimic the face of a Human with some artistic liberties taken. Small lights keep it dimly illuminated from within with holographic projectors emulating two bright blue eyes. \ + Its rigid frame is composed of what looks like polished titanium." + icon = 'icons/obj/custom_items/ird_face.dmi' + icon_state = "ird_mask" + item_state = "ird_mask" + contained_sprite = TRUE + flags_inv = HIDEEARS|HIDEFACE + body_parts_covered = FACE + w_class = 3.0 + + +/obj/item/weapon/dice/fluff/baron_dice //BARON's Dice - BARON - iamcrystalclear + weighted = TRUE + favored_number = 2 + + +/obj/item/weapon/flame/lighter/zippo/fluff/nikit_zippo //Vasili Mine Zippo - Nikit Vasili - simontheminer + desc = "An old looking zippo lighter with Vasili Mine Logo engraved on it. \"Good Luck Nikit\" is crudely scratched on under the logo in small writing." + icon = 'icons/obj/custom_items/nikit_zippo.dmi' + icon_state = "nikit_zippo" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index e420bc5f0cf..c5b56850c5d 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -624,7 +624,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H) bodytype = "Vaurca" age_min = 1 age_max = 20 - economic_modifier = 1 + economic_modifier = 2 language = LANGUAGE_VAURCA primitive_form = "V'krexi" greater_form = "Vaurca Warrior" diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 793653aa4b8..b2de0d7a4d4 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -677,7 +677,15 @@ default behaviour is: if(buckled) buckled.user_unbuckle_mob(src) +/mob/living/var/last_resist + /mob/living/proc/resist_grab() + if (last_resist + 4 > world.time) + return + last_resist = world.time + if (stat || paralysis || stunned) + src << "You can't move..." + return var/resisting = 0 for(var/obj/O in requests) requests.Remove(O) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 3b715e3b3cd..bc3e12cd33c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -36,17 +36,21 @@ if (nutriment_amt) reagents.add_reagent(nutriment_type, nutriment_amt, nutriment_desc) -/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M) +/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/eater, var/mob/feeder = null) if(!reagents.total_volume) - M.visible_message("[M] finishes eating \the [src].","You finish eating \the [src].") - M.drop_from_inventory(src) //so icons update :[ + eater.visible_message("[eater] finishes eating \the [src].","You finish eating \the [src].") + + if (!feeder) + feeder = eater + + feeder.drop_from_inventory(src) //so icons update :[ if(trash) if(ispath(trash,/obj/item)) - var/obj/item/TrashItem = new trash(M) - M.put_in_hands(TrashItem) + var/obj/item/TrashItem = new trash(feeder) + feeder.put_in_hands(TrashItem) else if(istype(trash,/obj/item)) - M.put_in_hands(trash) + feeder.put_in_hands(trash) qdel(src) return @@ -114,7 +118,7 @@ else reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) bitecount++ - On_Consume(M) + On_Consume(M, user) return 1 else if (isanimal(M)) @@ -144,7 +148,7 @@ user.visible_message("[user] feeds [M] a tiny bit of [src]. It looks full.") if (!istype(M.loc, /turf)) M << "[user] feeds you a tiny bit of [src]. You feel pretty full!" - On_Consume(M) + On_Consume(M, user) return 1 else user << "[M.name] can't stomach anymore food!" diff --git a/html/changelog.html b/html/changelog.html index 8fb36595855..878d0d8cb3c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,11 +56,24 @@ -->
+

10 May 2018

+

Kaedwuff updated:

+ +

07 May 2018

BurgerBB updated:

+

PoZe updated:

+

25 April 2018

Alberyk updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 88b8d04487c..5546b8f841d 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5393,3 +5393,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2018-05-07: BurgerBB: - rscadd: Fixes the stacking machine from eating materials due to an oversight. + PoZe: + - rscadd: EMT room now has two GPS and two medical emergency medical radios + - maptweak: Increased size of Toxin's airlock, allowing canister to refill from + main air supply + - bugfix: Fixed tags(names) for medical construction level security cameras + - spellcheck: Chemistry, and security construction levels request consoles names + are fixed according to their room. +2018-05-10: + Kaedwuff: + - bugfix: No longer can your victims resist their way out of a good sucking after + being hypnotized by your vampire. diff --git a/html/changelogs/Sindorman-AI.yml b/html/changelogs/Sindorman-AI.yml new file mode 100644 index 00000000000..e2718b80aa5 --- /dev/null +++ b/html/changelogs/Sindorman-AI.yml @@ -0,0 +1,6 @@ +author: PoZe + +delete-after: True + +changes: + - tweak: "All AI intercom microphones are turned off by default. To help new antag AI players not to accidentally reveal their plans" diff --git a/html/changelogs/skull132_vaurca_econ.yml b/html/changelogs/skull132_vaurca_econ.yml new file mode 100644 index 00000000000..b48c61b64e1 --- /dev/null +++ b/html/changelogs/skull132_vaurca_econ.yml @@ -0,0 +1,5 @@ +author: Skull132 +delete-after: True + +changes: + - tweak: "Bumped Vaurca economic modifier by 1 point, as per lore developments." diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi index f7b0084ff48..30168319e0c 100644 Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ diff --git a/icons/obj/custom_items/ird_face.dmi b/icons/obj/custom_items/ird_face.dmi new file mode 100644 index 00000000000..d9146dc88e6 Binary files /dev/null and b/icons/obj/custom_items/ird_face.dmi differ diff --git a/icons/obj/custom_items/jix_items.dmi b/icons/obj/custom_items/jix_items.dmi new file mode 100644 index 00000000000..5aacabf5a4b Binary files /dev/null and b/icons/obj/custom_items/jix_items.dmi differ diff --git a/icons/obj/custom_items/nikit_zippo.dmi b/icons/obj/custom_items/nikit_zippo.dmi new file mode 100644 index 00000000000..5fd228d13b7 Binary files /dev/null and b/icons/obj/custom_items/nikit_zippo.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 083f39e55c8..745ce66f3ff 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -6337,7 +6337,7 @@ pixel_y = 0 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = 0; listening = 1; name = "Common Channel"; pixel_x = -27; @@ -7151,7 +7151,7 @@ pixel_y = -26 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = 0; listening = 1; name = "Common Channel"; pixel_x = 27; @@ -7868,7 +7868,7 @@ pixel_y = 0 }, /obj/item/device/radio/intercom{ - broadcasting = 1; + broadcasting = 0; listening = 1; name = "Common Channel"; pixel_x = -27; @@ -26287,25 +26287,12 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "Uj" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/camera/network/research_outpost{ - c_tag = "Research Sublevel - Toxins Testing Storage"; +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, /turf/simulated/floor/tiled, /area/rnd/mixing) "Uk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -26314,16 +26301,17 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/mixing) "Ul" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/mixing) "Um" = ( @@ -26506,55 +26494,47 @@ /turf/simulated/floor/plating, /area/rnd/mixing) "UB" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 10 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/visible{ - icon_state = "intact"; - dir = 9 +/obj/effect/floor_decal/industrial/warning/cee{ + icon_state = "warningcee"; + dir = 8 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "toxinsairlock_airlock"; - name = "interior access button"; - pixel_x = 0; - pixel_y = -25; - req_one_access = list(13,65) +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "Distro to Canisters"; + target_pressure = 150 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/rnd/mixing) "UC" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = 0; - pixel_y = -30 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/mixing) "UD" = ( -/obj/machinery/suit_storage_unit/standard_unit, /obj/effect/floor_decal/industrial/warning{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + icon_state = "intact-supply"; + dir = 9 + }, /turf/simulated/floor/tiled, /area/rnd/mixing) "UE" = ( @@ -27195,6 +27175,64 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"Wi" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/tiled, +/area/rnd/mixing) +"Wj" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/camera/network/research_outpost{ + c_tag = "Research Sublevel - Toxins Testing Storage"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/mixing) +"Wk" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "toxinsairlock_airlock"; + name = "exterior access button"; + pixel_x = 25; + pixel_y = -25; + req_one_access = list(13,65) + }, +/turf/simulated/floor/asteroid/ash/rocky, +/area/mine/unexplored) +"Wl" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "toxinsairlock_airlock"; + name = "interior access button"; + pixel_x = 0; + pixel_y = -25; + req_one_access = list(13,65) + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/machinery/meter, +/turf/simulated/floor/tiled, +/area/rnd/mixing) (1,1,1) = {" aa @@ -43048,7 +43086,7 @@ Tx Sm ac ac -Ve +Wk rH UU sK @@ -43304,9 +43342,9 @@ Tm Ty Sm ac -ac -Ux -rH +NP +Uy +NP UV sK aa @@ -43562,7 +43600,7 @@ Tz Sm ac NP -Uy +Uz NP UY NP @@ -43817,9 +43855,9 @@ SS To SS TK -ac NP -Uz +NP +UA NP UY NP @@ -44074,9 +44112,9 @@ ST Tp TA NP -NP -NP -UA +TY +Wj +Wl NP UY NP @@ -44331,7 +44369,7 @@ SU PV TB NP -TY +Wi Uj UB NP diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index fe1e97a53b2..b8c256ea9bb 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -10716,27 +10716,6 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"avz" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/obj/machinery/door/window/brigdoor{ - dir = 2; - icon_state = "leftsecure"; - name = "Secure Holding Cell"; - req_access = list(2) - }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/obj/machinery/door/window/brigdoor{ - dir = 2; - icon_state = "leftsecure"; - name = "Secure Holding Cell"; - req_access = list(2) - }, -/turf/simulated/floor/tiled, -/area/security/brig) "avA" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/corner/blue{ @@ -11174,6 +11153,16 @@ }, /turf/simulated/open, /area/engineering/engine_waste) +"awo" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + icon_state = "pdoor1"; + id = "EngineVent"; + name = "Reactor Vent"; + p_open = 0 + }, +/turf/simulated/floor/asteroid/ash/rocky, +/area/engineering/engine_room) "awp" = ( /turf/simulated/floor/greengrid/nitrogen, /area/engineering/engine_room) @@ -15108,14 +15097,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) -"aCE" = ( -/obj/structure/closet/secure_closet/captains, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/weapon/book/manual/brainwashing, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain) "aCF" = ( /obj/machinery/atm{ pixel_y = 32 @@ -20918,25 +20899,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"aLW" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd_ammo, -/obj/item/weapon/rcd, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(56) - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/heads/chief) "aLX" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; @@ -23172,21 +23134,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) -"aPQ" = ( -/obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/weapon/storage/secure/safe{ - pixel_x = 5; - pixel_y = -30 - }, -/obj/item/weapon/book/manual/brainwashing, -/turf/simulated/floor/tiled/dark, -/area/crew_quarters/heads/hos) "aPR" = ( /obj/structure/bed/chair{ dir = 4 @@ -24825,14 +24772,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"aSs" = ( -/obj/structure/closet/secure_closet/engineering_chief, -/obj/item/weapon/tank/emergency_oxygen/engi, -/obj/item/device/gps/engineering, -/obj/item/weapon/pipewrench, -/obj/item/weapon/grenade/chem_grenade/large/phoroncleaner, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/chief) "aSt" = ( /obj/item/modular_computer/console/preset/engineering, /obj/machinery/light_switch{ @@ -28261,18 +28200,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/janitor) -"aYg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access = list(26) - }, -/turf/simulated/floor/tiled, -/area/janitor) "aYh" = ( /obj/machinery/button/remote/blast_door{ id = "mopinator"; @@ -28989,13 +28916,6 @@ }, /turf/simulated/floor/tiled, /area/janitor) -"aZx" = ( -/obj/machinery/camera/network/service{ - c_tag = "Janitor - Garage"; - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/janitor) "aZy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29623,15 +29543,6 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/maintcentral) -"baG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access = list(26) - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "baH" = ( /turf/simulated/wall, /area/storage/tech) @@ -32717,30 +32628,6 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) -"bgg" = ( -/obj/structure/table/rack, -/obj/item/weapon/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/weapon/storage/box/lights/mixed{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera/network/service{ - c_tag = "Janitor - Main Storage"; - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "bgh" = ( /obj/structure/table/rack{ dir = 8; @@ -33450,10 +33337,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/janitor) -"bhx" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled/dark, -/area/janitor) "bhy" = ( /obj/structure/closet/l3closet/janitor, /obj/effect/floor_decal/industrial/outline/yellow, @@ -34264,25 +34147,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) -"biJ" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/dropper, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve{ - icon_state = "corner_white"; - dir = 5 - }, -/obj/machinery/requests_console{ - department = "Psychiatrist's Desk"; - departmentType = 1; - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/medical/chemistry) "biK" = ( /obj/structure/cable{ d1 = 1; @@ -35081,48 +34945,6 @@ "bkc" = ( /turf/simulated/wall/r_wall, /area/bridge/minibar) -"bkd" = ( -/obj/structure/table/rack, -/obj/item/weapon/paper_bin{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark, -/area/janitor) -"bke" = ( -/obj/structure/table/rack, -/obj/item/stack/material/wood{ - amount = 20 - }, -/obj/item/stack/material/plastic{ - amount = 20 - }, -/obj/machinery/alarm{ - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) -"bkf" = ( -/obj/structure/table/rack, -/obj/item/weapon/paper_bin{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "bkg" = ( /obj/structure/table/rack, /obj/item/weapon/caution{ @@ -44678,18 +44500,6 @@ /obj/item/weapon/storage/pill_bottle/spaceacillin, /turf/simulated/floor/tiled/dark, /area/medical/emt) -"bzF" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/radio{ - frequency = 1487; - name = "Medbay Emergency Radio Link"; - pixel_x = 5; - pixel_y = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/emt) "bzG" = ( /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; @@ -45287,17 +45097,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/emt) -"bAH" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/gps{ - gpstag = "MED0" - }, -/obj/item/device/radio{ - pixel_x = -5 - }, -/turf/simulated/floor/tiled/dark, -/area/medical/emt) "bAI" = ( /turf/simulated/floor/tiled/white, /area/medical/em_preop) @@ -50253,6 +50052,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/maintcentral) +"bIY" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance{ + name = "Research Division Maintenance"; + req_access = list(47); + req_one_access = null + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "Biohazard"; + name = "Biohazard Shutter"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/research) "bIZ" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/research) @@ -57293,28 +57112,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"bZs" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/hallway/primary/aft) -"bZt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "bZu" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -57432,32 +57229,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/quartermaster/office) -"bZH" = ( -/obj/structure/cryofeed{ - icon_state = "cryo_rear"; - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"bZJ" = ( -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"bZK" = ( -/obj/machinery/camera/network/civilian_main{ - c_tag = "Cryo - Main Level"; - dir = 2 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"bZL" = ( -/obj/machinery/cryopod, -/obj/machinery/light{ - dir = 1; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "bZM" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -57658,17 +57429,6 @@ /obj/effect/floor_decal/industrial/loading, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cai" = ( -/obj/machinery/cryopod{ - icon_state = "body_scanner_0"; - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"caj" = ( -/obj/machinery/cryopod, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "cak" = ( /obj/structure/table/wood, /obj/machinery/light/small, @@ -57861,13 +57621,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"caz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "caB" = ( /obj/structure/cable{ d1 = 2; @@ -57975,13 +57728,6 @@ /obj/effect/large_stock_marker, /turf/simulated/floor/tiled, /area/quartermaster/office) -"caT" = ( -/obj/machinery/door/airlock/maintenance{ - req_access = list(12) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/hallway/primary/aft) "caU" = ( /obj/structure/cable{ d1 = 2; @@ -61771,14 +61517,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cio" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "cip" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -61803,10 +61541,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cis" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "cit" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -61823,30 +61557,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"ciw" = ( -/obj/machinery/cryopod{ - icon_state = "body_scanner_0"; - dir = 4 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"cix" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"ciy" = ( -/obj/machinery/cryopod, -/obj/item/device/radio/intercom{ - pixel_y = -26 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) "ciz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -62395,30 +62105,6 @@ icon_state = "asteroidplating" }, /area/outpost/mining_main/eva) -"clo" = ( -/obj/machinery/computer/cryopod{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"clp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 2 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/primary/aft) -"clq" = ( -/obj/structure/cryofeed, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/bar) "clu" = ( /obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; @@ -62451,13 +62137,21 @@ }, /area/outpost/mining_main/eva) "cly" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance"; + req_access = list(63) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/security/brig) +"clz" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; req_access = list(63) }, /turf/simulated/floor/plating, /area/security/vacantoffice2) -"clz" = ( +"clA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ @@ -62467,7 +62161,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/brig) -"clA" = ( +"clB" = ( /obj/machinery/door/airlock/security{ name = "Interrogation Monitoring"; req_access = list(1) @@ -62481,7 +62175,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/brig) -"clB" = ( +"clC" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -62490,7 +62184,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clC" = ( +"clD" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; req_access = list(63) @@ -62512,7 +62206,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clD" = ( +"clE" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -62532,7 +62226,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/brig) -"clE" = ( +"clF" = ( /obj/structure/table/standard, /obj/item/device/radio, /obj/item/device/radio, @@ -62548,7 +62242,7 @@ /obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/security/brig) -"clF" = ( +"clG" = ( /obj/structure/table/standard, /obj/item/weapon/crowbar, /obj/item/weapon/crowbar, @@ -62566,7 +62260,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/brig) -"clG" = ( +"clH" = ( /obj/structure/table/standard, /obj/item/device/flashlight/maglight, /obj/item/device/flashlight/maglight, @@ -62580,7 +62274,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clH" = ( +"clI" = ( /obj/machinery/vending/security, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/corner/blue{ @@ -62596,6 +62290,13 @@ /turf/simulated/floor/tiled/freezer, /area/security/brig) "clK" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, +/area/security/brig) +"clL" = ( /obj/machinery/door/airlock/security{ name = "Interrogation"; req_access = list(1) @@ -62609,7 +62310,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/brig) -"clL" = ( +"clM" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -62624,7 +62325,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clM" = ( +"clN" = ( /obj/machinery/door/airlock/glass_security{ name = "Equipment Storage"; req_access = list(1) @@ -62642,7 +62343,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/brig) -"clN" = ( +"clO" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 9 @@ -62654,7 +62355,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clO" = ( +"clP" = ( /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -62663,7 +62364,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/security/brig) -"clP" = ( +"clQ" = ( /obj/item/device/radio/intercom{ pixel_x = 32 }, @@ -62673,19 +62374,19 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clQ" = ( +"clR" = ( /obj/machinery/door/airlock{ name = "Unit 1" }, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"clR" = ( +"clS" = ( /obj/machinery/door/airlock{ name = "Unit 2" }, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"clS" = ( +"clT" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -62702,7 +62403,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/brig) -"clT" = ( +"clU" = ( /obj/structure/table/standard, /obj/item/weapon/hand_labeler, /obj/effect/floor_decal/corner/blue{ @@ -62712,7 +62413,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/security/brig) -"clU" = ( +"clV" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -62725,14 +62426,14 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clV" = ( +"clW" = ( /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, /area/security/brig) -"clW" = ( +"clX" = ( /obj/machinery/disposal, /obj/machinery/alarm{ dir = 8; @@ -62749,21 +62450,21 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"clX" = ( +"clY" = ( /turf/simulated/floor/tiled/freezer, /area/security/brig) -"clY" = ( +"clZ" = ( /obj/machinery/light{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"clZ" = ( +"cma" = ( /obj/structure/window/reinforced, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cma" = ( +"cmb" = ( /obj/structure/closet/secure_closet/security, /obj/structure/window/reinforced{ dir = 1 @@ -62774,7 +62475,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cmb" = ( +"cmc" = ( /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 8 @@ -62793,7 +62494,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cmc" = ( +"cmd" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, @@ -62805,7 +62506,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cmd" = ( +"cme" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 6 @@ -62818,7 +62519,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cme" = ( +"cmf" = ( /obj/machinery/door/airlock/security{ name = "Shower"; req_access = list(1) @@ -62832,7 +62533,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmf" = ( +"cmg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -62841,7 +62542,7 @@ }, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmg" = ( +"cmh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -62852,62 +62553,23 @@ /turf/simulated/floor/tiled/freezer, /area/security/brig) "cmi" = ( -/obj/structure/closet/secure_closet/security, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/security/brig) -"cml" = ( -/obj/structure/closet/wardrobe/red, -/obj/structure/window/reinforced, -/obj/item/clothing/accessory/holster/waist, -/obj/item/clothing/accessory/holster/waist, -/obj/item/clothing/accessory/holster/waist, -/obj/item/clothing/accessory/holster/waist, -/turf/simulated/floor/tiled/dark, -/area/security/brig) -"cmm" = ( -/obj/structure/sink{ +/obj/machinery/shower{ dir = 8; - icon_state = "sink"; - pixel_x = -12; - pixel_y = 5 - }, -/obj/structure/mirror{ - pixel_x = -32 + icon_state = "shower"; + pixel_x = 0; + pixel_y = 0 }, +/obj/machinery/door/window/westleft, +/obj/structure/curtain/open/shower, +/obj/item/weapon/soap, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/freezer, -/area/security/brig) -"cmo" = ( -/obj/structure/table/rack, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/item/weapon/towel, -/turf/simulated/floor/tiled/freezer, -/area/security/brig) -"cmp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled, -/area/security/brig) -"cmq" = ( +"cmj" = ( /obj/structure/closet/secure_closet/security, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cmr" = ( +"cmk" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 9 @@ -62920,19 +62582,90 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cms" = ( +"cml" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 6 }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"cmm" = ( +/obj/structure/closet/wardrobe/red, +/obj/structure/window/reinforced, +/obj/item/clothing/accessory/holster/waist, +/obj/item/clothing/accessory/holster/waist, +/obj/item/clothing/accessory/holster/waist, +/obj/item/clothing/accessory/holster/waist, +/turf/simulated/floor/tiled/dark, +/area/security/brig) +"cmn" = ( +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -12; + pixel_y = 5 + }, +/obj/structure/mirror{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/freezer, +/area/security/brig) +"cmo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/freezer, +/area/security/brig) +"cmp" = ( +/obj/structure/table/rack, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/obj/item/weapon/towel, +/turf/simulated/floor/tiled/freezer, +/area/security/brig) +"cmq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/status_display{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/security/brig) +"cmr" = ( +/obj/structure/closet/secure_closet/security, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/security/brig) +"cms" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/security/brig) "cmt" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/security/brig) +"cmu" = ( /obj/structure/closet/secure_closet/security_cadet, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/brig) -"cmu" = ( +"cmv" = ( /obj/machinery/alarm{ dir = 4; icon_state = "alarm0"; @@ -62945,12 +62678,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmv" = ( +"cmw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmw" = ( +"cmx" = ( /obj/machinery/shower{ dir = 8; icon_state = "shower"; @@ -62962,7 +62695,7 @@ /obj/item/weapon/soap, /turf/simulated/floor/tiled/freezer, /area/security/brig) -"cmx" = ( +"cmy" = ( /obj/effect/floor_decal/corner/blue/full, /obj/structure/cable/green{ d1 = 1; @@ -62972,19 +62705,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmy" = ( +"cmz" = ( /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmz" = ( +"cmA" = ( /obj/structure/closet/secure_closet/security_cadet, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmA" = ( +"cmB" = ( /obj/structure/sink{ dir = 8; icon_state = "sink"; @@ -63000,14 +62733,14 @@ /obj/machinery/light, /turf/simulated/floor/tiled/freezer, /area/security/main) -"cmB" = ( +"cmC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/freezer, /area/security/main) -"cmC" = ( +"cmD" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63017,7 +62750,7 @@ /obj/item/weapon/towel, /turf/simulated/floor/tiled/freezer, /area/security/main) -"cmD" = ( +"cmE" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63037,7 +62770,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/main) -"cmE" = ( +"cmF" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Equipment Storage"; req_access = list(1) @@ -63060,7 +62793,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmF" = ( +"cmG" = ( /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -63078,7 +62811,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmG" = ( +"cmH" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63098,7 +62831,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/main) -"cmH" = ( +"cmI" = ( /obj/machinery/door/airlock/security{ name = "Showers"; req_access = list(63) @@ -63108,7 +62841,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/freezer, /area/security/main) -"cmI" = ( +"cmJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ c_tag = "Security - Corridor Camera 2"; @@ -63117,6 +62850,22 @@ /turf/simulated/floor/tiled, /area/security/brig) "cmK" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/security/main) +"cmL" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63125,14 +62874,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/security/main) -"cmL" = ( +"cmM" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/main) -"cmM" = ( +"cmN" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -63143,7 +62892,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmN" = ( +"cmO" = ( /obj/machinery/light{ dir = 1 }, @@ -63152,11 +62901,11 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmO" = ( +"cmP" = ( /obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/security/main) -"cmP" = ( +"cmQ" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -63168,7 +62917,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmQ" = ( +"cmR" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -63176,6 +62925,14 @@ /turf/simulated/floor/tiled, /area/security/main) "cmS" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Security Maintenance"; + req_access = list(63) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/security/brig) +"cmT" = ( /obj/machinery/door/airlock/glass_security{ name = "Security Office"; req_access = list(63) @@ -63186,7 +62943,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmT" = ( +"cmU" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 9 @@ -63199,7 +62956,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmU" = ( +"cmV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -63209,7 +62966,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cmV" = ( +"cmW" = ( /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; @@ -63225,7 +62982,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmW" = ( +"cmX" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -63237,7 +62994,7 @@ /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmX" = ( +"cmY" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 8 @@ -63250,7 +63007,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmY" = ( +"cmZ" = ( /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/corner/blue/full{ dir = 1 @@ -63260,7 +63017,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cmZ" = ( +"cna" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -63268,12 +63025,28 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/main) -"cna" = ( +"cnb" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/security/main) "cnc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/security/main) +"cnd" = ( /obj/structure/coatrack, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63281,7 +63054,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnd" = ( +"cne" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/item/weapon/paper_bin, @@ -63292,7 +63065,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cne" = ( +"cnf" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63302,7 +63075,7 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnf" = ( +"cng" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63312,13 +63085,19 @@ /obj/item/device/radio/phone, /turf/simulated/floor/tiled/dark, /area/security/main) -"cng" = ( +"cnh" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/item/weapon/paper_bin, /turf/simulated/floor/tiled/dark, /area/security/main) "cni" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/security/main) +"cnj" = ( /obj/machinery/alarm{ dir = 8; icon_state = "alarm0"; @@ -63329,14 +63108,14 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnj" = ( +"cnk" = ( /obj/structure/bed/chair, /obj/item/device/radio/intercom{ pixel_x = -28 }, /turf/simulated/floor/tiled, /area/security/main) -"cnk" = ( +"cnl" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 1 @@ -63349,7 +63128,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnl" = ( +"cnm" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 1 @@ -63361,7 +63140,7 @@ /obj/item/weapon/handcuffs, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnm" = ( +"cnn" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 1 @@ -63374,7 +63153,7 @@ /obj/item/weapon/reagent_containers/food/drinks/coffee, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnn" = ( +"cno" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ dir = 1 @@ -63383,12 +63162,18 @@ /turf/simulated/floor/tiled/dark, /area/security/main) "cnp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/security/main) +"cnq" = ( /obj/structure/noticeboard{ pixel_x = 32 }, /turf/simulated/floor/tiled, /area/security/main) -"cnq" = ( +"cnr" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/donut, /obj/machinery/newscaster{ @@ -63396,7 +63181,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnr" = ( +"cns" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, @@ -63408,7 +63193,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cns" = ( +"cnt" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -63422,7 +63207,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnt" = ( +"cnu" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 8 @@ -63437,7 +63222,7 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnu" = ( +"cnv" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, @@ -63452,18 +63237,18 @@ }, /turf/simulated/floor/tiled/dark, /area/security/main) -"cnv" = ( +"cnw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/main) -"cnw" = ( +"cnx" = ( /obj/structure/table/standard, /obj/item/weapon/material/ashtray, /turf/simulated/floor/tiled, /area/security/main) -"cnx" = ( +"cny" = ( /obj/structure/grille, /obj/structure/window/reinforced{ dir = 1 @@ -63478,16 +63263,16 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/main) -"cny" = ( +"cnz" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/security/main) -"cnz" = ( +"cnA" = ( /obj/machinery/light, /turf/simulated/floor/tiled, /area/security/main) -"cnA" = ( +"cnB" = ( /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -63495,7 +63280,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnB" = ( +"cnC" = ( /obj/machinery/camera/network/security{ c_tag = "Security - Security Office"; dir = 1; @@ -63512,7 +63297,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnC" = ( +"cnD" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 10 @@ -63529,7 +63314,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnD" = ( +"cnE" = ( /obj/machinery/hologram/holopad, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63547,7 +63332,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnE" = ( +"cnF" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63558,7 +63343,7 @@ }, /turf/simulated/floor/tiled, /area/security/main) -"cnF" = ( +"cnG" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63571,7 +63356,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/main) -"cnG" = ( +"cnH" = ( /obj/effect/floor_decal/corner/blue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -63588,7 +63373,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"cnH" = ( +"cnI" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 10 @@ -63602,7 +63387,7 @@ /obj/machinery/disposal, /turf/simulated/floor/tiled, /area/security/brig) -"cnI" = ( +"cnJ" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63613,7 +63398,7 @@ }, /turf/simulated/floor/plating, /area/security/main) -"cnJ" = ( +"cnK" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63626,22 +63411,6 @@ /turf/simulated/floor/plating, /area/security/main) "cnL" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Security Office"; - req_access = list(63) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/security/main) -"cnM" = ( /obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63657,7 +63426,39 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/security/main) +"cnM" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Security Office"; + req_access = list(63) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/security/main) "cnN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/security/main) +"cnO" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63669,7 +63470,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"cnO" = ( +"cnP" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -63689,7 +63490,7 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"cnP" = ( +"cnQ" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -63715,17 +63516,30 @@ }, /turf/simulated/floor/tiled, /area/security/brig) -"cnQ" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - icon_state = "pdoor1"; - id = "EngineVent"; - name = "Reactor Vent"; - p_open = 0 - }, -/turf/simulated/floor/asteroid/ash/rocky, -/area/engineering/engine_room) "cnR" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/machinery/door/window/brigdoor{ + dir = 2; + icon_state = "leftsecure"; + name = "Secure Holding Cell"; + req_access = list(2) + }, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/security/brig) +"cnS" = ( +/obj/structure/closet/secure_closet/captains, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/weapon/book/manual/brainwashing, +/turf/simulated/floor/carpet, +/area/crew_quarters/captain) +"cnT" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; req_access = list(63) @@ -63733,7 +63547,49 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/brig) -"cnS" = ( +"cnU" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd_ammo, +/obj/item/weapon/rcd, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/window/brigdoor/southright{ + req_access = list(56) + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) +"cnV" = ( +/obj/structure/table/wood, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/weapon/storage/secure/safe{ + pixel_x = 5; + pixel_y = -30 + }, +/obj/item/weapon/book/manual/brainwashing, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/heads/hos) +"cnW" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/obj/item/weapon/tank/emergency_oxygen/engi, +/obj/item/device/gps/engineering, +/obj/item/weapon/pipewrench, +/obj/item/weapon/grenade/chem_grenade/large/phoroncleaner, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/chief) +"cnX" = ( /obj/machinery/door/airlock{ id_tag = "visitdoor"; name = "Visitation Area"; @@ -63747,27 +63603,136 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) -"cnT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, +"cnY" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) + }, +/turf/simulated/floor/tiled, +/area/janitor) +"cnZ" = ( +/obj/machinery/camera/network/service{ + c_tag = "Janitor - Garage"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/janitor) +"coa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance{ - name = "Research Division Maintenance"; - req_access = list(47); - req_one_access = null +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "Biohazard"; - name = "Biohazard Shutter"; - opacity = 0 +/turf/simulated/floor/tiled/dark, +/area/janitor) +"cob" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = -4 }, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/research) -"cnU" = ( +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/camera/network/service{ + c_tag = "Janitor - Main Storage"; + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"coc" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"cod" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/dropper, +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/machinery/requests_console{ + department = "Chemist's Desk"; + departmentType = 1; + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/medical/chemistry) +"coe" = ( +/obj/structure/table/rack, +/obj/item/weapon/paper_bin{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/paper_bin, +/obj/item/weapon/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"cof" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"cog" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"coh" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/device/radio{ + frequency = 1487; + name = "Medbay Emergency Radio Link"; + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/radio{ + frequency = 1487; + name = "Medbay Emergency Radio Link"; + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/medical/emt) +"coi" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/toolbox/emergency, +/obj/item/device/gps{ + gpstag = "MED1" + }, +/obj/item/device/radio{ + pixel_x = -5 + }, +/obj/item/device/gps{ + gpstag = "MED0" + }, +/turf/simulated/floor/tiled/dark, +/area/medical/emt) +"coj" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; freq = 1400; @@ -63777,7 +63742,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hydroponics) -"cnV" = ( +"cok" = ( /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; req_access = list(35) @@ -63788,7 +63753,7 @@ }, /turf/simulated/floor/plating, /area/hydroponics) -"cnW" = ( +"col" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white_full"; dir = 8 @@ -63806,7 +63771,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cnX" = ( +"com" = ( /obj/effect/floor_decal/industrial/loading, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window{ @@ -63816,7 +63781,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cnY" = ( +"con" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63830,7 +63795,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cnZ" = ( +"coo" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63838,7 +63803,7 @@ /obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled, /area/hydroponics) -"coa" = ( +"cop" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63860,7 +63825,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cob" = ( +"coq" = ( /obj/machinery/status_display{ pixel_x = 0; pixel_y = 32 @@ -63869,7 +63834,7 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, /area/hydroponics) -"coc" = ( +"cor" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/watertank, /obj/item/device/radio/intercom{ @@ -63878,14 +63843,14 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cod" = ( +"cos" = ( /obj/machinery/light{ dir = 1; icon_state = "tube1" }, /turf/simulated/floor/tiled, /area/hydroponics) -"coe" = ( +"cot" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -63905,7 +63870,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cof" = ( +"cou" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63923,7 +63888,25 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coh" = ( +"cov" = ( +/obj/effect/floor_decal/corner/green{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"cow" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63944,7 +63927,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"coi" = ( +"cox" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -63962,7 +63945,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"coj" = ( +"coy" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 9 @@ -63975,13 +63958,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) -"cok" = ( +"coz" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/hydroponics) -"col" = ( +"coA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ icon_state = "intact-supply"; dir = 6 @@ -63992,7 +63975,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"com" = ( +"coB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -64001,7 +63984,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"con" = ( +"coC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -64022,7 +64005,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coq" = ( +"coD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -64036,7 +64019,35 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cor" = ( +"coE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"coF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"coG" = ( /obj/effect/floor_decal/corner/green, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -64051,7 +64062,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cos" = ( +"coH" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; icon_state = "door_closed"; @@ -64066,13 +64077,25 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cov" = ( +"coI" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"cow" = ( +"coJ" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"coK" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"coL" = ( /obj/item/weapon/material/hatchet, /obj/item/weapon/material/minihoe, /obj/effect/floor_decal/corner/green{ @@ -64089,7 +64112,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cox" = ( +"coM" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64099,7 +64122,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coy" = ( +"coN" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64107,7 +64130,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) -"coz" = ( +"coO" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -64122,7 +64145,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coA" = ( +"coP" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64139,7 +64162,7 @@ /obj/effect/floor_decal/corner/green, /turf/simulated/floor/tiled, /area/hydroponics) -"coB" = ( +"coQ" = ( /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -64149,14 +64172,14 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coC" = ( +"coR" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 8 }, /turf/simulated/floor/tiled, /area/hydroponics) -"coD" = ( +"coS" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 6 @@ -64165,7 +64188,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hydroponics) -"coE" = ( +"coT" = ( /obj/structure/table/standard, /obj/machinery/door/window{ base_state = "left"; @@ -64183,7 +64206,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/hydroponics) -"coF" = ( +"coU" = ( /obj/structure/grille, /obj/structure/window/reinforced{ icon_state = "rwindow"; @@ -64196,7 +64219,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hydroponics) -"coG" = ( +"coV" = ( /obj/structure/grille, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ @@ -64208,7 +64231,7 @@ }, /turf/simulated/floor/plating, /area/hydroponics) -"coH" = ( +"coW" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white_full" }, @@ -64224,14 +64247,14 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coI" = ( +"coX" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, /obj/machinery/chemical_dispenser, /turf/simulated/floor/tiled, /area/hydroponics) -"coJ" = ( +"coY" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, @@ -64239,14 +64262,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) -"coK" = ( +"coZ" = ( /obj/effect/floor_decal/corner/green{ dir = 10 }, /obj/machinery/chem_master, /turf/simulated/floor/tiled, /area/hydroponics) -"coL" = ( +"cpa" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64261,7 +64284,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coM" = ( +"cpb" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/structure/window/reinforced{ icon_state = "rwindow"; @@ -64269,13 +64292,13 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"coN" = ( +"cpc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/hydroponics) -"coO" = ( +"cpd" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 4 @@ -64287,7 +64310,7 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coP" = ( +"cpe" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 @@ -64299,7 +64322,7 @@ /obj/item/weapon/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/hydroponics) -"coQ" = ( +"cpf" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, @@ -64312,7 +64335,22 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"coT" = ( +"cpg" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cph" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hydroponics) +"cpi" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 1 @@ -64321,14 +64359,14 @@ /obj/machinery/firealarm/west, /turf/simulated/floor/grass, /area/hydroponics) -"coU" = ( +"cpj" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) -"coV" = ( +"cpk" = ( /obj/machinery/door/window{ dir = 1; name = "Hydroponics Garden"; @@ -64338,7 +64376,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/grass, /area/hydroponics) -"coW" = ( +"cpl" = ( /obj/structure/window/reinforced{ icon_state = "rwindow"; dir = 1 @@ -64346,7 +64384,7 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/grass, /area/hydroponics) -"coX" = ( +"cpm" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64357,11 +64395,30 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/holofloor/wood, /area/hydroponics) -"coZ" = ( +"cpn" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) -"cpc" = ( +"cpp" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpq" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hydroponics) +"cpr" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/service{ c_tag = "Hydroponics - West"; @@ -64369,7 +64426,10 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpe" = ( +"cps" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -64378,7 +64438,7 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpf" = ( +"cpu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -64387,7 +64447,7 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpg" = ( +"cpv" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64401,32 +64461,60 @@ /obj/item/weapon/reagent_containers/glass/bucket/wood, /turf/simulated/floor/holofloor/wood, /area/hydroponics) -"cpi" = ( +"cpw" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpx" = ( /obj/machinery/vending/hydroseeds{ prices = list() }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hydroponics) -"cpj" = ( +"cpy" = ( /obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hydroponics) -"cpk" = ( +"cpz" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/standard, /obj/item/watertank, /turf/simulated/floor/tiled, /area/hydroponics) -"cpn" = ( +"cpA" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpB" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hydroponics) +"cpC" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) -"cpr" = ( +"cpD" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpE" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpF" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpG" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64440,22 +64528,26 @@ }, /turf/simulated/floor/holofloor/wood, /area/hydroponics) -"cpt" = ( +"cpH" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpI" = ( /obj/machinery/biogenerator, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hydroponics) -"cpu" = ( +"cpJ" = ( /obj/machinery/seed_extractor, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hydroponics) -"cpv" = ( +"cpK" = ( /obj/machinery/smartfridge/drying_rack, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hydroponics) -"cpw" = ( +"cpL" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/camera/network/service{ c_tag = "Hydroponics - East"; @@ -64463,46 +64555,7 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpy" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, -/turf/simulated/floor/grass, -/area/hydroponics) -"cpC" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/weapon/reagent_containers/glass/bucket/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/holofloor/wood, -/area/hydroponics) -"cpE" = ( -/obj/effect/floor_decal/corner/green{ - icon_state = "corner_white_full" - }, -/turf/simulated/floor/tiled, -/area/hydroponics) -"cpF" = ( -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) -"cpG" = ( -/obj/effect/floor_decal/corner/green{ - icon_state = "corner_white_full"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hydroponics) -"cpI" = ( +"cpM" = ( /obj/structure/grille, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ @@ -64513,23 +64566,90 @@ }, /turf/simulated/floor/plating, /area/hydroponics) -"cpJ" = ( +"cpN" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpO" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpP" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpQ" = ( +/turf/simulated/floor/grass, +/area/hydroponics) +"cpR" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/weapon/reagent_containers/glass/bucket/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/holofloor/wood, +/area/hydroponics) +"cpS" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpT" = ( +/obj/effect/floor_decal/corner/green{ + icon_state = "corner_white_full" + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"cpU" = ( +/obj/effect/floor_decal/corner/green{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"cpV" = ( +/obj/effect/floor_decal/corner/green{ + icon_state = "corner_white_full"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"cpW" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"cpX" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hydroponics) +"cpY" = ( /obj/item/device/radio/intercom{ pixel_y = -26 }, /turf/simulated/floor/grass, /area/hydroponics) -"cpK" = ( +"cpZ" = ( /obj/machinery/status_display{ pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/grass, /area/hydroponics) -"cpL" = ( +"cqa" = ( /turf/simulated/floor/grass, /area/hydroponics) -"cpM" = ( +"cqb" = ( /obj/structure/window/reinforced{ dir = 4 }, @@ -64541,7 +64661,7 @@ }, /turf/simulated/floor/holofloor/wood, /area/hydroponics) -"cpN" = ( +"cqc" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 9 @@ -64553,21 +64673,21 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) -"cpO" = ( +"cqd" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, /turf/simulated/floor/grass, /area/hydroponics) -"cpP" = ( +"cqe" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/item/device/radio/intercom{ pixel_y = -26 }, /turf/simulated/floor/grass, /area/hydroponics) -"cpQ" = ( +"cqf" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/status_display{ pixel_x = 0; @@ -64575,7 +64695,7 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpR" = ( +"cqg" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/alarm{ dir = 1; @@ -64584,11 +64704,11 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpS" = ( +"cqh" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/hydroponics) -"cpT" = ( +"cqi" = ( /obj/structure/flora/pottedplant/random, /obj/machinery/light{ icon_state = "tube1"; @@ -64596,7 +64716,7 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"cpU" = ( +"cqj" = ( /obj/structure/grille, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ @@ -64608,7 +64728,7 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/hydroponics) -"cpV" = ( +"cqk" = ( /obj/machinery/camera/network/civilian_main{ c_tag = "Aft Corridor - Camera 1"; dir = 4 @@ -64618,7 +64738,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"cpW" = ( +"cql" = ( /obj/item/device/radio/intercom{ pixel_x = 0; pixel_y = 27 @@ -64626,7 +64746,7 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cpX" = ( +"cqm" = ( /obj/structure/table/standard, /obj/item/weapon/paper_bin{ pixel_x = -3; @@ -64642,7 +64762,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cpY" = ( +"cqn" = ( /obj/item/modular_computer/console/preset/supply, /obj/effect/floor_decal/corner/brown{ icon_state = "corner_white"; @@ -64654,13 +64774,13 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cpZ" = ( +"cqo" = ( /obj/machinery/alarm{ pixel_y = 23 }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cqa" = ( +"cqp" = ( /obj/machinery/door/firedoor{ dir = 4; name = "Firelock East" @@ -64682,11 +64802,11 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cqb" = ( +"cqq" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cqc" = ( +"cqr" = ( /obj/structure/grille, /obj/structure/window/reinforced{ dir = 4 @@ -64696,7 +64816,7 @@ }, /turf/simulated/floor/plating, /area/quartermaster/office) -"cqd" = ( +"cqs" = ( /obj/structure/table/standard, /obj/item/weapon/stamp/denied{ pixel_x = 4; @@ -64708,7 +64828,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"cqe" = ( +"cqt" = ( /obj/machinery/atm{ pixel_x = -32 }, @@ -64719,6 +64839,204 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"cqu" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/cryo) +"cqv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqw" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/cryo) +"cqx" = ( +/obj/structure/cryofeed{ + icon_state = "cryo_rear"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqy" = ( +/obj/machinery/cryopod{ + icon_state = "body_scanner_0"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqB" = ( +/obj/machinery/camera/network/civilian_main{ + c_tag = "Cryo - Main Level"; + dir = 2 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqC" = ( +/obj/machinery/cryopod, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqD" = ( +/obj/structure/cryofeed, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqE" = ( +/obj/structure/cryofeed{ + icon_state = "cryo_rear"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqF" = ( +/obj/machinery/cryopod{ + icon_state = "body_scanner_0"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqG" = ( +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqI" = ( +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqJ" = ( +/obj/machinery/cryopod, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqK" = ( +/obj/structure/cryofeed, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqL" = ( +/obj/structure/cryofeed{ + icon_state = "cryo_rear"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqM" = ( +/obj/machinery/cryopod{ + icon_state = "body_scanner_0"; + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqN" = ( +/obj/machinery/computer/cryopod{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 2 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqQ" = ( +/obj/machinery/cryopod, +/obj/item/device/radio/intercom{ + pixel_y = -26 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqR" = ( +/obj/structure/cryofeed, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/cryo) +"cqS" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) +"cqT" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) +"cqU" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) +"cqV" = ( +/obj/machinery/door/airlock/maintenance{ + req_access = list(12) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/cryo) +"cqW" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) +"cqX" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) +"cqY" = ( +/turf/simulated/wall, +/area/crew_quarters/sleep/cryo) (1,1,1) = {" aaa @@ -75363,7 +75681,7 @@ akY akY akY akY -cnQ +awo akY akY akY @@ -80264,7 +80582,7 @@ aUg aVh aWQ aYe -aZx +cnZ aZC bbX bbZ @@ -80272,7 +80590,7 @@ bbZ bbZ bbZ bja -bkd +coe aKi bmY aKi @@ -80522,14 +80840,14 @@ aVi aWR aYf aZy -baG +coa bbY bdu beI beI bhw bjb -bhx +cof aKi bmY aKi @@ -80773,7 +81091,7 @@ aLU aLU aPm aLU -aSs +cnW aLU aVj aWS @@ -80784,9 +81102,9 @@ bbZ bdv beJ beJ -bhx +coc bbZ -bhx +cog aKi bmY aKi @@ -81283,7 +81601,7 @@ aBc aGM aIr alY -aLW +cnU aNL aPo aRc @@ -81297,7 +81615,7 @@ aZC bcb bdw beK -bgg +cob bhy bhy aZC @@ -81548,7 +81866,7 @@ aSu aLU aVm aWV -aYg +cnY aZC aZC aZC @@ -83892,7 +84210,7 @@ bES bFW bGY bIk -cnT +bIY bJR bgm bLy @@ -89046,7 +89364,7 @@ bOp bQy bRa bRL -cnV +cok bRL bRL bRL @@ -89303,14 +89621,14 @@ bOp bQz bdJ bRL -cnW -coj -cow -coH -coT -cpc -cpn -cpy +col +coy +coL +coW +cpi +cpr +cpC +cpN bVl bWm bWF @@ -89559,16 +89877,16 @@ bOp bPX bQz bdJ -cnU -cnX -cok -cox -coI -coU -cpL -cpL -cpL -cpJ +coj +com +coz +coM +coX +cpj +cps +cpD +cpO +cpY bWm bWm bWm @@ -89760,7 +90078,7 @@ axf axf axf aaV -cnR +cnT aHl aHl aHl @@ -89817,15 +90135,15 @@ bOp bQz bdJ bRL -cnY -col -coy -coJ -coV -cpe -cpL -cpL -cpK +con +coA +coN +coY +cpk +cpt +cpE +cpP +cpZ bWm bWH bWV @@ -90074,15 +90392,15 @@ bOp bQA bdJ bRL -cnZ -com -coz -coK -coW -cpf -cpL -cpL -cpL +coo +coB +coO +coZ +cpl +cpu +cpF +cpQ +cqa bWm bWI bWW @@ -90331,15 +90649,15 @@ bIu bIu bRb bRL -coa -con -coA -coL -coX -cpg -cpr -cpC -cpM +cop +coC +coP +cpa +cpm +cpv +cpG +cpR +cqb bWm bWX bXo @@ -90588,19 +90906,19 @@ baK btm bAi bRL -cob coq -coB -coM +coD +coQ +cpb +cpn +cpw +cpH cpS -cpS -cpS -cpS -cpN +cqc bWm -cpW +cql bXp -cqd +cqs bXp bYo bXT @@ -90845,17 +91163,17 @@ bMD bQB bMD bRL -coc -coq -coC +cor +coE +coR bSO bSO bSO bSO -cpE -cpO +cpT +cqd bWm -cpX +cqm bXq bXO bWY @@ -91102,18 +91420,18 @@ bPY bOY bRc bRL -cod -coq +cos +coF bSL -coN +cpc bSL -cpi -cpt +cpx +cpI bSQ -cpP +cqe bWm bWm -cqa +cqp bWm bXP bYq @@ -91359,19 +91677,19 @@ bPZ bOY bRd bRL -coe -cor -coD -coO -coZ -cpj -cpu -cpF -cpQ +cot +coG +coS +cpd +cpo +cpy +cpJ +cpU +cqf bWm bXa bXs -cqe +cqt bXQ bXQ chY @@ -91565,7 +91883,7 @@ aIM aKK aMv aOf -aPQ +cnV aHl amr aUB @@ -91616,17 +91934,17 @@ bOY bQC bRe bRL -cof -cos +cou +coH bRL -coP +cpe bSL -cpk -cpv +cpz +cpK bSQ -cpR +cqg bRL -cpY +cqn bXs bXp bXR @@ -91873,18 +92191,18 @@ bQa bQD bRf bPH -coi cov -coE -coQ +coI +coT +cpf bVt bVt bVt -cpG -cpS +cpV +cqh bWm -cpZ -cqb +cqo +cqq bXt bXS bYo @@ -92130,15 +92448,15 @@ bQb bQb bRg bPH -coh -cov -coF -cpS -cpS -cpS -cpw -cpS -cpT +cow +coJ +coU +cpg +cpp +cpA +cpL +cpW +cqi bWm bXd bYM @@ -92148,10 +92466,10 @@ bXp bYM bZb bWm -bZH -bZH -bZH -bPH +cqx +cqE +cqL +cqS cbh cbz cbU @@ -92387,28 +92705,28 @@ bQc bMD bMD bPH -coi -cov -coG -cpI -cpI -cpI -cpI -cpI -cpU +cox +coK +coV +cph +cpq +cpB +cpM +cpX +cqj bWm bXe -cqc +cqr bXv bXT bYs bXe bXv bWm -cai -cai -ciw -bPH +cqy +cqF +cqM +cqT cbi cbA cbV @@ -92653,7 +92971,7 @@ bLU bVv bLU bLU -cpV +cqk bRh bLU bXw @@ -92661,11 +92979,11 @@ bXV bYt bYN bLU -bZs -cix -bZJ -clo -bPH +cqu +cqz +cqG +cqN +cqU bPO bPL cbW @@ -92838,7 +93156,7 @@ aaa aaa aaV atX -avz +cnR axm ayO aAm @@ -92918,11 +93236,11 @@ bXW bYu cib cib -bZt -cio -cis -caz -caT +cqv +cqA +cqH +cqO +cqV bPO cbB cbX @@ -93175,11 +93493,11 @@ bXX bNO bYO bZc -bZs -bZK -bZJ -clp -bPH +cqw +cqB +cqI +cqP +cqW cbj cbB cbY @@ -93433,10 +93751,10 @@ bUz bUz bUz bUz -bZL -caj -ciy -bPH +cqC +cqJ +cqQ +cqX cbk cbC cbZ @@ -93690,10 +94008,10 @@ bYv bYP bZe bUz -clq -clq -clq -bMj +cqD +cqK +cqR +cqY bPO cbB cca @@ -94137,7 +94455,7 @@ abC aOn ahr aRC -cnS +cnX aHt aVU aXt @@ -94359,7 +94677,7 @@ ace abP cgF acY -cly +clz acr acz acz @@ -95646,10 +95964,10 @@ acO acY aaU aaU -clA +clB aaV aaV -clK +clL aaV aaV aaV @@ -95657,7 +95975,7 @@ aaV aiY aaV ahr -cnR +cmS ahr aaV aoF @@ -95906,7 +96224,7 @@ adO aeu afb afw -clL +clM afb agO ahs @@ -96167,10 +96485,10 @@ afx afx agP afx -cmp +cmq afx afx -cmI +cmJ akE afx afx @@ -96218,8 +96536,8 @@ buR bvW bxr byy -bzF -bAH +coh +coi bxs bCD bDx @@ -96419,17 +96737,17 @@ ady adQ aew aaV -clD -clM -clS +clE +clN +clT aaV aaV aaV aja aja -cnM -cmS -cnM +cmK +cmT +cnc aja aja aja @@ -96676,20 +96994,20 @@ abD adR aex aaV -clE -clN -clT -cma -cmi -cmq +clF +clO +clU +cmb +cmj +cmr ajP -cmD -cmK -cmT -cnc -cnj -cnq -cny +cmE +cmL +cmU +cnd +cnk +cnr +cnz aja asx auk @@ -96923,7 +97241,7 @@ aad aaM aaV aaV -cnR +cly aaV aaV aaV @@ -96933,21 +97251,21 @@ aaV adS aey aaV -clF -clO -clU -cmb -cmr -cmr -cmx -cmE -cmL -cmU +clG +clP +clV +cmc +cmk +cms +cmy +cmF +cmM +cmV alD alD alD alD -cnI +cnJ asy aul avK @@ -97186,25 +97504,25 @@ aah acv abS abS -clz +clA adT aez aaV -clG +clH abC -clV -cmc -cms -cms -cmy -cmF -cmM -cmV -cnd -cnk -cnr -cnz -cnJ +clW +cmd +cml +cmt +cmz +cmG +cmN +cmW +cne +cnl +cns +cnA +cnK asz alz avL @@ -97447,20 +97765,20 @@ aaV adU aeA aaV -clH -clP -clW -cmd -cml -cmt -cmz -cmG +clI +clQ +clX +cme +cmm +cmu +cmA +cmH alD -cmW -cne -cnl -cns -cnA +cmX +cnf +cnm +cnt +cnB aja asA aum @@ -97707,17 +98025,17 @@ aaV aaV aaV aaV -cme +cmf aaV aaV aja aja -cmN -cmX -cnf -cnm -cnt -cnB +cmO +cmY +cng +cnn +cnu +cnC aja asB aun @@ -97962,20 +98280,20 @@ adW aeC aaV clJ -clQ -clX -cmf -cmm -cmu -cmA +clR +clY +cmg +cmn +cmv +cmB aja -cmO -cmY -cng -cnn -cnu -cnC -cnM +cmP +cmZ +cnh +cno +cnv +cnD +cnL asC auo avN @@ -98220,20 +98538,20 @@ aez aaV aaV aaV -clY -cmg -cmn -cmv -cmB -cmH -cmP -cmZ -cnv -cnv -cnv -cnD -cnL -cnP +clZ +cmh +cmo +cmw +cmC +cmI +cmQ +cna +cni +cnp +cnw +cnE +cnM +cnQ aun avM axB @@ -98473,23 +98791,23 @@ aah aah aaV adY -clB +clC aaV -clJ -clR -clZ -cmw -cmo -cmw -cmC +clK +clS +cma +cmi +cmp +cmx +cmD aja -cmQ -cna -cni -cnp -cnw -cnE -cnM +cmR +cnb +cnj +cnq +cnx +cnF +cnN asE aup avK @@ -98744,8 +99062,8 @@ ajb ajb aja aja -cnx -cnF +cny +cnG aja asF aun @@ -99003,7 +99321,7 @@ amF abC abR apY -cnN +cnO asC auo avO @@ -99516,8 +99834,8 @@ alI amH anD aoQ -cnG -cnO +cnH +cnP asH auq avK @@ -99758,7 +100076,7 @@ acl aaD aaV aaV -clC +clD afe afe afY @@ -99773,7 +100091,7 @@ afe cgK anE aoR -cnH +cnI aaV asI auk @@ -105970,7 +106288,7 @@ bdc aOM bfM bfJ -biJ +cod bjX blf bmI @@ -112117,7 +112435,7 @@ aab aab aab aAP -aCE +cnS aEs aGr aAP diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 59a99a81c7e..246e0dbbceb 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -2763,22 +2763,6 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) -"fg" = ( -/obj/effect/floor_decal/corner/green{ - icon_state = "corner_white"; - dir = 10 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/requests_console{ - department = "Forensic Technician"; - departmentType = 5; - pixel_x = 0; - pixel_y = -32 - }, -/turf/simulated/floor/tiled, -/area/security/training) "fh" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; @@ -3306,6 +3290,29 @@ }, /turf/simulated/floor/wood, /area/security/detectives_office) +"gg" = ( +/obj/machinery/door/airlock/security{ + id_tag = "detdoor"; + name = "Detective"; + req_access = list(68) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, +/area/security/detectives_office) "gh" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -3491,6 +3498,28 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) +"gx" = ( +/obj/machinery/door/airlock/security{ + name = "Forensic Technician"; + req_access = list(4) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "gy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4008,6 +4037,27 @@ }, /turf/simulated/floor/plating, /area/security/investigations) +"hj" = ( +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(4,68) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/security/investigations) "hk" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -4064,6 +4114,19 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/security/forensics_office) +"hn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/security/forensics_office) "ho" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_security{ @@ -4144,6 +4207,20 @@ }, /turf/simulated/floor/tiled/dark, /area/security/training) +"hv" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Theorethical Training"; + req_access = list(1) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/security/training) "hw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ icon_state = "map-scrubbers"; @@ -4275,18 +4352,6 @@ /obj/item/weapon/folder/sec, /turf/simulated/floor/tiled/dark, /area/security/training) -"hJ" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Forensic Technician"; - departmentType = 5; - pixel_x = 0; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/security/training) "hK" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -5817,15 +5882,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych) -"kH" = ( -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Isolation Room"; - dir = 4; - icon_state = "camera"; - network = list("Medical","Isolation Room") - }, -/turf/simulated/floor/reinforced, -/area/medical/psych) "kI" = ( /obj/item/device/radio/intercom{ broadcasting = 1; @@ -6699,99 +6755,34 @@ }, /area/mine/unexplored) "mk" = ( -/obj/machinery/door/airlock/security{ - id_tag = "detdoor"; - name = "Detective"; - req_access = list(68) +/obj/effect/floor_decal/corner/green{ + icon_state = "corner_white"; + dir = 10 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/requests_console{ + department = "Security Weights Room"; + departmentType = 5; + pixel_x = 0; + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/security/detectives_office) -"ml" = ( -/obj/machinery/door/airlock/security{ - name = "Forensic Technician"; - req_access = list(4) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"mm" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access = list(4,68) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/security/investigations) -"mn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/security/forensics_office) -"mo" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Theorethical Training"; - req_access = list(1) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/security/training) -"mp" = ( +"ml" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Theoretical Training Room"; + departmentType = 5; + pixel_x = 0; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/security/training) +"mm" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(63); req_one_access = null @@ -6810,7 +6801,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/security/training) -"mq" = ( +"mn" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, /obj/item/device/mass_spectrometer{ @@ -6823,6 +6814,15 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics_office) +"mo" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"mp" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"mq" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "mr" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7145,7 +7145,10 @@ /turf/simulated/mineral, /area/mine/unexplored) "ou" = ( -/turf/simulated/mineral, +/obj/effect/landmark{ + name = "cavernspawn" + }, +/turf/simulated/floor/asteroid/ash/rocky, /area/mine/unexplored) "ov" = ( /turf/simulated/mineral, @@ -7154,10 +7157,7 @@ /turf/simulated/mineral, /area/mine/unexplored) "ox" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, +/turf/simulated/mineral, /area/mine/unexplored) "oy" = ( /turf/simulated/mineral, @@ -7703,15 +7703,6 @@ /turf/simulated/mineral, /area/mine/unexplored) "rX" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"rZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sa" = ( /obj/effect/floor_decal/corner/green/full{ icon_state = "corner_white_full"; dir = 1 @@ -7727,9 +7718,21 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/machinery/camera/network/medbay, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Psychiatry Hallway"; + network = list("Medical") + }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"rY" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"rZ" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"sa" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "sb" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7758,15 +7761,6 @@ /turf/simulated/mineral, /area/mine/unexplored) "sk" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sl" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sm" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sn" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 9 @@ -7776,13 +7770,22 @@ }, /obj/machinery/firealarm/west, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - Isolation Room"; + c_tag = "Medical - Psychaitry Patient Room"; dir = 4; icon_state = "camera"; - network = list("Medical","Isolation Room") + network = list("Medical") }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"sl" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"sm" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"sn" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "so" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7811,8 +7814,15 @@ /turf/simulated/mineral, /area/mine/unexplored) "sx" = ( -/turf/simulated/mineral, -/area/mine/unexplored) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Psychaitry Closet"; + network = list("Medical") + }, +/turf/simulated/floor/tiled/dark, +/area/medical/psych) "sy" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7820,15 +7830,17 @@ /turf/simulated/mineral, /area/mine/unexplored) "sA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/camera/network/medbay, -/turf/simulated/floor/tiled/dark, -/area/medical/psych) -"sB" = ( /turf/simulated/mineral, /area/mine/unexplored) +"sB" = ( +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Psychaitry Isolation Room"; + dir = 4; + icon_state = "camera"; + network = list("Medical") + }, +/turf/simulated/floor/reinforced, +/area/medical/psych) "sC" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7851,34 +7863,37 @@ /turf/simulated/mineral, /area/mine/unexplored) "sJ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sK" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sL" = ( /obj/effect/landmark{ name = "cavernspawn" }, /turf/simulated/floor/asteroid/ash/rocky, /area/mine/unexplored) +"sK" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"sL" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "sM" = ( /turf/simulated/mineral, /area/mine/unexplored) "sN" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sO" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sP" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 5 }, -/obj/machinery/camera/network/medbay, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Psychiatry Waiting"; + network = list("Medical") + }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"sO" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"sP" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "sQ" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7904,24 +7919,24 @@ /turf/simulated/mineral, /area/mine/unexplored) "sY" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"sZ" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"ta" = ( /obj/effect/floor_decal/corner/green/full, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - Isolation Room"; + c_tag = "Medical - Psychaitry Isolation Room Entrance"; dir = 4; icon_state = "camera"; - network = list("Medical","Isolation Room") + network = list("Medical") }, /turf/simulated/floor/tiled/white, /area/medical/psych) +"sZ" = ( +/turf/simulated/mineral, +/area/mine/unexplored) +"ta" = ( +/turf/simulated/mineral, +/area/mine/unexplored) "tb" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -8112,16 +8127,16 @@ /turf/simulated/mineral, /area/mine/unexplored) "um" = ( -/turf/simulated/mineral, +/obj/effect/landmark{ + name = "cavernspawn" + }, +/turf/simulated/floor/asteroid/ash/rocky, /area/mine/unexplored) "un" = ( /turf/simulated/mineral, /area/mine/unexplored) "uo" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, +/turf/simulated/mineral, /area/mine/unexplored) "up" = ( /turf/simulated/mineral, @@ -8160,16 +8175,16 @@ /turf/simulated/mineral, /area/mine/unexplored) "uB" = ( -/turf/simulated/mineral, +/obj/effect/landmark{ + name = "cavernspawn" + }, +/turf/simulated/floor/asteroid/ash/rocky, /area/mine/unexplored) "uC" = ( /turf/simulated/mineral, /area/mine/unexplored) "uD" = ( -/obj/effect/landmark{ - name = "cavernspawn" - }, -/turf/simulated/floor/asteroid/ash/rocky, +/turf/simulated/mineral, /area/mine/unexplored) "uE" = ( /turf/simulated/mineral, @@ -8237,12 +8252,6 @@ "uZ" = ( /turf/simulated/mineral, /area/mine/unexplored) -"va" = ( -/turf/simulated/mineral, -/area/mine/unexplored) -"vb" = ( -/turf/simulated/mineral, -/area/mine/unexplored) (1,1,1) = {" aa @@ -40971,7 +40980,7 @@ db ex jB eV -fg +mk dc fB fX @@ -41493,7 +41502,7 @@ gr gG gZ ht -hJ +ml dc aa aa @@ -42006,7 +42015,7 @@ ga ga dL dc -mo +hv hL dc aa @@ -43036,7 +43045,7 @@ dc dc dc dc -mp +mm dc dc dc @@ -43831,7 +43840,7 @@ ab ab jG jL -sn +sk kb kl kw @@ -44315,10 +44324,10 @@ eO eZ et fK -mk +gg gu gu -mm +hj gu jE gu @@ -45087,7 +45096,7 @@ ab fw fN gj -ml +gx fw fw fw @@ -45603,7 +45612,7 @@ fP gl gz gS -mn +hn hB hU hB @@ -46146,7 +46155,7 @@ jH jM jV jG -sA +sx kB jG kS @@ -46634,7 +46643,7 @@ gW fw hF hX -mq +mn fy ab ab @@ -47177,7 +47186,7 @@ jG kr jG jG -sP +sN lf lq kc @@ -47685,7 +47694,7 @@ aa ab ab jG -sa +rX jX ki kt @@ -48203,12 +48212,12 @@ jK jZ kj ku -kH +sB ku kj li lu -ta +sY lQ jG lW @@ -52069,10 +52078,10 @@ aa aa aa aa -ur -uz -uH -uP +up +ux +uF +uN aa aa aa @@ -52323,13 +52332,13 @@ aa aa aa aa -tJ -tU -ue -us -uA -uI -uQ +tH +tS +uc +uq +uy +uG +uO aa aa aa @@ -52578,16 +52587,16 @@ aa aa aa aa -tj -tw -tK -tV -uf -ut -uB -uJ -uR -uU +th +tu +tI +tT +ud +ur +uz +uH +uP +uS bc bc bc @@ -52834,15 +52843,15 @@ aa aa aa aa -tb -tk -tx -tL -tW -ug -uu -uC -uK +sZ +ti +tv +tJ +tU +ue +us +uA +uI ab ab bc @@ -53091,9 +53100,9 @@ aa aa aa aa -tc -tl -ty +ta +tj +tw ab ab ab @@ -53348,9 +53357,9 @@ aa aa aa aa -td -tm -tz +tb +tk +tx ab ab ab @@ -53605,9 +53614,9 @@ aa aa aa aa -te -tn -tA +tc +tl +ty ab ab ab @@ -53863,9 +53872,9 @@ aa aa aa aa -to -tB -tM +tm +tz +tK ab ab ab @@ -54120,10 +54129,10 @@ aa aa aa aa -tp -tC -tN -tX +tn +tA +tL +tV ab ab ab @@ -54378,12 +54387,12 @@ aa aa aa aa -tD -tO -tY -uh +tB +tM +tW +uf ab -uD +uB ab ab ab @@ -54638,7 +54647,7 @@ aa aa aa aa -ui +ug ab ab ab @@ -54890,12 +54899,12 @@ io io io io -tf -tq -tE -tP -tZ -uj +td +to +tC +tN +tX +uh ab ab ab @@ -55379,10 +55388,10 @@ aa aa aa aa -nR -ol -ov -oD +nO +oi +os +oA aa io io @@ -55405,17 +55414,17 @@ iL iO io io -tr -tF -tQ -ua -uk +tp +tD +tO +tY +ui ab ab ab ab ab -va +uY bc bc jm @@ -55635,11 +55644,11 @@ aa aa aa aa -nr -nS -om -ow -oE +no +nP +oj +ot +oB io io io @@ -55666,13 +55675,13 @@ io aa aa aa -ul +uj ab ab ab ab -uV -vb +uT +uZ aa bc jn @@ -55892,9 +55901,9 @@ aa aa aa aa -ns -nT -on +np +nQ +ok ab io io @@ -55923,12 +55932,12 @@ io aa aa aa -um +uk ab ab ab ab -uW +uU aa aa bc @@ -56148,10 +56157,10 @@ aa aa aa aa -mT -nt -nU -oo +mQ +nq +nR +ol ab io io @@ -56179,13 +56188,13 @@ io io aa aa -ub -un +tZ +ul ab ab ab ab -uX +uV aa aa bc @@ -56405,10 +56414,10 @@ aa aa aa aa -mU -nu -nV -op +mR +nr +nS +om ab io io @@ -56436,13 +56445,13 @@ io io aa aa -uc +ua ab ab ab ab -uS -uY +uQ +uW aa aa bc @@ -56661,11 +56670,11 @@ aa aa aa aa -mC -mV -nv -nW -oq +mz +mS +ns +nT +on ab ab io @@ -56692,14 +56701,14 @@ io io io aa -tR -ud +tP +ub ab ab ab -uL -uT -uZ +uJ +uR +uX aa aa bc @@ -56918,14 +56927,14 @@ aa aa aa aa -mD -mW -nw -nX -or +mA +mT +nt +nU +oo ab ab -oO +oL io io io @@ -56949,12 +56958,12 @@ io io aa aa -tS +tQ ab ab ab ab -uM +uK aa aa aa @@ -57176,9 +57185,9 @@ aa aa aa aa -mX -nx -nY +mU +nu +nV ab ab ab @@ -57186,7 +57195,7 @@ ab ab ab ab -qd +qa aa aa aa @@ -57205,13 +57214,13 @@ io io io aa -tG -tT +tE +tR ab ab ab ab -uN +uL aa aa aa @@ -57434,16 +57443,16 @@ aa aa aa aa -ny -nZ +nv +nW ab ab ab ab ab ab -pL -qe +pI +qb aa aa aa @@ -57462,13 +57471,13 @@ io io aa aa -tH +tF ab ab -uo +um ab -uE -uO +uC +uM aa aa aa @@ -57692,14 +57701,14 @@ aa aa aa aa -oa +nX ab -ox +ou ab ab -pe -pv -pM +pb +ps +pJ aa aa aa @@ -57718,13 +57727,13 @@ aa aa aa aa -ts -tI +tq +tG ab ab ab ab -uF +uD aa aa aa @@ -57949,12 +57958,12 @@ aa aa aa aa -ob +nY ab ab ab ab -pf +pc aa aa aa @@ -57975,13 +57984,13 @@ aa aa aa aa -tt +tr ab ab ab ab -uv -uG +ut +uE aa aa aa @@ -58205,13 +58214,13 @@ aa aa aa aa -nz -oc +nw +nZ ab ab ab -oP -pg +oM +pd aa aa aa @@ -58231,13 +58240,13 @@ aa aa aa aa -tg -tu +te +ts ab ab ab ab -uw +uu aa aa aa @@ -58462,19 +58471,19 @@ aa aa aa aa -nA -od +nx +oa ab ab ab -oQ +oN aa aa aa aa -qw -qO -re +qt +qL +rb aa aa aa @@ -58487,14 +58496,14 @@ aa aa aa aa -sW -th +sU +tf ab ab ab ab -up -ux +un +uv aa aa aa @@ -58718,20 +58727,20 @@ aa aa aa aa -mY -nB -oe +mV +ny +ob ab ab ab -oR -ph -pw -pN -qf -qx -qP -rf +oO +pe +pt +pK +qc +qu +qM +rc aa aa aa @@ -58744,14 +58753,14 @@ aa aa aa aa -sX +sV ab ab ab ab ab -uq -uy +uo +uw aa aa aa @@ -58974,23 +58983,23 @@ aa aa aa aa -mE -mZ -nC -of +mB +mW +nz +oc ab ab ab ab ab -px -pO -qg -qy -qQ -rg -rr -rx +pu +pL +qd +qv +qN +rd +ro +ru aa aa aa @@ -59000,8 +59009,8 @@ aa aa aa aa -sS -sY +sQ +sW ab ab ab @@ -59230,11 +59239,11 @@ aa aa aa aa -mr -mF -na -nD -og +mo +mC +mX +nA +od ab ab ab @@ -59242,22 +59251,22 @@ ab ab ab ab -qh -qz -qR -rh -rs -ry -rE +qe +qw +qO +re +rp +rv +rB aa aa -so -sw -sB -sE -sJ -sQ -sT +sl +st +sy +sC +sH +sO +sR ab ab ab @@ -59487,32 +59496,32 @@ aa aa aa aa -ms -mG -nb -nE -oh -os +mp +mD +mY +nB +oe +op mf mf mf mf mf -pP -qi -qA -qS -ri -rt -rz -rF -rM -sb -sp +pM +qf +qx +qP +rf +rq +rw +rC +rJ +rY +sm ab ab -sF -sK +sD +sI ab ab ab @@ -59744,10 +59753,10 @@ aa aa aa aa -mt -mH -nc -nF +mq +mE +mZ +nC aB aB aB @@ -60001,10 +60010,10 @@ aa aa aa aa -mu -mI -nd -nG +mr +mF +na +nD aB aB aB @@ -60026,7 +60035,7 @@ ab ab ab ab -sL +sJ ab ab ab @@ -60260,8 +60269,8 @@ aa aa aa aa -ne -nH +nb +nE aB aB aB @@ -60271,7 +60280,7 @@ aB aB aB aB -qB +qy aB aB aB @@ -60517,35 +60526,35 @@ aa aa aa aa -nf -nI +nc +nF aB aB aB aB -oS -pi -py -pQ -qj -qC -qT -rj +oP +pf +pv +pN +qg +qz +qQ +rg aB aB aB -rN -sc +rK +rZ ab ab ab ab ab ab -sU -sZ -ti -tv +sS +sX +tg +tt bc bc bc @@ -60774,32 +60783,32 @@ aa aa aa aa -ng -nJ +nd +nG aB aB aB aB -oT -pj -pz -pR -qk -qD -qU -rk +oQ +pg +pw +pO +qh +qA +qR +rh aB aB aB -rO -sd +rL +sa ab ab ab ab -sM -sR -sV +sK +sP +sT aa aa aa @@ -61030,31 +61039,31 @@ aa aa aa aa -mJ -nh +mG +ne aB aB aB aB -oF -oU -pk -pA -pS -ql -qE -qV -rl +oC +oR +ph +px +pP +qi +qB +qS +ri aB aB aB -rP -se -sq +rM +sb +sn ab ab -sG -sN +sE +sL aa aa aa @@ -61287,31 +61296,31 @@ aa aa aa aa -mK -ni +mH +nf aB aB aB -oy -oG -oV -pl -pB -pT -qm -qF -qW -rm +ov +oD +oS +pi +py +pQ +qj +qC +qT +rj aB aB aB -rQ -sf -sr -sx -sC -sH -sO +rN +sc +so +su +sz +sF +sM aa aa aa @@ -61543,31 +61552,31 @@ aa aa aa aa -mv -mL -nj +ms +mI +ng aB aB aB -oz -oH -oW -pm -pC -pU -qn -qG -qX -rn +ow +oE +oT +pj +pz +pR +qk +qD +qU +rk aB aB aB -rR -sg -ss -sy -sD -sI +rO +sd +sp +sv +sA +sG aa aa aa @@ -61800,29 +61809,29 @@ aa aa aa aa -mw -mM -nk +mt +mJ +nh aB aB aB -oA -oI -oX -pn -pD -pV -qo -qH -qY -ro +ox +oF +oU +pk +pA +pS +ql +qE +qV +rl aB aB aB -rS -sh -st -sz +rP +se +sq +sw aa aa aa @@ -62057,28 +62066,28 @@ aa aa aa aa -mx -mN -nl -nK +mu +mK +ni +nH aB aB aB -oJ -oY -po -pE -pW -qp -qI -qZ +oG +oV +pl +pB +pT +qm +qF +qW aB aB aB aB -rT -si -su +rQ +sf +sr aa aa aa @@ -62314,28 +62323,28 @@ aa aa aa aa -my -mO -nm -nL +mv +mL +nj +nI aB aB aB -oK -oZ -pp -pF -pX -qq -qJ -ra +oH +oW +pm +pC +pU +qn +qG +qX aB aB aB -rG -rU -sj -sv +rD +rR +sg +ss aa aa aa @@ -62571,27 +62580,27 @@ aa aa aa aa -mz -mP -nn -nM +mw +mM +nk +nJ aB aB aB aB -pa -pq -pG -pY -qr -qK +oX +pn +pD +pV +qo +qH aB aB aB aB -rH -rV -sk +rE +rS +sh aa aa aa @@ -62828,10 +62837,10 @@ aa aa aa aa -mA -mQ -no -nN +mx +mN +nl +nK aB aB aB @@ -62846,9 +62855,9 @@ aB aB aB aB -rI -rW -sl +rF +rT +si aa aa aa @@ -63085,11 +63094,11 @@ aa aa aa aa -mB -mR -np -nO -oi +my +mO +nm +nL +of aB aB aB @@ -63102,10 +63111,10 @@ aB aB aB aB -rA -rJ -rX -sm +rx +rG +rU +sj aa aa aa @@ -63343,11 +63352,11 @@ aa aa aa aa -mS -nq -nP -oj -ot +mP +nn +nM +og +oq aB aB aB @@ -63358,10 +63367,10 @@ aB aB aB aB -ru -rB -rK -rY +rr +ry +rH +rV aa aa aa @@ -63602,23 +63611,23 @@ aa aa aa aa -nQ -ok -ou -oB -oL -pb -pr -pH -pZ -qs -qL -rb -rp -rv -rC -rL -rZ +nN +oh +or +oy +oI +oY +po +pE +pW +qp +qI +qY +rm +rs +rz +rI +rW aa aa aa @@ -63862,18 +63871,18 @@ aa aa aa aa -oC -oM -pc -ps -pI -qa -qt -qM -rc -rq -rw -rD +oz +oJ +oZ +pp +pF +pX +qq +qJ +qZ +rn +rt +rA aa aa aa @@ -64120,14 +64129,14 @@ aa aa aa aa -oN -pd -pt -pJ -qb -qu -qN -rd +oK +pa +pq +pG +pY +qr +qK +ra aa aa aa @@ -64379,10 +64388,10 @@ aa aa aa aa -pu -pK -qc -qv +pr +pH +pZ +qs aa aa aa