diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index 482f024290..951f58fc8b 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -394,4 +394,22 @@ ) cost = 10 containertype = /obj/structure/closet/crate - containername = "Knights Gear Crate" \ No newline at end of file + containername = "Knights Gear Crate" + +/datum/supply_pack/costumes/christmas + name = "Christmas costume pack" + contains = list( + /obj/item/clothing/head/santa, + /obj/item/clothing/head/santa/green, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasred, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen, + /obj/item/clothing/under/christmas/red, + /obj/item/clothing/under/christmas/green, + /obj/item/clothing/under/christmas/croptop/red, + /obj/item/clothing/under/christmas/croptop/green, + /obj/item/clothing/shoes/boots/winter/christmasred, + /obj/item/clothing/shoes/boots/winter/christmasgreen + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Christmas costume pack" \ No newline at end of file diff --git a/code/game/area/CC_areas_vr.dm b/code/game/area/CC_areas_vr.dm index 170fd71cc6..b4853bd081 100644 --- a/code/game/area/CC_areas_vr.dm +++ b/code/game/area/CC_areas_vr.dm @@ -9,3 +9,28 @@ icon_state = "centcom_dock" ambience = AMBIENCE_ARRIVALS base_turf = /turf/simulated/floor/reinforced + +//////// Abductor Areas //////// +/area/unknown + requires_power = 0 + flags = RAD_SHIELDED + icon_state = "red2" + limit_mob_size = FALSE + +/area/unknown/dorm1 + name = "Unknown Dorm 1" + +/area/unknown/dorm2 + name = "Unknown Dorm 2" + +/area/unknown/dorm3 + name = "Unknown Dorm 3" + +/area/unknown/dorm4 + name = "Unknown Dorm 4" + +/area/unknown/dorm5 + name = "Unknown Dorm 5" + +/area/unknown/dorm6 + name = "Unknown Dorm 6" diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ed28b847fa..cb2a3fcb4b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -632,7 +632,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Station Engineer") + var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Engineer") var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 64b753daab..a055ce9590 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,7 +2,8 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, "Captain" = /datum/alt_title/captain) + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, + "Captain" = /datum/alt_title/captain) /datum/alt_title/facility_director title = "Facility Director" @@ -13,7 +14,6 @@ /datum/alt_title/captain title = "Captain" - /datum/job/hop disallow_jobhop = TRUE pto_type = PTO_CIVILIAN diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 95bfd63f7f..780f99a76f 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -42,7 +42,7 @@ // Engineer ////////////////////////////////// /datum/job/engineer - title = "Station Engineer" + title = "Engineer" flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 56711c46f8..4e08cb7581 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -17,7 +17,7 @@ /obj/effect/landmark/start/atmostech name = "Atmospheric Technician" /obj/effect/landmark/start/engineer - name = "Station Engineer" + name = "Engineer" /obj/effect/landmark/start/cmo name = "Chief Medical Officer" /obj/effect/landmark/start/chemist diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index 0a9015145a..a3cd6ad35c 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -233,7 +233,7 @@ "Field Medic" = "itg_white", "Talon Doctor" = "itg_white", "Atmospheric Technician" = "itg_orange", - "Station Engineer" = "itg_orange", + "Engineer" = "itg_orange", "Off-duty Officer" = "itg_red", "Off-duty Engineer" = "itg_orange", "Off-duty Medic" = "itg_white", diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index fe91be162b..267585a044 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -21,9 +21,9 @@ var/stripe_color //rad_resistance_modifier = 0.5 - // blend_objects defined on subtypes + // blend_objects defined on subtypes noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) - + var/default_material = DEFAULT_WALL_MATERIAL var/datum/material/material var/grille_type @@ -38,9 +38,9 @@ if(!materialtype) materialtype = default_material - + material = get_material_by_name(materialtype) - + health = material.integrity return INITIALIZE_HINT_LATELOAD @@ -79,12 +79,12 @@ if(istype(W, /obj/item/stack/rods)) handle_rod_use(user, W) return - + // Making windows, different per subtype else if(istype(W, /obj/item/stack/material/glass)) handle_glass_use(user, W) return - + // Dismantling the half wall if(W.is_wrench()) for(var/obj/structure/S in loc) @@ -110,7 +110,7 @@ if(can_place_items() && user.unEquip(W, 0, src.loc) && user.is_preference_enabled(/datum/client_preference/precision_placement)) auto_align(W, click_parameters) return 1 - + return ..() /obj/structure/low_wall/proc/can_place_items() @@ -187,7 +187,7 @@ to_chat(user, "Assembling window...") if(!do_after(user, 4 SECONDS, G, exclusive = TASK_ALL_EXCLUSIVE)) return - if(!G.use(2)) + if(!G.use(4)) return new window_type(loc, null, TRUE) return @@ -415,7 +415,7 @@ other_connections = list("0","0","0","0") else update_connections() - + var/percent_damage = 0 // Used for icon state of damage layer var/damage_alpha = 0 // Used for alpha blending of damage layer if (maxhealth && health < maxhealth) @@ -506,7 +506,7 @@ other_connections = list("0","0","0","0") else update_connections() - + var/img_dir var/image/I for(var/i = 1 to 4) @@ -573,14 +573,14 @@ if(locate(/obj/effect/low_wall_spawner) in oview(0, src)) warning("Duplicate low wall spawners in [x],[y],[z]!") return INITIALIZE_HINT_QDEL - + if(low_wall_type) new low_wall_type(loc) if(grille_type) new grille_type(loc) if(window_type) new window_type(loc) - + return INITIALIZE_HINT_QDEL // Bay types diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 49d9e464b9..c7180d0a49 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -77,7 +77,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "Engineering") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") @@ -96,7 +96,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "CE_Station_Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") return 1 if(rank == "CE_Atmospheric_Tech") diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index eecae83186..7d0508a0fd 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -169,8 +169,8 @@ corpsegloves = /obj/item/clothing/gloves/yellow corpsehelmet = /obj/item/clothing/head/hardhat corpseid = 1 - corpseidjob = "Station Engineer" - corpseidaccess = "Station Engineer" + corpseidjob = "Engineer" + corpseidaccess = "Engineer" /obj/effect/landmark/corpse/engineer/rig corpsesuit = /obj/item/clothing/suit/space/void/engineering diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index be1f7619a3..a4a28eceab 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -138,32 +138,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/fannypack display_name = "fannypack selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 25bc717fed..9368f5631c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -58,11 +58,11 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_vest display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/white_vest display_name = "webbing, white (Medical)" @@ -70,11 +70,11 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" @@ -83,7 +83,7 @@ /datum/gear/accessory/bluespace display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)" path = /obj/item/clothing/accessory/storage/bluespace - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") cost = 2 /datum/gear/accessory/webbing diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 09e0fcdc47..5170b2c4c1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -104,7 +104,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Engineering, Science, Mining)" path = /obj/item/clothing/glasses/meson - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") /datum/gear/eyes/meson/prescription display_name = "Optical Meson Scanners, prescription (Engineering, Science, Mining)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 9504678e06..6ec19f2fd8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -3,7 +3,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Eng, Sci, Explo)" - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -33,7 +33,7 @@ /datum/gear/eyes/arglasses/eng display_name = "AR-E glasses (Eng)" path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician") /datum/gear/eyes/arglasses/med display_name = "AR-M glasses (Medical)" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index cfca34e719..27c4732b37 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -16,7 +16,7 @@ display_name = "Airhorn - Example Item" description = "An example item that you probably shouldn't see!" ckeywhitelist = list("mewchild") - allowed_roles = list("Station Engineer") + allowed_roles = list("Engineer") */ @@ -903,14 +903,14 @@ display_name = "Kateryna's Voidsuit" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/katerina_spacesuit path = /obj/item/clothing/head/helmet/space/fluff/kate display_name = "Kateryna's Helmet" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/kateryna_armorvest path = /obj/item/clothing/suit/armor/vest/wolftaur/kate diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 39e5c3ee5c..40e7265e04 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -349,7 +349,7 @@ display_name = "welding, normal (engineering/robotics)" path = /obj/item/clothing/head/welding cost = 2 - allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist") + allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist") /datum/gear/head/welding/demon display_name = "welding, demon (engineering/robotics)" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index f3f191d27c..29258ce7ff 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -424,7 +424,7 @@ /datum/gear/suit/wintercoat/engineering display_name = "winter coat, engineering" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/wintercoat/engineering/atmos display_name = "winter coat, atmospherics" @@ -598,8 +598,8 @@ /datum/gear/suit/snowsuit/engineering display_name = "snowsuit, engineering" - path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + path = /obj/item/clothing/suit/storage/snowsuit/engineering + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/snowsuit/cargo display_name = "snowsuit, supply" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8672ea50cc..62dbdcf60a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -119,7 +119,7 @@ /datum/gear/uniform/job_skirt/eng display_name = "skirt, engineer" path = /obj/item/clothing/under/rank/engineer/skirt - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/job_skirt/roboticist display_name = "skirt, roboticist" @@ -189,7 +189,7 @@ /datum/gear/uniform/job_turtle/engineering display_name = "turtleneck, engineering" path = /obj/item/clothing/under/rank/engineer/turtleneck - allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer") /datum/gear/uniform/job_turtle/medical display_name = "turtleneck, medical" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 1dfee22f63..dbdae89ab9 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -37,7 +37,7 @@ /datum/gear/uniform/job_khi/eng display_name = "khi uniform, eng" path = /obj/item/clothing/under/rank/khi/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/uniform/job_khi/sci display_name = "khi uniform, sci" @@ -67,7 +67,7 @@ /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") // Trekie things //TOS @@ -84,7 +84,7 @@ /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS //TNG /datum/gear/uniform/job_trek/cmd/tng @@ -100,7 +100,7 @@ /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/next - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS //VOY /datum/gear/uniform/job_trek/cmd/voy @@ -116,7 +116,7 @@ /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/voy - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS //DS9 @@ -126,7 +126,7 @@ allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", - "Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS + "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS /datum/gear/uniform/job_trek/cmd/ds9 @@ -142,7 +142,7 @@ /datum/gear/uniform/job_trek/eng/ds9 display_name = "DS9 uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ds9 - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS //ENT @@ -159,7 +159,7 @@ /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ent - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS /* Swimsuits */ diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index e405ce974e..decb540e94 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -49,7 +49,7 @@ /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index fb5825b743..4194ab5370 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -224,7 +224,7 @@ /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" @@ -397,7 +397,7 @@ /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/suit/dept/cloak/engineer/New() ..() diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index a6bef8b838..8f7f752ee0 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -164,6 +164,16 @@ desc = "A starry winter hood." icon_state = "winterhood_cosmic" +/obj/item/clothing/head/hood/winter/christmasred + name = "red christmas winter hood" + desc = "A red festive winter hood." + icon_state = "winterhood_christmasr" + +/obj/item/clothing/head/hood/winter/christmasgreen + name = "green christmas winter hood" + desc = "A green festive winter hood." + icon_state = "winterhood_christmasg" + // Explorer gear /obj/item/clothing/head/hood/explorer name = "explorer hood" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index acdc9f84dd..4ee4395109 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -174,6 +174,16 @@ icon_state = "explorer" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) +/obj/item/clothing/shoes/boots/winter/christmasred + name = "red christmas boots" + desc = "A pair of fluffy red christmas boots!" + icon_state = "winterboots_christmasr" + +/obj/item/clothing/shoes/boots/winter/christmasgreen + name = "green christmas boots" + desc = "A pair of fluffy green christmas boots!" + icon_state = "winterboots_christmasg" + // Allows the wearer to climb cliffs, which could allow for shortcuts or sequence-breaking. /obj/item/clothing/shoes/boots/winter/climbing name = "climbing winter boots" diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index cd5fb97d1f..f1eb67dc03 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -345,6 +345,18 @@ light_range = 1.2 light_on = TRUE +/obj/item/clothing/suit/storage/hooded/wintercoat/christmasred + name = "red christmas winter coat" + desc = "A festive red Christmas coat! Smells like Candy Cane!" + icon_state = "coatchristmasr" + hoodtype = /obj/item/clothing/head/hood/winter/christmasred + +/obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen + name = "green christmas winter coat" + desc = "A festive green Christmas coat! Smells like Candy Cane!" + icon_state = "coatchristmasg" + hoodtype = /obj/item/clothing/head/hood/winter/christmasgreen + // winter coats end here /obj/item/clothing/suit/storage/hooded/explorer diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e358ed2574..16f39f167d 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1420,4 +1420,25 @@ icon_state = "hedberg_tech" worn_state = "hedberg_tech" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) // Equivalent to engineer's jumpsuit. - rolled_sleeves = 0 \ No newline at end of file + rolled_sleeves = 0 + +//christmas stuff +/obj/item/clothing/under/christmas/red + name = "red christmas suit" + desc = "A simple red christmas suit that looks close to Santa's!" + icon_state = "christmasred" + +/obj/item/clothing/under/christmas/green + name = "green christmas suit" + desc = "A simple green christmas suit. Smells minty!" + icon_state = "christmasgreen" + +/obj/item/clothing/under/christmas/croptop/red + name = "red crop-top christmas suit" + desc = "A simple red christmas suit that doesn't quite looks like Mrs Claus'." + icon_state = "christmascroppedred" + +/obj/item/clothing/under/christmas/croptop/green + name = "green crop-top christmas suit" + desc = "A simple green christmas suit that doesn't quite looks like Mrs Claus'. Smells minty!" + icon_state = "christmascroppedgreen" \ No newline at end of file diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index f03580dde0..49b1cc4bf2 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -7,7 +7,7 @@ var/list/dreams = list( "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the Head of Personnel","the Head of Security","the Chief Engineer","the Research Director","the Chief Medical Officer", - "the Detective","the Warden","an Internal Affairs Agent","a Station Engineer","the Janitor","the Atmospheric Technician", + "the Detective","the Warden","an Internal Affairs Agent","an Engineer","the Janitor","the Atmospheric Technician", "the Quartermaster","a Cargo Technician","the Botanist","a Shaft Miner","the Psychologist","the Chemist","a Geneticist", "the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index 60f86a4fa2..6a85c301fe 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -206,9 +206,6 @@ if(L.grabbed_by.len) // Same as pulledby, whoever's holding you will keep you from going down stairs. return - if(L.has_buckled_mobs()) - return - if(L.buckled) L.buckled.forceMove(get_turf(top)) @@ -460,9 +457,6 @@ if(L.grabbed_by.len) // Same as pulledby, whoever's holding you will keep you from going down stairs. return - if(L.has_buckled_mobs()) - return - if(L.buckled) L.buckled.forceMove(get_turf(bottom)) diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 9c3a5b8621..1f490e8aa2 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -18,7 +18,7 @@ /mob/living/carbon/human/singularity_act() var/gain = 20 if(mind) - if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index 94c360ec2f..5da36d908a 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index 702111404f..f89178cc90 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 3d4ec81121..d91aa7369f 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 045b311269..01b97296d5 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index beb1f9c3a7..8d399661f4 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index a313002203..871e254583 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 9f46849608..14761a73e0 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index a6bb42e1d7..d0670504d0 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/maps/gateway_vr/eggnogtownunderground.dmm b/maps/gateway_vr/eggnogtownunderground.dmm index 823c61dda0..e22ca270f6 100644 --- a/maps/gateway_vr/eggnogtownunderground.dmm +++ b/maps/gateway_vr/eggnogtownunderground.dmm @@ -1,52 +1,164 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) "ab" = ( /turf/simulated/mineral/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ac" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) "ad" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) -"ae" = ( /obj/machinery/light/small, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"af" = ( -/obj/machinery/light/small{ - dir = 8 - }, +"ae" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) -"ag" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 - }, +"af" = ( /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ag" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) "ah" = ( -/obj/machinery/camera/network/civilian{ - dir = 5 - }, +/obj/random/mob/semirandom_mob_spawner/vore/retaliate, /turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 }, /area/gateway/eggnogtown/underground) "ai" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"aj" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ak" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/hotsprings) +"al" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/hotsprings) +"am" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) +"an" = ( +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ao" = ( +/obj/random/mob/semirandom_mob_spawner/vore/hostile, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ap" = ( +/obj/random/awayloot, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"aq" = ( +/obj/machinery/camera/network/civilian{ + dir = 5 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ar" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"as" = ( +/turf/simulated/mineral/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/vibeout) "ba" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/chemical_dispenser/bar_alc/full, @@ -166,12 +278,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"hz" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) "hM" = ( /obj/structure/curtain, /turf/simulated/floor/wood{ @@ -199,12 +305,6 @@ temperature = 303.15 }, /area/gateway/eggnogtown/hotsprings) -"jz" = ( -/obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "kA" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/underground) @@ -231,14 +331,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"kV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/hotsprings) "lo" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/wood{ @@ -276,12 +368,6 @@ /obj/structure/simple_door/silver, /turf/simulated/floor/tiled/steel_ridged, /area/gateway/eggnogtown/hotspring) -"mF" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "nh" = ( /obj/structure/bed/chair/sofa/black/corner, /turf/simulated/floor/plating/eris/under{ @@ -294,12 +380,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"ob" = ( -/obj/random/mob/semirandom_mob_spawner/vore/hostile, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "pn" = ( /obj/structure/bed/chair/bay/comfy/red{ dir = 1 @@ -423,14 +503,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/houserhomestead/basement) -"vs" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/hotsprings) "vv" = ( /obj/machinery/media/jukebox, /turf/simulated/floor/wood{ @@ -459,12 +531,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"vZ" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "ws" = ( /obj/structure/railing, /obj/structure/railing{ @@ -499,11 +565,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"yD" = ( -/turf/simulated/mineral/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/vibeout) "yM" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood{ @@ -532,11 +593,6 @@ "Ce" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/vibeout) -"Da" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "Ds" = ( /obj/structure/closet/walllocker{ pixel_y = 26 @@ -572,18 +628,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"Gy" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) -"GM" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) "GR" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/houserhomestead/basement) @@ -699,12 +743,6 @@ temperature = 303.15 }, /area/gateway/eggnogtown/hotsprings) -"Qe" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "QL" = ( /obj/effect/map_effect/interval/effect_emitter/steam, /turf/simulated/floor/beach/water{ @@ -1065,9 +1103,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -1207,16 +1245,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da -kV -Da +af +af +ak +af ab ab ab @@ -1232,7 +1270,7 @@ ab ab ab ab -Da +af ab ab kA @@ -1348,18 +1386,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -1371,13 +1409,13 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -kV +af +af +af +af +af +af +ak ab ab ab @@ -1488,21 +1526,21 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA -Da -Da +af +af ab ab gA @@ -1512,14 +1550,14 @@ gA ab ab ab -Da -Da +af +af gA gA gA gA gA -Da +af ab ab ab @@ -1629,23 +1667,23 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA gA gA -Da -Da +af +af ab gA gA @@ -1653,8 +1691,8 @@ sc gA gA ab -Da -Da +af +af gA gA gA @@ -1663,8 +1701,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -1771,23 +1809,23 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA gA gA gA -Da +af ab gA gA @@ -1795,8 +1833,8 @@ QL gA gA gA -Da -Da +af +af gA gA gA @@ -1806,8 +1844,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -1913,15 +1951,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -Da +af gA gA gA @@ -1929,16 +1967,16 @@ gA gA gA gA -Da -Da +af +af gA gA gA gA gA gA -Da -Da +af +af gA gA gA @@ -1948,8 +1986,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -2054,16 +2092,16 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -Da +af gA gA gA @@ -2072,15 +2110,15 @@ gA gA gA gA -Da +af ab -Da +af gA gA gA -Da -Da -Da +af +af +af gA gA gA @@ -2091,7 +2129,7 @@ gA gA gA gA -Da +af ab ab ab @@ -2196,8 +2234,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2205,7 +2243,7 @@ ab ab ab ab -Da +af gA gA gA @@ -2214,15 +2252,15 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af +af +af gA gA gA @@ -2233,7 +2271,7 @@ gA gA gA gA -Da +af ab ab ab @@ -2338,7 +2376,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -2355,8 +2393,8 @@ gA gA gA gA -Da -Da +af +af cb cb cb @@ -2364,8 +2402,8 @@ cb cb cb cb -Da -Da +af +af gA gA gA @@ -2374,8 +2412,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -2479,8 +2517,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2490,15 +2528,15 @@ ab ab ab ab -Da +af gA gA gA gA gA -Da -Da -Da +af +af +af cb cb cb @@ -2506,9 +2544,9 @@ cb cb cb cb -Da -Da -Da +af +af +af gA gA gA @@ -2516,7 +2554,7 @@ gA gA gA gA -Da +af ab ab ab @@ -2621,8 +2659,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2632,14 +2670,14 @@ ab ab ab ab -Da +af gA gA gA gA -Da -Da -Da +af +af +af Kk iV cb @@ -2651,14 +2689,14 @@ de Kk ab ab -Da -Da +af +af gA gA gA gA -Da -Da +af +af ab ab ab @@ -2763,8 +2801,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2774,13 +2812,13 @@ ab ab ab ab -Da -Da -Da +af +af +af gA -Da -Da -Da +af +af +af ab Kk Ds @@ -2794,12 +2832,12 @@ Kk ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -2905,8 +2943,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2918,9 +2956,9 @@ ab ab ab ab -Da -vs -Da +af +al +af ab ab ab @@ -2937,9 +2975,9 @@ ab ab ab ab -Da -vs -Da +af +al +af ab ab ab @@ -3046,8 +3084,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3188,8 +3226,8 @@ ab ab ab ab -GM -ad +ag +aa ab ab ab @@ -3330,8 +3368,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3345,8 +3383,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3472,8 +3510,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3485,9 +3523,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3614,8 +3652,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3625,9 +3663,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3756,8 +3794,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3766,10 +3804,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -3778,9 +3816,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3898,19 +3936,19 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -3920,13 +3958,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -4040,18 +4078,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4064,12 +4102,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4184,14 +4222,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -4208,10 +4246,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4326,34 +4364,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -GM -ad -ad -ad +aa +aa +aa +aa +ag +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -4468,34 +4506,34 @@ ab ab ab ab -ad -ad +aa +aa ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab @@ -4609,36 +4647,36 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -GM -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +ag +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -GM -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +ag +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -4750,36 +4788,36 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -GM -ad +aa +ag +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4791,11 +4829,11 @@ ab ab ab ab -ad +aa ab -ad -af -ad +aa +am +aa ab ab ab @@ -4892,12 +4930,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4906,21 +4944,21 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4933,11 +4971,11 @@ ab ab ab ab -ad -ad -ad -ag -ad +aa +aa +aa +an +aa ab ab ab @@ -5033,9 +5071,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5049,15 +5087,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5072,10 +5110,10 @@ ab ab ab ab -ad -ad -GM -ad +aa +aa +ag +aa ab ab kA @@ -5172,11 +5210,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5191,15 +5229,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5212,12 +5250,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -5312,12 +5350,12 @@ ab ab ab ab -ad -ad -ad -GM -ad -ad +aa +aa +aa +ag +aa +aa ab ab ab @@ -5334,14 +5372,14 @@ ab ab ab ab -ad +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5353,12 +5391,12 @@ ab ab ab ab -ad -ad -GM -ad -ad -ad +aa +aa +ag +aa +aa +aa ab ab ab @@ -5453,13 +5491,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -5475,14 +5513,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5493,11 +5531,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5595,12 +5633,12 @@ ab ab ab ab -ad -GM -ad -ad -GM -ad +aa +ag +aa +aa +ag +aa ab ab ab @@ -5615,16 +5653,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -5633,9 +5671,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5738,11 +5776,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5755,17 +5793,17 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5775,8 +5813,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5896,18 +5934,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -5915,9 +5953,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6036,33 +6074,33 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab -ad -GM -ad -ad -ad -GM +aa +ag +aa +aa +aa +ag ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad +aa ab ab ab @@ -6177,34 +6215,34 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -GM -ad +aa +ag +aa ab -ad -ad +aa +aa ab ab ab @@ -6319,34 +6357,34 @@ ab ab ab ab -ad -GM -GM -ad +aa +ag +ag +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -ad -GM +aa +ag ab ab ab @@ -6460,35 +6498,35 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -6602,21 +6640,21 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -GM -ad -ad +ag +aa +aa ab ab ab @@ -6624,13 +6662,13 @@ ab ab ab ab -ad +aa ab ab -ad -GM -GM -ad +aa +ag +ag +aa ab ab ab @@ -6638,11 +6676,11 @@ ab ab ab ab -ad +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6744,35 +6782,35 @@ ab ab ab ab -ad -GM -ad -ad -ad -ad -ad -ad -ad +aa +ag +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6780,12 +6818,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -6886,50 +6924,50 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -7028,8 +7066,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7042,37 +7080,37 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -7170,8 +7208,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7197,24 +7235,24 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -Gy -ad -Gy -ad +ae +aa +ae +aa ab ab ab @@ -7312,7 +7350,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7338,24 +7376,24 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7454,7 +7492,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7481,23 +7519,23 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7596,8 +7634,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7623,15 +7661,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7639,8 +7677,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7738,8 +7776,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7766,14 +7804,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -7782,7 +7820,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7880,8 +7918,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7897,9 +7935,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7909,23 +7947,23 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8023,7 +8061,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -8037,10 +8075,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8052,24 +8090,24 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8081,14 +8119,14 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad +aa +aa ab ab ab @@ -8165,22 +8203,22 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -8194,25 +8232,25 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -Gy -ad +aa +aa +aa +aa +aa +aa +aa +ae +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8222,16 +8260,16 @@ ab ab ab ab -ad -ad -Gy -ad -ad -ad -ad -ad -ad -ad +aa +aa +ae +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -8308,19 +8346,19 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -8336,14 +8374,14 @@ ab ab ab ab -ad +aa ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -8352,9 +8390,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8364,16 +8402,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad -Gy -ad +aa +ae +aa ab ab ab @@ -8451,18 +8489,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -8478,14 +8516,14 @@ ab ab ab ab -ad +aa ab ab -ad -Gy -ad -ad -ad +aa +ae +aa +aa +aa ab ab ab @@ -8494,9 +8532,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8505,18 +8543,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8593,18 +8631,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8614,20 +8652,20 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8636,29 +8674,29 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8737,14 +8775,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8756,15 +8794,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8779,18 +8817,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8799,8 +8837,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8879,15 +8917,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8898,15 +8936,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8916,22 +8954,22 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab -ad +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8941,8 +8979,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9022,33 +9060,33 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab -ad +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9059,20 +9097,20 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -Gy +aa +ae ab -ad -Gy -ad -ad +aa +ae +aa +aa ab ab ab @@ -9083,9 +9121,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9165,33 +9203,33 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad +aa ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9202,17 +9240,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9226,11 +9264,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -9307,34 +9345,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -ad +aa ab ab -ad -ad +aa +aa ab ab -ad -ad +aa +aa ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9345,8 +9383,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9368,12 +9406,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -9450,34 +9488,34 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9487,8 +9525,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9511,12 +9549,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -9570,7 +9608,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -9592,34 +9630,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad +aa ab ab ab @@ -9629,8 +9667,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9654,10 +9692,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9711,8 +9749,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9734,17 +9772,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -hz -ad +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -9754,15 +9792,15 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9771,8 +9809,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9795,10 +9833,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9852,8 +9890,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9876,35 +9914,35 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9912,9 +9950,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9937,10 +9975,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9994,7 +10032,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -10018,21 +10056,21 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10041,10 +10079,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10054,9 +10092,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10078,11 +10116,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10117,11 +10155,11 @@ ab ab ab ab -yD -yD -yD -yD -yD +as +as +as +as +as ab ab ab @@ -10135,8 +10173,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10160,22 +10198,22 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +ac +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10184,21 +10222,21 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10220,11 +10258,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10259,11 +10297,11 @@ ab ab ab ab -yD +as vW Hk UX -yD +as ab ab ab @@ -10276,8 +10314,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10301,23 +10339,23 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10329,17 +10367,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10362,10 +10400,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10401,11 +10439,11 @@ ab ab ab ab -yD +as eY rj UX -yD +as ab ab ab @@ -10417,8 +10455,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10442,24 +10480,24 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10472,16 +10510,16 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10503,10 +10541,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10543,11 +10581,11 @@ ab ab ab ab -yD +as AJ AJ AJ -yD +as ab ab ab @@ -10558,9 +10596,9 @@ ab ab ab ab -ad -Gy -ad +aa +ae +aa ab ab ab @@ -10583,9 +10621,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10594,15 +10632,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10615,13 +10653,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10645,10 +10683,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10683,15 +10721,15 @@ ab ab ab ab -yD -yD -yD +as +as +as YM YM YM -yD -yD -yD +as +as +as ab ab ab @@ -10699,9 +10737,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10709,8 +10747,8 @@ ab ab ab ab -Da -Da +af +af ab ab ab @@ -10721,12 +10759,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -10737,14 +10775,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10758,8 +10796,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10785,10 +10823,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10825,7 +10863,7 @@ ab ab ab ab -yD +as rj rj rj @@ -10833,16 +10871,16 @@ rj rj rj rj -yD -yD -yD +as +as +as ab ab ab ab ab -ad -ad +aa +aa uh uh uh @@ -10850,10 +10888,10 @@ uh uh uh uh -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -10865,9 +10903,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10880,14 +10918,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10901,7 +10939,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -10916,21 +10954,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ah -ad -ad -ad +aa +aa +aa +aa +aa +aq +aa +aa +aa ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10977,14 +11015,14 @@ tf su Gs rj -yD -yD +as +as ab ab ab -ad -ad -ad +aa +aa +aa uh yM yM @@ -10992,11 +11030,11 @@ yM xH gP uh -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -11023,14 +11061,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11043,7 +11081,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -11056,22 +11094,22 @@ ab ab ab ab -ad -ad -Gy -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11102,13 +11140,13 @@ lq "} (73,1,1) = {" lq -yD -yD -yD -yD -yD -yD -yD +as +as +as +as +as +as +as rj tf TU @@ -11120,13 +11158,13 @@ su Tx rj Jz -yD +as ab ab ab -ad -ad -ad +aa +aa +aa uh yM bX @@ -11134,12 +11172,12 @@ xH xH xH mf -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -11166,13 +11204,13 @@ ab ab ab ab -ad -ad -ad -hz -ad -ad -ad +aa +aa +aa +ac +aa +aa +aa ab ab ab @@ -11184,8 +11222,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -11198,21 +11236,21 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab -ai -ad -ad -ad -ad -ad -ad -ad +ar +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11244,7 +11282,7 @@ lq "} (74,1,1) = {" lq -yD +as Ce Ce xk @@ -11262,12 +11300,12 @@ su iu rj ba -yD +as ab ab +aa +aa ad -ad -ae uh uh uG @@ -11276,13 +11314,13 @@ xH Xs uh uh -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -11308,13 +11346,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -hz -ad +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -11325,14 +11363,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da +af +af ab ab ab @@ -11349,10 +11387,10 @@ ab ab kA kA -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11386,7 +11424,7 @@ lq "} (75,1,1) = {" lq -yD +as Ce Rv rj @@ -11403,13 +11441,13 @@ AJ su iu rj -yD -yD -yD +as +as +as ab -ad -ad -ad +aa +aa +aa HV xH xH @@ -11417,15 +11455,15 @@ xH xH xA Ou -Da -Da +af +af gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -11450,14 +11488,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11466,16 +11504,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11490,10 +11528,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11528,7 +11566,7 @@ lq "} (76,1,1) = {" lq -yD +as Ce Ce rj @@ -11545,12 +11583,12 @@ gf tf rj rj -yD +as tI zz -ad -ad -ad +aa +aa +aa uh uh sm @@ -11559,15 +11597,15 @@ xH xH Oy vJ -Da -Da +af +af gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -11592,33 +11630,33 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad +aa ab ab ab ab -Da -Da -Da -ob -Da -Da +af +af +af +ao +af +af ab ab ab @@ -11632,10 +11670,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11670,13 +11708,13 @@ lq "} (77,1,1) = {" lq -yD -yD -yD +as +as +as hM hM -yD -yD +as +as rj tf TU @@ -11690,9 +11728,9 @@ rj tI tI zz -ad -ad -ad +aa +aa +aa uh lo nD @@ -11701,17 +11739,17 @@ xH xH We vJ -Da -Da +af +af gA gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11735,17 +11773,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11755,13 +11793,13 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -11773,10 +11811,10 @@ ab ab ab ab -ad -ad -Gy -ad +aa +aa +ae +aa ab ab ab @@ -11814,10 +11852,10 @@ lq lq ab ab -yD +as Pb lX -yD +as ab rj tf @@ -11828,13 +11866,13 @@ tf tf tf rj -yD +as tI qr up -ad -ad -ad +aa +aa +aa uh eo XC @@ -11843,18 +11881,18 @@ xH xH OL TN -Da -Da +af +af gA gA gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11877,12 +11915,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -11896,14 +11934,14 @@ ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA -Da -Da +af +af ab ab ab @@ -11915,10 +11953,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11956,12 +11994,12 @@ lq lq ab ab -yD -yD -yD -yD +as +as +as +as ab -yD +as rj rj rj @@ -11969,14 +12007,14 @@ rj rj vv wu -yD -yD +as +as tI qr DZ -ad -ad -ad +aa +aa +aa uh uh uh @@ -11985,19 +12023,19 @@ uh uh uh uh -Da -Da +af +af gA gA QL gA gA gA -mF -Da -Da -Da -Da +ai +af +af +af +af ab ab ab @@ -12019,12 +12057,12 @@ ab ab ab ab -hz -ad -ad -ad -ad -ad +ac +aa +aa +aa +aa +aa ab ab ab @@ -12038,15 +12076,15 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA -Da -Da +af +af ab ab ab @@ -12056,10 +12094,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12103,22 +12141,22 @@ ab ab ab ab -yD -yD -yD +as +as +as YM YM YM -yD -yD -yD -yD +as +as +as +as tI qr up -ad -ad -ad +aa +aa +aa ab ab ab @@ -12127,8 +12165,8 @@ ab ab ab ab -Da -Da +af +af gA gA gA @@ -12136,11 +12174,11 @@ gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12161,12 +12199,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12178,17 +12216,17 @@ ab ab ab ab -Da -Da -Da -jz +af +af +af +ap gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -12198,10 +12236,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12247,20 +12285,20 @@ ab ab ab ab -yD +as AJ AJ AJ -yD +as ab ab -yD +as Ki Ki ws -ad -ad -ad +aa +aa +aa ab ab ab @@ -12268,9 +12306,9 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -12279,12 +12317,12 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -12303,12 +12341,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12320,17 +12358,17 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -12340,15 +12378,15 @@ ab ab ab ab -Gy -ad -ad +ae +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12389,19 +12427,19 @@ ab ab ab ab -yD +as kS Wr ZR -yD +as ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12410,10 +12448,10 @@ ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -12422,11 +12460,11 @@ gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12445,12 +12483,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12461,9 +12499,9 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -12471,8 +12509,8 @@ QL gA gA gA -Da -Da +af +af ab ab ab @@ -12481,16 +12519,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12531,19 +12569,19 @@ ab ab ab ab -yD +as nh KY Aw -yD +as ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12551,25 +12589,25 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -vZ -Da +af +af +af +af +af +af +ah +af gA gA gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12587,12 +12625,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12603,18 +12641,18 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -12623,15 +12661,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12673,33 +12711,33 @@ ab ab ab ab -yD -yD -yD -yD -yD +as +as +as +as +as ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af gA gA gA @@ -12708,10 +12746,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -12729,12 +12767,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12745,18 +12783,18 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -12764,15 +12802,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12822,21 +12860,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -12847,13 +12885,13 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -12869,11 +12907,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12886,19 +12924,19 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af gA gA gA -Da +af ab ab -Da +af ab ab ab @@ -12906,14 +12944,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -12963,22 +13001,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -12989,12 +13027,12 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13009,13 +13047,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13028,13 +13066,13 @@ ab ab ab ab -Da -Da -Da -Da -ob -Da -Da +af +af +af +af +ao +af +af ab ab ab @@ -13048,14 +13086,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13105,21 +13143,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -13130,12 +13168,12 @@ gA gA gA gA -Da -Qe -Da -Da -Da -Da +af +aj +af +af +af +af ab ab ab @@ -13150,13 +13188,13 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad +aa +aa +aa +aa +ac +aa +aa ab ab ab @@ -13170,12 +13208,12 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13190,13 +13228,13 @@ ab ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13246,21 +13284,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da +af +af gA gA gA @@ -13272,10 +13310,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13288,14 +13326,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13313,12 +13351,12 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13337,8 +13375,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13387,22 +13425,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -13412,10 +13450,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13430,13 +13468,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13448,19 +13486,19 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13479,8 +13517,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13528,23 +13566,23 @@ ab ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -ad +aa +aa +ac +aa +aa +aa +aa +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -13552,9 +13590,9 @@ QL gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -13570,10 +13608,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -13590,8 +13628,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13599,11 +13637,11 @@ ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -13621,8 +13659,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13671,22 +13709,22 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -13694,7 +13732,7 @@ gA gA gA gA -Da +af ab ab ab @@ -13712,9 +13750,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -13732,20 +13770,20 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13763,8 +13801,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13813,30 +13851,30 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -13853,9 +13891,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -13875,19 +13913,19 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13905,8 +13943,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13955,30 +13993,30 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -13994,9 +14032,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14017,19 +14055,19 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da +af +af +af ab ab ab @@ -14047,8 +14085,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14096,15 +14134,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14112,15 +14150,15 @@ ab ab ab ab -Da -Da +af +af gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -14135,9 +14173,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14159,19 +14197,19 @@ ab ab ab ab -ad +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da +af +af ab ab ab @@ -14189,8 +14227,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14238,15 +14276,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14254,15 +14292,15 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA -Da +af ab -Da -Da +af +af ab ab ab @@ -14277,9 +14315,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14292,22 +14330,22 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14331,8 +14369,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14380,16 +14418,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14397,11 +14435,11 @@ ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -14419,8 +14457,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14433,24 +14471,24 @@ ab ab ab ab -ad -ad +aa +aa ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14472,9 +14510,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14522,16 +14560,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14561,9 +14599,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14575,25 +14613,25 @@ ab ab ab ab -ad +aa ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14614,9 +14652,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14663,18 +14701,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14703,9 +14741,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14716,17 +14754,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab -ad +aa ab ab ab @@ -14734,8 +14772,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14756,9 +14794,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14805,21 +14843,21 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -14846,8 +14884,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14858,17 +14896,17 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab @@ -14877,8 +14915,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14898,9 +14936,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14947,9 +14985,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14957,13 +14995,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -14988,10 +15026,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14999,18 +15037,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15019,8 +15057,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15040,9 +15078,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15089,9 +15127,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15101,12 +15139,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15131,38 +15169,38 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad +aa ab -ad -ad +aa +aa ab ab ab @@ -15182,9 +15220,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15231,9 +15269,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15275,16 +15313,16 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15301,9 +15339,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15324,9 +15362,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15373,9 +15411,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15420,12 +15458,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15443,9 +15481,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15467,9 +15505,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15515,10 +15553,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15584,10 +15622,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15610,8 +15648,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15658,9 +15696,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15725,10 +15763,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15753,8 +15791,8 @@ GR ab ab ab -ad -ad +aa +aa ab ab ab @@ -15788,7 +15826,7 @@ lq "} (106,1,1) = {" lz -ad +aa ab ab ab @@ -15801,8 +15839,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15865,12 +15903,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15895,9 +15933,9 @@ GR GR GR ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15930,7 +15968,7 @@ lq "} (107,1,1) = {" lz -ad +aa ab ab ab @@ -15943,8 +15981,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16004,15 +16042,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16038,9 +16076,9 @@ gF GR ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -16072,8 +16110,8 @@ lq "} (108,1,1) = {" lz -ad -ad +aa +aa ab ab ab @@ -16086,7 +16124,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -16145,16 +16183,16 @@ ab ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -hz -ad +aa +aa +ac +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -16181,8 +16219,8 @@ GR ab ab ab -ad -ad +aa +aa ab ab ab @@ -16215,8 +16253,8 @@ lq (109,1,1) = {" lq ab -ad -ad +aa +aa ab ab ab @@ -16228,8 +16266,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16285,17 +16323,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16324,8 +16362,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16358,8 +16396,8 @@ lq lq ab ab -ad -ad +aa +aa ab ab ab @@ -16369,9 +16407,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -16426,18 +16464,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16466,8 +16504,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16500,8 +16538,8 @@ lq lq ab ab -ad -ad +aa +aa ab ab ab @@ -16510,10 +16548,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16567,16 +16605,16 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad -ad -hz -ad +aa +aa +aa +aa +ac +aa +aa +aa +ac +aa ab ab ab @@ -16608,8 +16646,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16643,17 +16681,17 @@ lq ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16707,18 +16745,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab -ad -ad +aa +aa ab ab ab @@ -16750,8 +16788,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16786,15 +16824,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16847,14 +16885,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16891,8 +16929,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16928,14 +16966,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16989,10 +17027,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17033,8 +17071,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17071,11 +17109,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -17131,8 +17169,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17160,9 +17198,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17175,8 +17213,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17272,8 +17310,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17301,14 +17339,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -17317,8 +17355,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17414,8 +17452,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17443,24 +17481,24 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17556,8 +17594,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17586,22 +17624,22 @@ ab ab ab ab -ad +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17697,10 +17735,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17726,23 +17764,23 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17839,10 +17877,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17868,11 +17906,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -17882,9 +17920,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17981,10 +18019,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -18012,10 +18050,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -18024,8 +18062,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18123,11 +18161,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18156,8 +18194,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18265,11 +18303,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18289,17 +18327,17 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18406,13 +18444,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18431,18 +18469,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -18548,14 +18586,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18572,19 +18610,19 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +ac +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18691,15 +18729,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18708,26 +18746,26 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18834,43 +18872,43 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18977,27 +19015,27 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19010,9 +19048,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19121,22 +19159,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19153,8 +19191,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -19264,19 +19302,19 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19296,8 +19334,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -19409,13 +19447,13 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad +aa ab ab ab @@ -19438,9 +19476,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19580,9 +19618,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19723,9 +19761,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19865,9 +19903,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -20006,11 +20044,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20148,11 +20186,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20290,11 +20328,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20432,10 +20470,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -20574,10 +20612,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 94a79b3cf2..3febe42b2e 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,32 +1,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm index acc65a6a89..51d91d7fc9 100644 --- a/maps/stellardelight/ship_centcom.dmm +++ b/maps/stellardelight/ship_centcom.dmm @@ -573,6 +573,9 @@ /obj/structure/closet/walllocker/medical/east, /turf/simulated/floor/tiled, /area/centcom/terminal/tramfluff) +"bF" = ( +/turf/simulated/floor/reinforced, +/area/shuttle/centcom/ccbay) "bJ" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/pillbottles, @@ -12016,9 +12019,6 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/security) -"QZ" = ( -/turf/simulated/floor/reinforced/airless, -/area/shuttle/centcom/ccbay) "Ra" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -25610,12 +25610,12 @@ ZQ lM Bx Nv -QZ -QZ -QZ -QZ -QZ -QZ +bF +bF +bF +bF +bF +bF Cg wO DY @@ -25623,8 +25623,8 @@ HB kX TF kX -QZ -QZ +bF +bF MX Bx lM @@ -25752,8 +25752,8 @@ ZQ lM Bx Nv -QZ -QZ +bF +bF lL kX kX @@ -26888,9 +26888,9 @@ ZQ lM Bx Nv -QZ -QZ -QZ +bF +bF +bF kX kX TF @@ -27030,12 +27030,12 @@ ZQ lM Bx Nv -QZ -QZ -QZ -QZ -QZ -QZ +bF +bF +bF +bF +bF +bF Cg lo kX @@ -27043,8 +27043,8 @@ kX kX TF kX -QZ -QZ +bF +bF MX Bx nX diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellardelight/ship_misc.dmm index b18648d9f1..fcdabbf9a1 100644 --- a/maps/stellardelight/ship_misc.dmm +++ b/maps/stellardelight/ship_misc.dmm @@ -1,4 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/unsimulated/mineral/virgo3b, +/area/space) "ab" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 @@ -21,6 +24,12 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) +"ae" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm1) +"af" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm1) "ag" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -47,6 +56,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ai" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm2) +"aj" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm2) "ak" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ @@ -84,6 +99,9 @@ "ap" = ( /turf/space, /area/space) +"aq" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm3) "ar" = ( /turf/unsimulated/wall, /area/space) @@ -331,6 +349,9 @@ }, /turf/unsimulated/wall, /area/space) +"bc" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm3) "bd" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -379,6 +400,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"bn" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "bo" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -443,6 +468,13 @@ }, /turf/simulated/fitness, /area/holodeck/source_boxingcourt) +"by" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"bz" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "bA" = ( /obj/structure/fitness/boxing_ropes{ dir = 8 @@ -541,16 +573,47 @@ /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"bN" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"bO" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bP" = ( /obj/structure/holostool{ dir = 1 }, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"bQ" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"bR" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bS" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"bT" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bU" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -639,16 +702,89 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"ce" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"cf" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"cg" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"ch" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "ci" = ( /obj/structure/holostool{ dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"cj" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ck" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"cl" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "cm" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"cn" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"co" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cp" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cq" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cr" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cs" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ct" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -706,6 +842,77 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"cC" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cD" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cE" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cF" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cG" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cH" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cI" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cJ" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cK" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "cL" = ( /obj/structure/holostool{ dir = 8 @@ -718,6 +925,17 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"cN" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cO" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkone" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "cP" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -765,6 +983,31 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"cV" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cW" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cX" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unktwo" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"cY" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cZ" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "da" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -773,16 +1016,17 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "db" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdown"; - nostop = 1; - stopper = 0; - tiles = 0 +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkthree" }, -/turf/space, -/turf/space/transit/north, -/area/space) +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"dc" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "dd" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -795,6 +1039,26 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"df" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dg" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dh" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"di" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dj" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -843,6 +1107,20 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"dn" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"do" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"dp" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dq" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" @@ -914,6 +1192,14 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"dy" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dz" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dA" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -928,10 +1214,18 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"dC" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dD" = ( -/turf/space, -/turf/space, -/area/space) +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"dE" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "dF" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -956,6 +1250,12 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"dL" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dM" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -993,6 +1293,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"dT" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dU" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -1027,6 +1331,22 @@ "dY" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"dZ" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"ea" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"eb" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "ec" = ( /obj/effect/landmark{ name = "Holocarp Spawn Random" @@ -1122,6 +1442,10 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"er" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "es" = ( /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, @@ -1131,10 +1455,63 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"eu" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm1) +"ev" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ew" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ex" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ey" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm2) +"ez" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eA" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eB" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eC" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm3) "eD" = ( /obj/effect/floor_decal/sign/small_4, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"eE" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"eF" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "eG" = ( /turf/space, /turf/space/transit/north, @@ -1165,6 +1542,10 @@ /obj/item/weapon/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"eN" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "eO" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -1172,6 +1553,9 @@ }, /turf/space/transit/south, /area/space) +"eP" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm4) "eQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1181,6 +1565,12 @@ }, /turf/space/transit/west, /area/space) +"eR" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm4) +"eS" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm5) "eT" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, @@ -1277,6 +1667,9 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fg" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm5) "fh" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -1284,6 +1677,16 @@ }, /turf/space/transit/west, /area/space) +"fi" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm6) +"fj" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm6) +"fk" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "fl" = ( /obj/structure/table/holotable, /obj/item/clothing/gloves/boxing/hologlove{ @@ -1369,6 +1772,23 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fw" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"fx" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"fy" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "fz" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1393,6 +1813,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fD" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"fE" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"fF" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "fG" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -1408,6 +1839,16 @@ dir = 8 }, /area/holodeck/source_meetinghall) +"fI" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "fJ" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1419,6 +1860,13 @@ icon_state = "beach" }, /area/holodeck/source_beach) +"fL" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"fM" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) "fN" = ( /obj/structure/table/woodentable/holotable, /obj/item/weapon/dice/d8, @@ -1632,9 +2080,134 @@ opacity = 1 }, /area/beach) +"gv" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gw" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gx" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "gy" = ( /turf/unsimulated/beach/coastline, /area/beach) +"gz" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"gA" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gB" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gC" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gD" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gE" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gF" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gG" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gH" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gI" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gJ" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gK" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gL" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gM" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "gN" = ( /turf/unsimulated/beach/water{ density = 1; @@ -1644,6 +2217,193 @@ "gO" = ( /turf/unsimulated/beach/water, /area/beach) +"gP" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gQ" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gR" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gS" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gT" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkfour" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"gU" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gV" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gW" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkfive" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"gX" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gZ" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unksix" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"ha" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hb" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hc" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hd" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"he" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hf" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hg" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hh" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hi" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hj" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hk" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hl" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hm" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hn" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"ho" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hp" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hq" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hr" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hs" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"ht" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm4) +"hu" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hv" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hw" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hx" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm5) +"hy" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hz" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hA" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hB" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm6) "hC" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -1652,6 +2412,45 @@ icon_state = "white" }, /area/holodeck/source_patient_ward) +"hD" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hE" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hF" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hG" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdown"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/space, +/turf/space/transit/north, +/area/space) +"hH" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "escapeshuttle_leave"; + teleport_x = 25; + teleport_x_offset = 245; + teleport_y = 25; + teleport_y_offset = 245; + teleport_z = 4; + teleport_z_offset = 4 + }, +/turf/space, +/turf/space/transit/north, +/area/space) "hX" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/pirate, @@ -2053,20 +2852,6 @@ icon_state = "white" }, /area/holodeck/source_patient_ward) -"Gs" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 - }, -/turf/space, -/turf/space/transit/north, -/area/space) "GE" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/fakewizard, @@ -2391,6 +3176,46 @@ tD tD tD tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -2472,46 +3297,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul "} (2,1,1) = {" tD @@ -2533,6 +3318,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2550,29 +3378,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2634,26 +3439,6 @@ ZF ZF ZF ap -ul -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -gu -gN -gN -ul "} (3,1,1) = {" tD @@ -2675,6 +3460,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2692,29 +3520,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2776,26 +3581,6 @@ ZF ZF ZF ap -ul -ga -gc -gf -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (4,1,1) = {" tD @@ -2817,6 +3602,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2834,29 +3662,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2918,26 +3723,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (5,1,1) = {" tD @@ -2959,6 +3744,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ae +af +ae +af +af +af +af +af +af +ae +af +af +ae +aa +aa +aa +aa +aa +eP +eR +eP +eR +eR +eR +eR +eR +eR +eP +eR +eR +eP +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2976,29 +3804,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3060,26 +3865,6 @@ ZF ZF ZF ap -ul -ga -gd -gc -gc -gc -gc -gc -gc -gc -gc -gh -gi -gc -gc -gt -gy -gO -gN -ul "} (6,1,1) = {" tD @@ -3101,6 +3886,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bn +ae +cn +cI +cN +df +dp +dp +ae +co +eu +af +aa +aa +aa +aa +aa +eR +fk +eP +gB +gP +gS +hb +hh +hh +eP +gC +ht +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3118,29 +3946,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3202,26 +4007,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gh -gc -gs -gt -gy -gO -gN -ul "} (7,1,1) = {" tD @@ -3243,6 +4028,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +by +cj +co +by +cO +by +by +co +cj +co +ev +af +aa +aa +aa +aa +aa +eR +fw +gx +gC +fw +gT +fw +fw +gC +gx +gC +hu +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3260,29 +4088,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3344,26 +4149,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gi -gc -gj -gj -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (8,1,1) = {" tD @@ -3385,6 +4170,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bz +ae +cp +by +by +by +by +dL +ae +co +ew +af +aa +aa +aa +aa +aa +eR +fx +eP +gD +fw +fw +fw +fw +hn +eP +gC +hv +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3402,29 +4230,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3486,26 +4291,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gh -gj -gk -gm -gj -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (9,1,1) = {" tD @@ -3527,6 +4312,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bN +af +cq +co +cV +dg +dy +dT +af +co +ex +af +aa +aa +aa +aa +aa +eR +fy +eR +gE +gC +gU +hc +hi +ho +eR +gC +hw +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3544,29 +4372,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3628,26 +4433,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gj -gl -gn -gj -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (10,1,1) = {" tD @@ -3669,6 +4454,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ae +af +ae +af +af +af +af +af +af +ae +af +af +ae +aa +aa +aa +aa +aa +eP +eR +eP +eR +eR +eR +eR +eR +eR +eP +eR +eR +eP +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3686,29 +4514,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -fh -fh -fh -fh -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3770,26 +4575,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gj -gj -gc -gc -gc -gp -gc -gt -gy -gO -gN -ul "} (11,1,1) = {" tD @@ -3811,6 +4596,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3828,29 +4656,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -iv -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3912,26 +4717,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (12,1,1) = {" tD @@ -3953,6 +4738,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3970,29 +4798,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -XG -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4054,26 +4859,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gq -gc -gt -gy -gO -gN -ul "} (13,1,1) = {" tD @@ -4095,6 +4880,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4112,29 +4940,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4196,26 +5001,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gi -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (14,1,1) = {" tD @@ -4237,6 +5022,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4254,29 +5082,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4338,26 +5143,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gq -gc -gt -gy -gO -gN -ul "} (15,1,1) = {" tD @@ -4379,6 +5164,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4396,29 +5224,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4480,26 +5285,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -go -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (16,1,1) = {" tD @@ -4521,6 +5306,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4538,29 +5366,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4622,26 +5427,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gh -gf -gc -gc -gc -gc -gc -gc -gc -gr -gc -gt -gy -gO -gN -ul "} (17,1,1) = {" tD @@ -4663,6 +5448,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ai +aj +ai +aj +aj +aj +aj +aj +aj +ai +aj +aj +ai +aa +aa +aa +aa +aa +eS +fg +eS +fg +fg +fg +fg +fg +fg +eS +fg +fg +eS +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4680,29 +5508,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -fh -fh -fh -fh -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4764,26 +5569,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (18,1,1) = {" tD @@ -4805,6 +5590,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aj +bO +ai +cr +cJ +cW +dh +dz +dz +ai +cs +ey +aj +aa +aa +aa +aa +aa +fg +fD +eS +gF +gQ +gV +hd +hj +hj +eS +gG +hx +fg +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4822,29 +5650,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -4906,26 +5711,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (19,1,1) = {" tD @@ -4947,6 +5732,49 @@ tD tD tD tD +aa +aa +aa +aa +aa +aj +bQ +ck +cs +bQ +cX +bQ +bQ +cs +ck +cs +ez +aj +aa +aa +aa +aa +aa +fg +fE +gz +gG +fE +gW +fE +fE +gG +gz +gG +hy +fg +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4964,29 +5792,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -5048,28 +5853,67 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gf -gh -gc -gc -gt -gy -gO -gN -ul "} (20,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aj +bR +ai +cC +bQ +bQ +bQ +bQ +dZ +ai +cs +eA +aj +aa +aa +aa +aa +aa +fg +fF +eS +gH +fE +fE +fE +fE +hp +eS +gG +hz +fg +aa +aa +aa +aa ap ap ap @@ -5091,45 +5935,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5190,28 +5995,67 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (21,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aj +bT +aj +cD +cs +cY +di +dC +ea +aj +cs +eB +aj +aa +aa +aa +aa +aa +fg +fI +fg +gI +gG +gX +he +hk +hq +fg +gG +hA +fg +aa +aa +aa +aa ap ap ap @@ -5233,45 +6077,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5332,28 +6137,67 @@ ZF ZF ZF ap -ul -ga -gc -gg -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (22,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ai +aj +ai +aj +aj +aj +aj +aj +aj +ai +aj +aj +ai +aa +aa +aa +aa +aa +eS +fg +eS +fg +fg +fg +fg +fg +fg +eS +fg +fg +eS +aa +aa +aa +aa ap ap ap @@ -5375,45 +6219,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5474,6 +6279,292 @@ ZF ZF ZF ap +"} +(23,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +ap +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ap +"} +(24,1,1) = {" +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +ap +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ap +"} +(25,1,1) = {" ul ga ga @@ -5494,8 +6585,45 @@ gu gN gN ul -"} -(23,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -5517,45 +6645,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5616,312 +6705,67 @@ ZF ZF ZF ap -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -"} -(24,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -ap -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -"} -(25,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -ap -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (26,1,1) = {" +ul +ga +gc +gf +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -5943,45 +6787,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -6042,67 +6847,67 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (27,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -6184,111 +6989,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (28,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gd +gc +gc +gc +gc +gc +gc +gc +gc +gh +gi +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6326,111 +7131,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (29,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gh +gc +gs +gt +gy +gO +gN +ul +aa +aa +aa +aa +aq +bc +aq +bc +bc +bc +bc +bc +bc +aq +bc +bc +aq +aa +aa +aa +aa +aa +fi +fj +fi +fj +fj +fj +fj +fj +fj +fi +fj +fj +fi +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6468,111 +7273,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (30,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gi +gc +gj +gj +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +ce +aq +cE +cK +cZ +dn +dD +dD +aq +cF +eC +bc +aa +aa +aa +aa +aa +fj +fL +fi +gJ +gR +gY +hf +hl +hl +fi +gK +hB +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6610,111 +7415,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (31,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gh +gj +gk +gm +gj +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +cf +cl +cF +cf +db +cf +cf +cF +cl +cF +eE +bc +aa +aa +aa +aa +aa +fj +fM +gA +gK +fM +gZ +fM +fM +gK +gA +gK +hD +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6752,111 +7557,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (32,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gj +gl +gn +gj +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +cg +aq +cG +cf +cf +cf +cf +eb +aq +cF +eF +bc +aa +aa +aa +aa +aa +fj +gv +fi +gL +fM +fM +fM +fM +hr +fi +gK +hE +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6894,111 +7699,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (33,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gj +gj +gc +gc +gc +gp +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +ch +bc +cH +cF +dc +do +dE +er +bc +cF +eN +bc +aa +aa +aa +aa +aa +fj +gw +fj +gM +gK +ha +hg +hm +hs +fj +gK +hF +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -7036,111 +7841,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (34,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aq +bc +aq +bc +bc +bc +bc +bc +bc +aq +bc +bc +aq +aa +aa +aa +aa +aa +fi +fj +fi +fj +fj +fj +fj +fj +fj +fi +fj +fj +fi +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -7178,131 +7983,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (35,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gq +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -7342,109 +8127,109 @@ ap ap "} (36,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gi +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +fh +fh +fh +fh +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7484,109 +8269,109 @@ ap ap "} (37,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gq +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +iv +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7626,109 +8411,109 @@ ap ap "} (38,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +go +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +XG +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7768,109 +8553,109 @@ ap ap "} (39,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gh +gf +gc +gc +gc +gc +gc +gc +gc +gr +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7910,109 +8695,109 @@ ap ap "} (40,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -8052,6 +8837,30 @@ ap ap "} (41,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -8108,53 +8917,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -8194,6 +8979,30 @@ ap ap "} (42,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gf +gh +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -8250,53 +9059,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -8336,6 +9121,30 @@ ap ap "} (43,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -8392,53 +9201,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +fh +fh +fh +fh +fh +El +El +El +El +El +El +El +El ap ap ap @@ -8478,6 +9263,30 @@ ap ap "} (44,1,1) = {" +ul +ga +gc +gg +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -8534,53 +9343,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8620,6 +9405,30 @@ ap ap "} (45,1,1) = {" +ul +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +gu +gN +gN +ul +aa +aa +aa +aa ap ap ap @@ -8676,53 +9485,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8762,6 +9547,30 @@ ap ap "} (46,1,1) = {" +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +aa +aa +aa +aa ap ap ap @@ -8818,53 +9627,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8904,6 +9689,30 @@ ap ap "} (47,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -8960,53 +9769,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9046,6 +9831,30 @@ ap ap "} (48,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -9102,53 +9911,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9188,6 +9973,30 @@ ap ap "} (49,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -9244,53 +10053,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9330,6 +10115,30 @@ ap ap "} (50,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -9386,53 +10195,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9552,29 +10337,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9694,29 +10479,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -11986,10 +12771,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12128,10 +12913,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12270,10 +13055,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12412,10 +13197,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12554,10 +13339,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12696,10 +13481,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12838,10 +13623,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -12980,10 +13765,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -13122,10 +13907,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -13264,10 +14049,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -13406,10 +14191,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -13548,10 +14333,10 @@ ap ap ap ap -dD -dD -dD -dD +ap +ap +ap +ap eI eI eI @@ -13690,10 +14475,10 @@ ZC ZC ZC ZC -Gs -Gs -Gs -dD +hH +hH +hH +ap eI eI eI @@ -13834,8 +14619,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -13976,8 +14761,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14118,8 +14903,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14260,8 +15045,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14402,8 +15187,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14544,8 +15329,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14686,8 +15471,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14806,16 +15591,16 @@ Yx Yx Yx Yx -db -db -db -db -db -db +hG +hG +hG +hG +hG +hG eG eG -db -db +hG +hG eG eG eG @@ -14828,8 +15613,8 @@ eG eG eG eG -Gs -dD +hH +ap eI eI eI @@ -18169,7 +18954,7 @@ NT TH xp ap -dD +ap ap ap ap @@ -18311,7 +19096,7 @@ BC Wz xp ap -dD +ap ap ap ap @@ -18453,7 +19238,7 @@ BP Wz xp ap -dD +ap ap ap ap @@ -18595,7 +19380,7 @@ BP Wz xp ap -dD +ap ap ap ap @@ -18737,7 +19522,7 @@ BP Wz xp ap -dD +ap ap ap ap diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index b4fed5bd39..a3139f94f3 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -3917,13 +3917,7 @@ name = "night shift APC"; nightshift_setting = 2 }, -/obj/random/soap, -/obj/random/soap, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/clothing/under/bathrobe, -/obj/item/clothing/under/bathrobe, -/obj/structure/table/standard, +/obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "io" = ( @@ -5078,6 +5072,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) +"kX" = ( +/obj/item/weapon/bikehorn/rubberducky, +/turf/simulated/floor/tiled/steel_ridged, +/area/stellardelight/deck1/shower) "kY" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -13529,9 +13527,9 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "CU" = ( -/obj/machinery/washing_machine, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm/angled, +/obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "CV" = ( @@ -19254,7 +19252,6 @@ /obj/item/clothing/under/bathrobe, /obj/item/clothing/under/bathrobe, /obj/structure/table/standard, -/obj/item/weapon/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "PG" = ( @@ -32054,7 +32051,7 @@ SX it zP pS -cu +kX SV Ms Dy diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index fa84c347d6..9b025de841 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -215,6 +215,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"av" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/mob/living/simple_mob/animal/goat{ + name = "Ted" + }, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/kitchen) "aw" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -262,6 +269,9 @@ }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) +"aA" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "aB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -330,6 +340,13 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"aH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/mob/living/simple_mob/vore/alienanimals/teppi/baby, +/turf/simulated/floor/grass, +/area/hydroponics) "aI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -346,6 +363,14 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) +"aJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/mob/living/simple_mob/animal/passive/cow, +/turf/simulated/floor/grass, +/area/hydroponics) "aK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -381,6 +406,11 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) +"aP" = ( +/obj/structure/disposalpipe/segment, +/mob/living/simple_mob/vore/alienanimals/teppi/baby, +/turf/simulated/floor/grass, +/area/hydroponics) "aQ" = ( /obj/structure/grille, /turf/simulated/floor/airless, @@ -417,6 +447,9 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) +"aU" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftport) "aV" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, @@ -573,6 +606,39 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) +"bm" = ( +/obj/structure/sign/directions/science{ + pixel_x = 32 + }, +/obj/structure/sign/directions/dorms{ + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/sign/directions{ + desc = "A direction sign, pointing out the way to Exploration."; + name = "\improper Exploration Department"; + pixel_x = 32; + pixel_y = -6 + }, +/obj/structure/sign/directions/security{ + pixel_x = 32; + pixel_y = 12 + }, +/obj/structure/sign/directions/stairs_down{ + pixel_x = 32; + pixel_y = 18 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftport) +"bn" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "32-1" + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/triage) "bo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -607,6 +673,30 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) +"br" = ( +/obj/structure/sign/directions/science{ + pixel_x = -32 + }, +/obj/structure/sign/directions/dorms{ + pixel_x = -32; + pixel_y = 6 + }, +/obj/structure/sign/directions{ + desc = "A direction sign, pointing out the way to Exploration."; + name = "\improper Exploration Department"; + pixel_x = -32; + pixel_y = -6 + }, +/obj/structure/sign/directions/security{ + pixel_x = -32; + pixel_y = 12 + }, +/obj/structure/sign/directions/stairs_down{ + pixel_x = -32; + pixel_y = 18 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftstarboard) "bs" = ( /obj/structure/table/standard, /obj/item/device/healthanalyzer, @@ -646,6 +736,9 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) +"bv" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftstarboard) "bw" = ( /obj/machinery/power/pointdefense{ id_tag = "sd_pd" @@ -722,6 +815,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/wall/bay/r_wall/orange, /area/engineering/atmos/storage) +"bG" = ( +/obj/structure/cable/yellow{ + icon_state = "32-8" + }, +/obj/structure/sign/department/miner_dock{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/storage) "bH" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -788,6 +890,20 @@ }, /turf/simulated/floor, /area/stellardelight/deck2/central) +"bM" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/mob/living/simple_mob/animal/passive/opossum/poppy, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/engineering/workshop) "bN" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -846,13 +962,6 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/engineering/storage) -"bU" = ( -/mob/living/simple_mob/vore/alienanimals/teppi/baby, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "bV" = ( /obj/structure/table/woodentable, /obj/item/weapon/book/manual/bar_guide, @@ -2620,14 +2729,6 @@ /obj/machinery/smartfridge/sheets/persistent_lossy, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"gc" = ( -/mob/living/simple_mob/animal/passive/cow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/grass, -/area/hydroponics) "gd" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3397,15 +3498,6 @@ /obj/effect/floor_decal/milspec/cargo, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) -"hT" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/cable/white{ - icon_state = "32-1" - }, -/turf/simulated/open, -/area/stellardelight/deck2/triage) "hU" = ( /obj/structure/disposalpipe/tagger/partial{ dir = 8; @@ -5529,13 +5621,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"my" = ( -/mob/living/simple_mob/animal/goat{ - name = "Ted" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer/cold, -/area/crew_quarters/kitchen) "mz" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/milspec/color/green/half{ @@ -7809,20 +7894,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) -"rA" = ( -/mob/living/simple_mob/animal/passive/opossum/poppy, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, -/area/engineering/workshop) "rB" = ( /obj/structure/particle_accelerator/particle_emitter/right{ dir = 4 @@ -9663,9 +9734,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) -"vT" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck2/starboardaft) "vU" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -11684,30 +11752,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) -"AJ" = ( -/obj/structure/sign/directions/science{ - pixel_x = 32 - }, -/obj/structure/sign/directions/dorms{ - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; - pixel_x = 32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - pixel_x = 32; - pixel_y = 12 - }, -/obj/structure/sign/directions/stairs_down{ - pixel_x = 32; - pixel_y = 18 - }, -/turf/simulated/open, -/area/stellardelight/deck2/aftport) "AK" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; @@ -12599,30 +12643,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"CN" = ( -/obj/structure/sign/directions/science{ - pixel_x = -32 - }, -/obj/structure/sign/directions/dorms{ - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; - pixel_x = -32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - pixel_x = -32; - pixel_y = 12 - }, -/obj/structure/sign/directions/stairs_down{ - pixel_x = -32; - pixel_y = 18 - }, -/turf/simulated/open, -/area/stellardelight/deck2/aftstarboard) "CO" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -15469,10 +15489,6 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"IP" = ( -/obj/machinery/shield_gen/external, -/turf/simulated/floor/plating, -/area/engineering/storage) "IQ" = ( /obj/structure/table/glass, /obj/machinery/door/window/southright{ @@ -19589,9 +19605,6 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/engineering/engine_room) -"RZ" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck2/portaft) "Sb" = ( /turf/simulated/floor/tiled/eris/dark/danger, /area/engineering/engine_room) @@ -21015,11 +21028,6 @@ "Vm" = ( /turf/simulated/floor/airless, /area/stellardelight/deck2/fuelstorage) -"Vn" = ( -/mob/living/simple_mob/vore/alienanimals/teppi/baby, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/grass, -/area/hydroponics) "Vo" = ( /turf/simulated/wall/bay/r_wall/orange, /area/engineering/workshop) @@ -22763,15 +22771,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) -"Zn" = ( -/obj/structure/cable/yellow{ - icon_state = "32-8" - }, -/obj/structure/sign/department/miner_dock{ - pixel_y = 32 - }, -/turf/simulated/open, -/area/quartermaster/storage) "Zo" = ( /obj/machinery/light{ dir = 8 @@ -30128,7 +30127,7 @@ um iz sn kg -RZ +iz dC cV aV @@ -30520,7 +30519,7 @@ Gi wL ch DD -my +av AC DP BF @@ -30678,7 +30677,7 @@ sA iZ ii WN -bU +aH LS Jp KK @@ -30820,8 +30819,8 @@ EA wP JI fa -gc -Vn +aJ +aP rP hf Nw @@ -31706,7 +31705,7 @@ Hr Hr Oi bY -Ef +aU kt wY Ip @@ -31848,7 +31847,7 @@ Hr Hr Gx DA -AJ +bm Ef wY dL @@ -31955,7 +31954,7 @@ nt Rq Rq Rq -Rq +aA Jq Xi RT @@ -32001,7 +32000,7 @@ ei Bt eB do -Zn +bG Lm YP do @@ -32097,7 +32096,7 @@ nt Rq Rq lQ -Rq +aA Jq Xi kF @@ -32984,7 +32983,7 @@ vi Ze Ay qZ -hT +bn bf Vb Zv @@ -33801,7 +33800,7 @@ nt Rq Rq lY -Rq +aA Jq IK kF @@ -33943,7 +33942,7 @@ nt Rq Rq Rq -Rq +aA Jq IK RT @@ -34120,7 +34119,7 @@ nd nd uz Bg -CN +br fJ yW NW @@ -34262,7 +34261,7 @@ nd nd jz Ml -fJ +bv en yW ab @@ -34844,7 +34843,7 @@ To tB Eg qH -rA +bM Fd jY hs @@ -35808,7 +35807,7 @@ jB pJ Xp Za -vT +pJ Jf zW qa @@ -36542,7 +36541,7 @@ By oR oR gV -IP +oR qr Vf Vf diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 438c6212c6..053d9d9d0e 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -5,6 +5,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"ab" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/commandhall) "ac" = ( /obj/effect/landmark{ name = "morphspawn" @@ -14,12 +20,39 @@ "ad" = ( /turf/simulated/wall/bay/r_wall/blue, /area/tcommsat/chamber) +"ae" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/commandhall) "af" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) +"ag" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) +"ah" = ( +/obj/structure/sign/directions/stairs_down{ + pixel_x = 32; + pixel_y = 18 + }, +/obj/structure/sign/directions/medical{ + pixel_x = 32; + pixel_y = 12 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/sign/directions/cargo{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) "ai" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -29,6 +62,24 @@ "aj" = ( /turf/simulated/floor/carpet/turcarpet, /area/ai) +"ak" = ( +/obj/structure/sign/directions/stairs_down{ + pixel_x = -32; + pixel_y = 18 + }, +/obj/structure/sign/directions/medical{ + pixel_x = -32; + pixel_y = 12 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = -32; + pixel_y = 6 + }, +/obj/structure/sign/directions/cargo{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) "al" = ( /obj/machinery/power/terminal{ dir = 8 @@ -4446,24 +4497,6 @@ "rc" = ( /turf/simulated/wall/bay/r_wall/blue, /area/stellardelight/deck3/commandhall) -"re" = ( -/obj/structure/sign/directions/stairs_down{ - pixel_x = -32; - pixel_y = 18 - }, -/obj/structure/sign/directions/medical{ - pixel_x = -32; - pixel_y = 12 - }, -/obj/structure/sign/directions/engineering{ - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions/cargo{ - pixel_x = -32 - }, -/turf/simulated/open, -/area/stellardelight/deck3/aft) "rg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -6405,7 +6438,6 @@ }, /obj/item/weapon/folder/yellow, /obj/structure/table/darkglass, -/obj/structure/table/darkglass, /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/lawoffice) @@ -9582,7 +9614,9 @@ /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = 32 }, -/obj/machinery/power/shield_generator/charged, +/obj/machinery/power/shield_generator/charged{ + power_coefficient = 0.33 + }, /obj/structure/cable, /turf/simulated/floor, /area/stellardelight/deck2/central) @@ -11211,24 +11245,6 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) -"PU" = ( -/obj/structure/sign/directions/stairs_down{ - pixel_x = 32; - pixel_y = 18 - }, -/obj/structure/sign/directions/medical{ - pixel_x = 32; - pixel_y = 12 - }, -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/sign/directions/cargo{ - pixel_x = 32 - }, -/turf/simulated/open, -/area/stellardelight/deck3/aft) "PV" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -13792,9 +13808,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) -"ZJ" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck3/portaft) "ZK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20894,7 +20907,7 @@ Ae NL Yg vA -ZJ +dE DT dM bd @@ -22480,7 +22493,7 @@ Cu pc pc ER -RI +ag Qn Qn Ed @@ -22622,7 +22635,7 @@ ME UI aX ei -PU +ah RI RI Ed @@ -23590,7 +23603,7 @@ Tm Tm PL Gj -QB +ab QB QB QB @@ -23732,7 +23745,7 @@ Gj Fr Rl Gj -iV +ae iV iV iV @@ -24894,7 +24907,7 @@ qX nL Gv kt -re +ak RI RI Ed @@ -25036,7 +25049,7 @@ SF pc pc ER -RI +ag YK YK Ed @@ -26574,7 +26587,7 @@ qy NL Yg dE -ZJ +dE le ww ww diff --git a/maps/stellardelight/stellar_delight_jobs.dm b/maps/stellardelight/stellar_delight_jobs.dm index 4762edce08..2541edfd9c 100644 --- a/maps/stellardelight/stellar_delight_jobs.dm +++ b/maps/stellardelight/stellar_delight_jobs.dm @@ -7,4 +7,24 @@ //Same as above, to discorage explo from taking off with the small ship without asking, SAR should not need pilot access. /datum/job/sar access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_medical, access_medical_equip, access_morgue) \ No newline at end of file + minimal_access = list(access_medical, access_medical_equip, access_morgue) + +/datum/job/hop + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, + "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) + +/datum/alt_title/first_mate + title = "First Mate" + +/datum/job/atmos + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Fuel Technician" = /datum/alt_title/refuel_tech) + +/datum/alt_title/refuel_tech + title = "Fuel Technician" + +/datum/job/warden + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) + +/datum/alt_title/master_at_arms + title = "Master-at-Arms" \ No newline at end of file diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c32f3fbdc4..7d79670c6e 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -3534,7 +3534,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -5833,7 +5833,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -7956,7 +7956,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8402,7 +8402,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8967,7 +8967,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8977,7 +8977,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -13080,7 +13080,7 @@ "aSB" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -13687,7 +13687,7 @@ dir = 4 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/foyer) diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index a8e7544390..139bef998b 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1615,31 +1615,6 @@ /area/bigship/teleporter name = "Bigship Teleporter Room" -//////// Abductor Areas //////// -/area/unknown - requires_power = 0 - flags = RAD_SHIELDED - icon_state = "red2" - limit_mob_size = FALSE - -/area/unknown/dorm1 - name = "Unknown Dorm 1" - -/area/unknown/dorm2 - name = "Unknown Dorm 2" - -/area/unknown/dorm3 - name = "Unknown Dorm 3" - -/area/unknown/dorm4 - name = "Unknown Dorm 4" - -/area/unknown/dorm5 - name = "Unknown Dorm 5" - -/area/unknown/dorm6 - name = "Unknown Dorm 6" - // ERT/Deathsquad Shuttle /area/shuttle/specialops/centcom name = "Special Operations Shuttle - Centcom"