diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index 16360649ec9..c9c65bfba0f 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -758,6 +758,10 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl if(A.vars.Find(lowertext(varname))) return 1 else return 0 +/proc/has_var(var/atom/A, var/varname)//Object, non case-sensitive version + if(A.vars.Find(varname)) return 1 + else return 0 + //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all areas of that type in the world. /proc/get_areas(var/areatype) diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 47111e106df..4255eb31924 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -538,15 +538,18 @@ var/list/sacrificed = list() var/list/mob/living/carbon/human/cultsinrange = list() var/list/mob/living/carbon/human/victims = list() for(var/mob/living/carbon/human/V in src.loc)//Checks for non-cultist humans to sacrifice - if(ishuman(V) || isbrain(V) || issilicon(V))// || istype(V,/obj/item/device/mmi)) + if(ishuman(V)) if(!(iscultist(V))) victims += V//Checks for cult status and mob type for(var/obj/item/I in src.loc)//Checks for MMIs/brains/Intellicards - if(istype(I,/obj/item/brain) || istype(I,/obj/item/device/mmi)) - if(hasvar(I,"brainmob"))//Makes sure it has a brainmob - victims += I:brainmob - if(istype(I,/obj/item/device/aicard)) - for(var/mob/living/silicon/ai/A in I)//Because AIs are just stored inside the card and not attached to a var + if(istype(I,/obj/item/brain)) + var/obj/item/brain/B = I + victims += B.brainmob + else if(istype(I,/obj/item/device/mmi)) + var/obj/item/device/mmi/B = I + victims += B.brainmob + else if(istype(I,/obj/item/device/aicard)) + for(var/mob/living/silicon/ai/A in I) victims += A for(var/mob/living/carbon/C in orange(1,src)) if(iscultist(C) && !C.stat) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index dae186de4a6..a2cc63b0d07 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -313,47 +313,10 @@ /obj/machinery/mecha_part_fabricator/proc/output_part_cost(var/obj/item/part) var/i = 0 var/output -//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(istype(part,/obj/item/robot_parts)) - var/obj/item/robot_parts/P = part - for(var/c in P.construction_cost) + if(has_var(part,"construction_time") && has_var(part,"construction_cost"))//The most efficient way to go about this. Not all objects have these vars, but if they don't then they CANNOT be made by the mech fab. Doing it this way reduces a major amount of typecasting and switches, while cutting down maintenece for them as well -Sieve + for(var/c in part:construction_cost)//The has_var should ensure that anything without the var doesn't make it to this point if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" - i++ - return output - else if(istype(part,/obj/item/mecha_parts)) - var/obj/item/mecha_parts/P = part - for(var/c in P.construction_cost) - if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" - i++ - return output - else if(istype(part,/obj/item/borg/upgrade)) - var/obj/item/borg/upgrade/P = part - for(var/c in P.construction_cost) - if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" - i++ - return output - else if(istype(part,/obj/item/device/mmi)) - var/obj/item/device/mmi/P = part - for(var/c in P.construction_cost) - if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" - i++ - return output - else if(istype(part,/obj/item/device/flash/synthetic)) - var/obj/item/device/flash/synthetic/P = part - for(var/c in P.construction_cost) - if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" - i++ - return output - else if(istype(part,/obj/item/weapon/cell)) - var/obj/item/weapon/cell/P = part - for(var/c in P.construction_cost) - if(c in resources) - output += "[i?" | ":null][get_resource_cost_w_coeff(P,c)] [c]" + output += "[i?" | ":null][get_resource_cost_w_coeff(part,c)] [c]" i++ return output else @@ -371,82 +334,20 @@ /obj/machinery/mecha_part_fabricator/proc/remove_resources(var/obj/item/part) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(istype(part,/obj/item/robot_parts)) - var/obj/item/robot_parts/P = part - for(var/resource in P.construction_cost) + if(has_var(part,"construction_time") && has_var(part,"construction_cost")) + for(var/resource in part:construction_cost) if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) - else if(istype(part,/obj/item/mecha_parts)) - var/obj/item/mecha_parts/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) - else if(istype(part,/obj/item/borg/upgrade)) - var/obj/item/borg/upgrade/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) - else if(istype(part,/obj/item/device/mmi)) - var/obj/item/device/mmi/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) - else if(istype(part,/obj/item/device/flash/synthetic)) - var/obj/item/device/flash/synthetic/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) - else if(istype(part,/obj/item/weapon/cell)) - var/obj/item/weapon/cell/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - src.resources[resource] -= get_resource_cost_w_coeff(P,resource) + src.resources[resource] -= get_resource_cost_w_coeff(part,resource) else return /obj/machinery/mecha_part_fabricator/proc/check_resources(var/obj/item/part) // if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts) || istype(part,/obj/item/borg/upgrade)) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(istype(part,/obj/item/robot_parts)) - var/obj/item/robot_parts/P = part - for(var/resource in P.construction_cost) + if(has_var(part,"construction_time") && has_var(part,"construction_cost")) + for(var/resource in part:construction_cost) if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) - return 0 - return 1 - else if(istype(part,/obj/item/mecha_parts)) - var/obj/item/mecha_parts/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) - return 0 - return 1 - else if(istype(part,/obj/item/borg/upgrade)) - var/obj/item/borg/upgrade/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) - return 0 - return 1 - else if(istype(part,/obj/item/device/mmi)) - var/obj/item/device/mmi/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) - return 0 - return 1 - else if(istype(part,/obj/item/device/flash/synthetic)) - var/obj/item/device/flash/synthetic/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) - return 0 - return 1 - else if(istype(part,/obj/item/weapon/cell)) - var/obj/item/weapon/cell/P = part - for(var/resource in P.construction_cost) - if(resource in src.resources) - if(src.resources[resource] < get_resource_cost_w_coeff(P,resource)) + if(src.resources[resource] < get_resource_cost_w_coeff(part,resource)) return 0 return 1 else @@ -498,6 +399,9 @@ /obj/machinery/mecha_part_fabricator/proc/process_queue() var/part = listgetindex(src.queue, 1) + if(!(has_var(part,"construction_time")) || !(has_var(part,"construction_cost")))//If it shouldn't be printed + remove_from_queue(1)//Take it out of the quene + return process_queue()//Then reprocess it temp = null while(part) if(stat&(NOPOWER|BROKEN)) @@ -522,7 +426,11 @@ for(var/i=1;i<=queue.len;i++) var/obj/item/part = listgetindex(src.queue, i) if(istype(part)) - output += "[part.name] - [i>1?"↑":null] [i↓":null] Remove" + if(has_var(part,"construction_time") && has_var(part,"construction_cost"))//Prevents junk items from even appearing in the list, and they will be silently removed when the fab processes + output += "[part.name] - [i>1?"↑":null] [i↓":null] Remove" + else + remove_from_queue(i)//Trash it + return list_queue()//Rebuild it output += "" output += "\[Process queue | Clear queue\]" return output @@ -532,8 +440,12 @@ var/i = 0 for(var/datum/design/D in files.known_designs) if(D.build_type&16) - if(add_part_to_set("Exosuit Equipment", text2path(D.build_path))) - i++ + if(D.category in part_sets)//Checks if it's a valid category + if(add_part_to_set(D.category, text2path(D.build_path)))//Adds it to said category + i++ + else + if(add_part_to_set("Misc", text2path(D.build_path)))//If in doubt, chunk it into the Misc + i++ return i /obj/machinery/mecha_part_fabricator/proc/update_tech() @@ -598,47 +510,15 @@ /obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(var/obj/item/part as obj,var/resource as text, var/roundto=1) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(istype(part,/obj/item/robot_parts)) - var/obj/item/robot_parts/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) - else if(istype(part,/obj/item/mecha_parts)) - var/obj/item/mecha_parts/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) - else if(istype(part,/obj/item/borg/upgrade)) - var/obj/item/borg/upgrade/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) - else if(istype(part,/obj/item/device/mmi)) - var/obj/item/device/mmi/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) - else if(istype(part,/obj/item/device/flash/synthetic)) - var/obj/item/device/flash/synthetic/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) - else if(istype(part,/obj/item/weapon/cell)) - var/obj/item/weapon/cell/P = part - return round(P.construction_cost[resource]*resource_coeff, roundto) + if(has_var(part,"construction_time") && has_var(part,"construction_cost")) + return round(part:construction_cost[resource]*resource_coeff, roundto) else return 0 /obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(var/obj/item/part as obj, var/roundto=1) //Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects - if(istype(part,/obj/item/robot_parts)) - var/obj/item/robot_parts/P = part - return round(P.construction_time*time_coeff, roundto) - else if(istype(part,/obj/item/mecha_parts)) - var/obj/item/mecha_parts/P = part - return round(P.construction_time*time_coeff, roundto) - else if(istype(part,/obj/item/borg/upgrade)) - var/obj/item/borg/upgrade/P = part - return round(P.construction_time*time_coeff, roundto) - else if(istype(part,/obj/item/device/mmi)) - var/obj/item/device/mmi/P = part - return round(P.construction_time*time_coeff, roundto) - else if(istype(part,/obj/item/device/flash/synthetic)) - var/obj/item/device/flash/synthetic/P = part - return round(P.construction_time*time_coeff, roundto) - else if(istype(part,/obj/item/weapon/cell)) - var/obj/item/weapon/cell/P = part - return round(P.construction_time*time_coeff, roundto) + if(has_var(part,"construction_time") && has_var(part,"construction_cost")) + return round(part:construction_time*time_coeff, roundto) else return 0 diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 54d58ce1a04..79a93d0f5a7 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -51,6 +51,7 @@ datum/design //Datum for object designs, used in construction var/list/materials = list() //List of materials. Format: "id" = amount. var/build_path = "" //The file path of the object that gets created var/locked = 0 //If true it will spawn inside a lockbox with currently sec access + var/category = null //Primarily used for Mech Fabricators, but can be used for anything //A proc to calculate the reliability of a design based on tech levels and innate modifiers. @@ -718,6 +719,7 @@ datum/design/mech_scattershot build_type = MECHFAB req_tech = list("combat" = 4) build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot" + category = "Exosuit Equipment" datum/design/mech_laser name = "Exosuit Weapon Design (CH-PS \"Immolator\" Laser)" @@ -726,6 +728,7 @@ datum/design/mech_laser build_type = MECHFAB req_tech = list("combat" = 3, "magnets" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser" + category = "Exosuit Equipment" datum/design/mech_laser_heavy name = "Exosuit Weapon Design (CH-LC \"Solaris\" Laser Cannon)" @@ -734,6 +737,7 @@ datum/design/mech_laser_heavy build_type = MECHFAB req_tech = list("combat" = 4, "magnets" = 4) build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy" + category = "Exosuit Equipment" datum/design/mech_grenade_launcher name = "Exosuit Weapon Design (SGL-6 Grenade Launcher)" @@ -742,6 +746,7 @@ datum/design/mech_grenade_launcher build_type = MECHFAB req_tech = list("combat" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang" + category = "Exosuit Equipment" datum/design/mech_wormhole_gen name = "Exosuit Module Design (Localized Wormhole Generator)" @@ -750,6 +755,7 @@ datum/design/mech_wormhole_gen build_type = MECHFAB req_tech = list("bluespace" = 3, "magnets" = 2) build_path = "/obj/item/mecha_parts/mecha_equipment/wormhole_generator" + category = "Exosuit Equipment" datum/design/mech_teleporter name = "Exosuit Module Design (Teleporter Module)" @@ -758,6 +764,7 @@ datum/design/mech_teleporter build_type = MECHFAB req_tech = list("bluespace" = 10, "magnets" = 5) build_path = "/obj/item/mecha_parts/mecha_equipment/teleporter" + category = "Exosuit Equipment" datum/design/mech_rcd name = "Exosuit Module Design (RCD Module)" @@ -766,6 +773,7 @@ datum/design/mech_rcd build_type = MECHFAB req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4) build_path = "/obj/item/mecha_parts/mecha_equipment/tool/rcd" + category = "Exosuit Equipment" datum/design/mech_gravcatapult name = "Exosuit Module Design (Gravitational Catapult Module)" @@ -774,6 +782,7 @@ datum/design/mech_gravcatapult build_type = MECHFAB req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/gravcatapult" + category = "Exosuit Equipment" datum/design/mech_repair_droid name = "Exosuit Module Design (Repair Droid Module)" @@ -782,6 +791,7 @@ datum/design/mech_repair_droid build_type = MECHFAB req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/repair_droid" + category = "Exosuit Equipment" datum/design/mech_plasma_generator name = "Exosuit Module Design (Plasma Converter Module)" @@ -790,6 +800,7 @@ datum/design/mech_plasma_generator build_type = MECHFAB req_tech = list("plasmatech" = 2, "powerstorage"= 2, "engineering" = 2) build_path = "/obj/item/mecha_parts/mecha_equipment/plasma_generator" + category = "Exosuit Equipment" datum/design/mech_energy_relay name = "Exosuit Module Design (Tesla Energy Relay)" @@ -798,6 +809,7 @@ datum/design/mech_energy_relay build_type = MECHFAB req_tech = list("magnets" = 4, "syndicate" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay" + category = "Exosuit Equipment" datum/design/mech_ccw_armor name = "Exosuit Module Design(Reactive Armor Booster Module)" @@ -806,6 +818,7 @@ datum/design/mech_ccw_armor build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 4) build_path = "/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster" + category = "Exosuit Equipment" datum/design/mech_proj_armor name = "Exosuit Module Design(Reflective Armor Booster Module)" @@ -814,6 +827,7 @@ datum/design/mech_proj_armor build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 5, "engineering"=3) build_path = "/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster" + category = "Exosuit Equipment" datum/design/mech_syringe_gun name = "Exosuit Module Design(Syringe Gun)" @@ -822,6 +836,7 @@ datum/design/mech_syringe_gun build_type = MECHFAB req_tech = list("materials" = 3, "biotech"=4, "magnets"=4, "programming"=3) build_path = "/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun" + category = "Exosuit Equipment" datum/design/mech_diamond_drill name = "Exosuit Module Design (Diamond Mining Drill)" @@ -830,6 +845,7 @@ datum/design/mech_diamond_drill build_type = MECHFAB req_tech = list("materials" = 4, "engineering" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill" + category = "Exosuit Equipment" datum/design/mech_generator_nuclear name = "Exosuit Module Design (ExoNuclear Reactor)" @@ -838,6 +854,7 @@ datum/design/mech_generator_nuclear build_type = MECHFAB req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3) build_path = "/obj/item/mecha_parts/mecha_equipment/generator/nuclear" + category = "Exosuit Equipment" //////////////////////////////////////// @@ -1082,6 +1099,7 @@ datum/design/basic_cell build_type = PROTOLATHE | AUTOLATHE |MECHFAB materials = list("$metal" = 700, "$glass" = 50) build_path = "/obj/item/weapon/cell" + category = "Misc" datum/design/high_cell name = "High-Capacity Power Cell" @@ -1091,6 +1109,7 @@ datum/design/high_cell build_type = PROTOLATHE | AUTOLATHE | MECHFAB materials = list("$metal" = 700, "$glass" = 60) build_path = "/obj/item/weapon/cell/high" + category = "Misc" datum/design/super_cell name = "Super-Capacity Power Cell" @@ -1101,6 +1120,7 @@ datum/design/super_cell build_type = PROTOLATHE | MECHFAB materials = list("$metal" = 700, "$glass" = 70) build_path = "/obj/item/weapon/cell/super" + category = "Misc" datum/design/hyper_cell name = "Hyper-Capacity Power Cell" @@ -1111,6 +1131,7 @@ datum/design/hyper_cell build_type = PROTOLATHE | MECHFAB materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) build_path = "/obj/item/weapon/cell/hyper" + category = "Misc" datum/design/light_replacer name = "Light Replacer" @@ -1257,6 +1278,7 @@ datum/design/mmi materials = list("$metal" = 1000, "$glass" = 500) reliability_base = 76 build_path = "/obj/item/device/mmi" + category = "Misc" datum/design/mmi_radio name = "Radio-enabled Man-Machine Interface" @@ -1267,6 +1289,7 @@ datum/design/mmi_radio materials = list("$metal" = 1200, "$glass" = 500) reliability_base = 74 build_path = "/obj/item/device/mmi/radio_enabled" + category = "Misc" datum/design/synthetic_flash name = "Synthetic Flash" @@ -1277,6 +1300,7 @@ datum/design/synthetic_flash materials = list("$metal" = 750, "$glass" = 750) reliability_base = 76 build_path = "/obj/item/device/flash/synthetic" + category = "Misc" ///////////////////////////////////////// /////////////////Weapons///////////////// diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index d75b3f762d6..8f72d635e5f 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -1085,7 +1085,7 @@ "auS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access = null; req_access_txt = "10; 13"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) -"auV" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/weapon/cable_coil,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/tech) +"auV" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/weapon/cable_coil,/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) "auW" = (/obj/structure/table,/obj/item/weapon/screwdriver{pixel_y = 16},/obj/item/weapon/wirecutters,/turf/simulated/floor/plating,/area/storage/tech) "auX" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/storage/tech) "auY" = (/turf/simulated/floor/plating,/area/storage/tech) @@ -1101,11 +1101,11 @@ "avi" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/clothing/head/welding,/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor,/area/ai_monitored/storage/eva) "avj" = (/obj/machinery/power/apc{dir = 1; name = "EVA APC"; pixel_x = 3; pixel_y = 23},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) "avk" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/device/radio,/obj/item/device/assembly/timer,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) -"avl" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/cell_charger,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) +"avl" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/cell_charger,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "avm" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "avn" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva) "avo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/device/multitool,/turf/simulated/floor,/area/ai_monitored/storage/eva) -"avp" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/ai_monitored/storage/eva) +"avp" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/ai_monitored/storage/eva) "avq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/ai_monitored/storage/eva) "avr" = (/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/head/welding,/turf/simulated/floor,/area/ai_monitored/storage/eva) "avs" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) @@ -1315,14 +1315,14 @@ "azo" = (/obj/structure/table,/obj/item/device/t_scanner,/turf/simulated/floor,/area/storage/primary) "azp" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -8; pixel_y = -4},/obj/item/device/assembly/igniter,/obj/item/weapon/screwdriver{pixel_y = 16},/obj/machinery/camera{c_tag = "Primary Tool Storage"},/obj/machinery/requests_console{department = "Tool Storage"; departmentType = 0; pixel_y = 30},/turf/simulated/floor,/area/storage/primary) "azq" = (/obj/structure/table,/obj/item/device/assembly/signaler,/obj/item/device/assembly/signaler,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/item/device/multitool,/turf/simulated/floor,/area/storage/primary) -"azr" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/light_switch{pixel_y = 28},/turf/simulated/floor,/area/storage/primary) +"azr" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/machinery/light_switch{pixel_y = 28},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) "azs" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/machinery/light{dir = 1},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/storage/primary) "azt" = (/obj/machinery/power/apc{dir = 1; name = "Primary Tool Storage APC"; pixel_x = -1; pixel_y = 26},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/storage/primary) "azu" = (/obj/machinery/vending/tool,/turf/simulated/floor,/area/storage/primary) "azv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/vending/assist,/turf/simulated/floor/plating,/area/storage/tech) "azw" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/powermonitor{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/stationalert{pixel_x = 1; pixel_y = -1},/obj/item/weapon/circuitboard/atmos_alert{pixel_x = 3; pixel_y = -3},/turf/simulated/floor/plating,/area/storage/tech) "azx" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/circuitboard/arcade,/turf/simulated/floor/plating,/area/storage/tech) -"azy" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) +"azy" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = 27},/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) "azz" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/window/reinforced,/obj/machinery/light_construct{dir = 8},/turf/simulated/floor/plating,/area/teleporter/gateway) "azA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/teleporter/gateway) "azB" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/windoor_assembly{dir = 2},/turf/simulated/floor/plating,/area/teleporter/gateway) @@ -1452,7 +1452,7 @@ "aBV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aBW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aBX" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"aBY" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 2; pixel_y = -2},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) +"aBY" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 2; pixel_y = -2},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/screwdriver{pixel_y = 16},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/storage/primary) "aBZ" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor,/area/storage/primary) "aCa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/wall,/area/storage/tech) "aCb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tech) @@ -1525,7 +1525,7 @@ "aDq" = (/obj/structure/closet/coffin,/obj/machinery/door/window/eastleft{name = "Coffin Storage"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) "aDr" = (/obj/machinery/camera{c_tag = "Chapel North"; dir = 2},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aDs" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) -"aDt" = (/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/chapel/main) +"aDt" = (/obj/machinery/mass_driver{dir = 4; id = "chapelgun"},/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Mass Driver"; req_access_txt = "22"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/chapel/main) "aDu" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/chapel/main) "aDv" = (/obj/machinery/door/poddoor{id = "chapelgun"; name = "Chapel Launcher Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/chapel/main) "aDw" = (/obj/effect/landmark{name = "Marauder Entry"},/turf/space,/area) @@ -1889,7 +1889,7 @@ "aKq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aKr" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/effect/landmark/start{name = "Clown"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aKs" = (/obj/effect/landmark/start{name = "Mime"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"aKt" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Theatre Stage"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) +"aKt" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; name = "Theatre Stage"; req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/theatre) "aKu" = (/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aKv" = (/obj/structure/table,/obj/machinery/computer/security/telescreen{desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; name = "Entertainment monitor"; pixel_x = 32; pixel_y = 0},/obj/item/clothing/head/cakehat,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aKw" = (/obj/structure/closet/secure_closet/bar{req_access_txt = "25"},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -2716,7 +2716,7 @@ "bal" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor{icon_state = "arrival"; dir = 4},/area/quartermaster/sorting) "bam" = (/turf/simulated/floor{dir = 8; icon_state = "browncorner"},/area/hallway/primary/central) "ban" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/central) -"bao" = (/obj/machinery/door/window{dir = 1; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Desk Door"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bao" = (/obj/machinery/door/window{dir = 1; icon = 'windoor.dmi'; name = "Captain's Desk Door"; req_access_txt = "20"},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bap" = (/obj/item/weapon/hand_tele,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain) "baq" = (/obj/item/weapon/soap/deluxe,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bar" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/blue,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -2800,7 +2800,7 @@ "bbR" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{dir = 1; icon_state = "carpetside"},/area/crew_quarters/heads) "bbS" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/crew_quarters/heads) "bbT" = (/obj/structure/stool/bed/chair/office/dark{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads) -"bbU" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 8; icon = 'icons/obj/doors/windoor.dmi'; icon_state = "right"; name = "Head of Personnel's Desk"; req_access_txt = "57"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Reception Window"; req_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads) +"bbU" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/window{base_state = "right"; dir = 8; icon = 'windoor.dmi'; icon_state = "right"; name = "Head of Personnel's Desk"; req_access_txt = "57"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/machinery/door/window/northleft{dir = 4; icon_state = "left"; name = "Reception Window"; req_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads) "bbV" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "delivery"},/area/hallway/primary/central) "bbW" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) "bbX" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/central) @@ -3088,7 +3088,7 @@ "bht" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bhu" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/structure/lattice,/turf/space,/area) "bhv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/turret_protected/ai_upload) -"bhw" = (/obj/structure/table,/obj/item/weapon/aiModule/asimov,/obj/item/weapon/aiModule/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon = 'icons/obj/doors/windoor.dmi'; icon_state = "right"; name = "Core Modules"; req_access_txt = "20"},/obj/structure/window/reinforced,/obj/item/weapon/aiModule/corp,/obj/item/weapon/aiModule/paladin,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) +"bhw" = (/obj/structure/table,/obj/item/weapon/aiModule/asimov,/obj/item/weapon/aiModule/freeformcore,/obj/machinery/door/window{base_state = "right"; dir = 4; icon = 'windoor.dmi'; icon_state = "right"; name = "Core Modules"; req_access_txt = "20"},/obj/structure/window/reinforced,/obj/item/weapon/aiModule/corp,/obj/item/weapon/aiModule/paladin,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "bhx" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "bhy" = (/obj/machinery/flasher{pixel_x = 0; pixel_y = 24; id = "AI"},/obj/machinery/computer/borgupload,/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) "bhz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/bluegrid,/area/turret_protected/ai_upload) @@ -3535,7 +3535,7 @@ "bpY" = (/obj/structure/table,/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/igniter{pixel_x = 3; pixel_y = -7},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/item/device/assembly/timer{pixel_x = -3; pixel_y = 3},/obj/machinery/camera{c_tag = "Chemistry South"; dir = 1; network = "SS13"; pixel_x = 22},/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bpZ" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/screwdriver{pixel_y = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bqa" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) -"bqb" = (/obj/machinery/light,/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell,/obj/item/weapon/cell,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) +"bqb" = (/obj/machinery/light,/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bqc" = (/obj/structure/table,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/tech_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bqd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only/hazard{dir = 1; name = "hazard door north"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bqe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only/hazard{dir = 1; name = "hazard door north"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) @@ -4120,9 +4120,9 @@ "bBl" = (/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "bBm" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "bBn" = (/obj/machinery/atmospherics/pipe/simple/insulated,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) -"bBo" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'icons/obj/doors/Doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing) +"bBo" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing) "bBp" = (/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume{dir = 2; frequency = 1449; id = "tox_airlock_pump"},/turf/simulated/floor{icon_state = "dark"},/area/toxins/mixing) -"bBq" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'icons/obj/doors/Doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing) +"bBq" = (/obj/machinery/door/airlock/glass{autoclose = 0; doortype = 21; frequency = 1449; icon = 'doorresearchglass.dmi'; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "7"},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/toxins/mixing) "bBr" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bBs" = (/obj/machinery/door/airlock/external{name = "Toxins Test Chamber"; req_access_txt = "0"},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "bBt" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating/airless,/area/toxins/test_area) @@ -5143,7 +5143,7 @@ "bUU" = (/obj/item/device/radio/intercom{pixel_y = -25},/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bUV" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/gun/syringe,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/surgery) "bUW" = (/obj/structure/table,/obj/structure/bedsheetbin{pixel_x = 2},/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/mask/muzzle,/turf/simulated/floor{dir = 1; icon_state = "whitecorner"},/area/medical/surgery) -"bUX" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/item/weapon/cable_coil,/obj/item/device/multitool,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab) +"bUX" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/item/weapon/cable_coil,/obj/item/device/multitool,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab) "bUY" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/obj/machinery/door/firedoor/border_only/hazard{dir = 4; name = "hazard door east"},/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/toxins/misc_lab) "bUZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plating,/area/toxins/misc_lab) "bVa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/toxins/misc_lab) @@ -5275,7 +5275,7 @@ "bXw" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/port) "bXx" = (/obj/structure/grille,/obj/structure/lattice,/obj/structure/lattice,/turf/space,/area) "bXy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/assembly/assembly_line) -"bXz" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/assembly/assembly_line) +"bXz" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/assembly/assembly_line) "bXA" = (/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/assembly/assembly_line) "bXB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor,/area/assembly/assembly_line) "bXC" = (/obj/effect/landmark/start{name = "Roboticist"},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/assembly/assembly_line) @@ -5326,7 +5326,7 @@ "bYv" = (/obj/machinery/door/poddoor{id = "disvent"; name = "Incinerator Vent"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "bYw" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless,/area/solar/port) "bYx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft) -"bYy" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line) +"bYy" = (/obj/structure/table,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000; pixel_x = 5; pixel_y = -5},/turf/simulated/floor,/area/assembly/assembly_line) "bYz" = (/obj/machinery/conveyor_switch{id = "Skynet_heavy"},/turf/simulated/floor,/area/assembly/assembly_line) "bYA" = (/obj/machinery/mecha_part_fabricator,/turf/simulated/floor,/area/assembly/assembly_line) "bYB" = (/obj/structure/stool,/turf/simulated/floor,/area/assembly/assembly_line) @@ -5631,7 +5631,7 @@ "ceo" = (/obj/machinery/light/small{dir = 8},/obj/structure/closet/wardrobe/black,/turf/simulated/floor/plating,/area/maintenance/aft) "cep" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/aft) "ceq" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/aft) -"cer" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) +"cer" = (/obj/structure/closet/crate,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/sheet/glass{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/machinery/light/small{dir = 8},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/engine/engineering) "ces" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/engine/engineering) "cet" = (/turf/simulated/floor/plating,/area/engine/engineering) "ceu" = (/obj/machinery/door/poddoor{id = "Secure Storage"; name = "Secure Storage"},/turf/simulated/floor/plating,/area/engine/engineering) @@ -5705,7 +5705,7 @@ "cfK" = (/obj/machinery/field_generator,/turf/simulated/floor/plating,/area/engine/engineering) "cfL" = (/obj/machinery/emitter,/turf/simulated/floor/plating,/area/engine/engineering) "cfM" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/machinery/camera{c_tag = "Engineering SMES Room"; dir = 4; network = "SS13"},/turf/simulated/floor,/area/engine/engineering) -"cfN" = (/obj/structure/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/engine/engineering) +"cfN" = (/obj/structure/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/engine/engineering) "cfO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/turf/simulated/floor,/area/engine/engineering) "cfP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/table,/obj/item/weapon/book/manual/engineering_singularity_safety,/obj/item/clothing/gloves/yellow,/turf/simulated/floor,/area/engine/engineering) "cfQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor,/area/engine/engineering) @@ -5718,7 +5718,7 @@ "cfX" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/engine/engineering) "cfY" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/space/rig,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/engine/engineering) "cfZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/engine/chiefs_office) -"cga" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/structure/table/reinforced,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -8},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cell{charge = 100; maxcharge = 15000; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) +"cga" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/structure/table/reinforced,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -8},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "cgb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "cgc" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/lighter/zippo,/obj/item/clothing/glasses/meson{pixel_y = 4},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "cgd" = (/obj/machinery/keycard_auth{pixel_x = 0; pixel_y = -24},/obj/machinery/camera{c_tag = "Engineering CE's Office"; dir = 1; pixel_x = 23},/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) @@ -6176,7 +6176,7 @@ "coN" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "green"},/area/holodeck/source_basketball) "coO" = (/obj/item/weapon/beach_ball/holoball,/turf/simulated/floor/holofloor,/area/holodeck/source_basketball) "coP" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "green"},/area/holodeck/source_basketball) -"coQ" = (/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach) +"coQ" = (/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_state = "sand"; name = "Soft sand"},/area/holodeck/source_beach) "coR" = (/turf/simulated/floor/holofloor{dir = 8; icon_state = "green"},/area/holodeck/source_thunderdomecourt) "coS" = (/turf/simulated/floor/holofloor{dir = 4; icon_state = "green"},/area/holodeck/source_thunderdomecourt) "coT" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns10,/area) @@ -6187,7 +6187,7 @@ "coY" = (/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_basketball) "coZ" = (/obj/structure/holohoop{dir = 1},/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_basketball) "cpa" = (/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_basketball) -"cpb" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'icons/misc/beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach) +"cpb" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/simulated/floor/holofloor{icon = 'beach.dmi'; icon_plating = "water"; icon_regular_floor = "water"; icon_state = "water"; name = "Water"},/area/holodeck/source_beach) "cpc" = (/obj/structure/table/holotable,/turf/simulated/floor/holofloor{dir = 10; icon_state = "green"},/area/holodeck/source_thunderdomecourt) "cpd" = (/obj/structure/table/holotable,/obj/item/clothing/head/helmet/thunderdome,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/under/color/green,/obj/item/weapon/holo/esword/green,/turf/simulated/floor/holofloor{dir = 2; icon_state = "green"},/area/holodeck/source_thunderdomecourt) "cpe" = (/obj/structure/table/holotable,/obj/machinery/readybutton,/turf/simulated/floor/holofloor{dir = 6; icon_state = "green"},/area/holodeck/source_thunderdomecourt) @@ -6318,7 +6318,7 @@ "crz" = (/turf/unsimulated/wall,/area/start) "crA" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start) "crB" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership) -"crC" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) +"crC" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "crD" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership) "crE" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership) "crF" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership) @@ -6392,8 +6392,8 @@ "csV" = (/obj/machinery/vending/cigarette{pixel_x = 0; pixel_y = 0},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "csW" = (/turf/unsimulated/wall,/area/centcom) "csX" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) -"csY" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) -"csZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) +"csY" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) +"csZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) "cta" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom) "ctb" = (/turf/unsimulated/floor{name = "plating"},/area/centcom) "ctc" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -6413,7 +6413,7 @@ "ctq" = (/turf/simulated/floor/plating,/area/shuttle/administration/centcom) "ctr" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/device/multitool,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "cts" = (/obj/structure/table{icon_state = "tabledir"; dir = 2},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) -"ctt" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Equipment Room"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) +"ctt" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; name = "Equipment Room"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "ctu" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "ctv" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/administration/centcom) "ctw" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/simulated/floor/plating,/area/shuttle/administration/centcom) @@ -6460,7 +6460,7 @@ "cul" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/suppy) "cum" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy) "cun" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/centcom/suppy) -"cuo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) +"cuo" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) "cup" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cuq" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cur" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) @@ -6477,12 +6477,12 @@ "cuC" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "cuD" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living) "cuE" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living) -"cuF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) +"cuF" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) "cuG" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/supply/dock) "cuH" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/supply/dock) "cuI" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock) "cuJ" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) -"cuK" = (/obj/machinery/door/window{dir = 4; icon = 'icons/obj/doors/windoor.dmi'; name = "Infirmary"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) +"cuK" = (/obj/machinery/door/window{dir = 4; icon = 'windoor.dmi'; name = "Infirmary"; req_access_txt = "0"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cuL" = (/obj/machinery/door/window/westright{name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cuM" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/obj/effect/landmark{name = "Syndicate-Bomb"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cuN" = (/turf/unsimulated/floor{name = "plating"},/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/administration/centcom) @@ -6492,7 +6492,7 @@ "cuR" = (/turf/simulated/shuttle/wall{tag = "icon-swall3"; icon_state = "swall3"; dir = 2},/area/supply/dock) "cuS" = (/obj/effect/marker/supplymarker,/turf/simulated/shuttle/floor,/area/supply/dock) "cuT" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) -"cuU" = (/obj/machinery/door/window{dir = 8; icon = 'icons/obj/doors/windoor.dmi'; name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) +"cuU" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Tool Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cuV" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "cuW" = (/obj/item/weapon/weldingtool,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cuX" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -6802,7 +6802,7 @@ "cAP" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "NTrasen"; name = "Outer Airlock"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) "cAQ" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/specops/centcom) "cAR" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control) -"cAS" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) +"cAS" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) "cAT" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion (EAST)"; icon_state = "propulsion"; dir = 4},/turf/space,/area/shuttle/specops/centcom) "cAU" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/turf/unsimulated/floor,/area/shuttle/specops/centcom) "cAV" = (/obj/effect/landmark{name = "Commando-Bomb"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) @@ -6861,7 +6861,7 @@ "cBW" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control) "cBX" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cBY" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"cBZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) +"cBZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) "cCa" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/ferry) "cCb" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) "cCc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) @@ -6942,16 +6942,16 @@ "cDz" = (/obj/structure/rack,/obj/item/toy/gun,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cDA" = (/obj/machinery/computer/arcade,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cDB" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/centcom/holding) -"cDC" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) -"cDD" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) +"cDC" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) +"cDD" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) "cDE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "cDF" = (/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/unsimulated/floor{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1; heat_capacity = 1},/area/centcom/evac) "cDG" = (/turf/unsimulated/floor{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1; heat_capacity = 1},/area/centcom/evac) "cDH" = (/obj/structure/table,/obj/item/clothing/head/that,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "cDI" = (/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cDJ" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) -"cDK" = (/obj/item/weapon/camera_test,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) -"cDL" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) +"cDK" = (/obj/item/weapon/camera_test,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) +"cDL" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) "cDM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/centcom/control) "cDN" = (/turf/unsimulated/floor{dir = 6; icon_state = "warning"},/area/centcom/control) "cDO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/centcom/evac) @@ -6962,7 +6962,7 @@ "cDT" = (/obj/structure/table,/obj/item/weapon/lighter/zippo,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "cDU" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) "cDV" = (/obj/structure/table,/obj/item/weapon/dice/d20,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/holding) -"cDW" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) +"cDW" = (/obj/structure/stool{pixel_y = 8},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/centcom/holding) "cDX" = (/turf/unsimulated/wall,/area/tdome) "cDY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome) "cDZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome) @@ -6985,7 +6985,7 @@ "cEq" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cEr" = (/obj/structure/rack,/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cEs" = (/obj/machinery/vending/coffee,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) -"cEt" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding) +"cEt" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding) "cEu" = (/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/centcom/holding) "cEv" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome) "cEw" = (/obj/structure/table/reinforced{dir = 4; icon_state = "reinf_tabledir"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome) @@ -6997,7 +6997,7 @@ "cEC" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access_txt = "1"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "cED" = (/obj/structure/stool{pixel_y = 8},/obj/machinery/computer/security/telescreen{name = "Entertainment monitor"; desc = "Damn, they better have /tg/thechannel on these things."; icon = 'status_display.dmi'; icon_state = "entertainment"; pixel_y = -30},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cEE" = (/obj/machinery/vending/snack,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) -"cEF" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding) +"cEF" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding) "cEG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome) "cEH" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = 28; product_amounts = "5;5;6;3"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cEI" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom) @@ -7006,7 +7006,7 @@ "cEL" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cEM" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) "cEN" = (/obj/machinery/vending/cola,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding) -"cEO" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding) +"cEO" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/centcom/holding) "cEP" = (/turf/unsimulated/floor{dir = 8; icon_state = "red"},/area/tdome) "cEQ" = (/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/tdome) "cER" = (/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) @@ -7089,17 +7089,17 @@ "cGq" = (/obj/item/weapon/extinguisher,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGr" = (/obj/machinery/atmospherics/valve,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGs" = (/obj/structure/stool/bed/chair{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"cGt" = (/turf/unsimulated/wall{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGt" = (/turf/unsimulated/wall{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) "cGu" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGv" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/sleeping_agent{pixel_x = 1},/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGw" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGx" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"cGy" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGz" = (/obj/structure/signpost,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGA" = (/obj/structure/closet,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGy" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGz" = (/obj/structure/signpost,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGA" = (/obj/structure/closet,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) "cGB" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"cGC" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGD" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGC" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGD" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm1"; layer = 10; name = "palm tree"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) "cGE" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGF" = (/obj/structure/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGG" = (/obj/machinery/computer/pod{id = "thunderdomeaxe"; name = "Thunderdome Axe Supply"},/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) @@ -7112,20 +7112,20 @@ "cGN" = (/obj/structure/table,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGO" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/electrical,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) "cGP" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/unsimulated/floor{tag = "icon-redyellowfull (NORTHEAST)"; icon_state = "redyellowfull"; dir = 5},/area/tdome/tdomeadmin) -"cGQ" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGS" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGT" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGU" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGV" = (/obj/item/weapon/beach_ball,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGW" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGX" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) -"cGY" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "crab2"; name = "crab"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGQ" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach2.dmi'; icon_state = "palm2"; layer = 10; name = "palm tree"},/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "coconuts"; name = "coconuts"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGR" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGS" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGT" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGU" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/obj/item/weapon/reagent_containers/food/drinks/cola,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGV" = (/obj/item/weapon/beach_ball,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGW" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGX" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "crab"; name = "crab"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) +"cGY" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "crab2"; name = "crab"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "sand"; name = "sand"},/area/beach) "cGZ" = (/turf/unsimulated/wall{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"; name = "water"},/area/beach) "cHa" = (/turf/unsimulated/floor{icon = 'icons/misc/beach2.dmi'; icon_state = "sandwater"},/area/beach) -"cHb" = (/turf/unsimulated/wall{icon = 'icons/misc/beach.dmi'; icon_state = "water"},/area/beach) -"cHc" = (/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/beach) -"cHd" = (/obj/effect/overlay{anchored = 1; icon = 'icons/misc/beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'icons/misc/beach.dmi'; icon_state = "water"; name = "water"},/area/beach) +"cHb" = (/turf/unsimulated/wall{icon = 'beach.dmi'; icon_state = "water"},/area/beach) +"cHc" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach) +"cHd" = (/obj/effect/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach) "cHe" = (/turf/unsimulated/wall,/area/wizard_station) "cHf" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/obj/effect/decal/cleanable/cobweb,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cHg" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) @@ -7145,7 +7145,7 @@ "cHu" = (/obj/structure/table/woodentable,/obj/effect/landmark{name = "Teleport-Scroll"},/turf/unsimulated/floor{dir = 6; icon_state = "carpetside"},/area/wizard_station) "cHv" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cHw" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/wizard_station) -"cHx" = (/turf/unsimulated/wall{icon = 'icons/turf/walls.dmi'; icon_state = "rock"; name = "rock"},/area/planet/clown) +"cHx" = (/turf/unsimulated/wall{icon = 'walls.dmi'; icon_state = "rock"; name = "rock"},/area/planet/clown) "cHy" = (/turf/unsimulated/wall{icon = 'floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown) "cHz" = (/obj/structure/bookcase,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cHA" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) @@ -7199,7 +7199,7 @@ "cIw" = (/obj/effect/decal/cleanable/molten_item,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/wizard_station) "cIx" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cIy" = (/obj/item/trash/chips,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"cIz" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "The unearthly energies that once powered this blade are now dormant"; icon = 'icons/obj/wizard.dmi'; icon_state = "render"; name = "Veil Render"},/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) +"cIz" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "The unearthly energies that once powered this blade are now dormant"; icon = 'wizard.dmi'; icon_state = "render"; name = "Veil Render"},/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) "cIA" = (/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) "cIB" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "An all purpose knife for ritualistic sacrifice."; name = "Ritual knife"},/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station) "cIC" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) @@ -7834,7 +7834,7 @@ "cUH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "cUI" = (/obj/machinery/door/window,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor,/area/derelict/bridge/access) "cUJ" = (/turf/simulated/wall/r_wall,/area/derelict/bridge) -"cUK" = (/obj/machinery/door/window{dir = 2; icon = 'icons/obj/doors/windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge) +"cUK" = (/obj/machinery/door/window{dir = 2; icon = 'windoor.dmi'; name = "Captain's Quarters"; req_access_txt = "20"},/obj/structure/grille,/turf/simulated/floor/plating/airless,/area/derelict/bridge) "cUL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "cUM" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "cUN" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) @@ -7940,7 +7940,7 @@ "cWJ" = (/obj/item/weapon/shard{icon_state = "medium"},/turf/simulated/floor/plating/airless,/area/derelict/medical) "cWK" = (/obj/machinery/door/airlock/external{name = "External Engineering"},/turf/simulated/floor/plating/airless,/area) "cWL" = (/turf/simulated/floor/airless{icon_state = "damaged4"},/area/derelict/hallway/primary) -"cWM" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor,/area/derelict/arrival) +"cWM" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/turf/simulated/floor,/area/derelict/arrival) "cWN" = (/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical) "cWO" = (/obj/item/weapon/firstaid_arm_assembly,/turf/simulated/floor/airless{icon_state = "white"},/area/derelict/medical) "cWP" = (/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/medical) @@ -8012,8 +8012,8 @@ "cYd" = (/obj/item/weapon/pen,/turf/simulated/floor,/area/derelict/arrival) "cYe" = (/obj/machinery/door/poddoor{id = "derelict_gun"; name = "Derelict Mass Driver"},/turf/simulated/floor/plating,/area/derelict/medical/chapel) "cYf" = (/turf/simulated/floor/plating,/area/derelict/medical/chapel) -"cYg" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "derelict_gun"},/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel) -"cYh" = (/obj/machinery/door/window{icon = 'icons/obj/doors/windoor.dmi'; dir = 8},/turf/simulated/floor/airless,/area/derelict/medical/chapel) +"cYg" = (/obj/machinery/mass_driver{dir = 8; icon_state = "mass_driver"; id = "derelict_gun"},/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 4; req_access_txt = "25"},/obj/structure/closet/coffin,/turf/simulated/floor/plating,/area/derelict/medical/chapel) +"cYh" = (/obj/machinery/door/window{icon = 'windoor.dmi'; dir = 8},/turf/simulated/floor/airless,/area/derelict/medical/chapel) "cYi" = (/turf/simulated/floor/airless,/area/derelict/medical/chapel) "cYj" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/medical/chapel) "cYk" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Worn-out APC"; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/airless,/area/derelict/medical/chapel)