diff --git a/code/controllers/subsystem/networks/id_access.dm b/code/controllers/subsystem/networks/id_access.dm index fe400776232..548d892ce81 100644 --- a/code/controllers/subsystem/networks/id_access.dm +++ b/code/controllers/subsystem/networks/id_access.dm @@ -249,88 +249,88 @@ SUBSYSTEM_DEF(id_access) /// Setup dictionary that converts access levels to text descriptions. /datum/controller/subsystem/id_access/proc/setup_access_descriptions() - desc_by_access["[ACCESS_CARGO]"] = "Cargo Bay" - desc_by_access["[ACCESS_SECURITY]"] = "Security" - desc_by_access["[ACCESS_BRIG]"] = "Holding Cells" - desc_by_access["[ACCESS_COURT]"] = "Courtroom" - desc_by_access["[ACCESS_DETECTIVE]"] = "Detective Office" - desc_by_access["[ACCESS_MEDICAL]"] = "Medical" - desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab" - desc_by_access["[ACCESS_MORGUE]"] = "Morgue" - desc_by_access["[ACCESS_MORGUE_SECURE]"] = "Coroner" - desc_by_access["[ACCESS_SCIENCE]"] = "R&D Lab" - desc_by_access["[ACCESS_ORDNANCE]"] = "Ordnance Lab" - desc_by_access["[ACCESS_ORDNANCE_STORAGE]"] = "Ordnance Storage" - desc_by_access["[ACCESS_PLUMBING]"] = "Chemistry Lab" - desc_by_access["[ACCESS_RD]"] = "RD Office" - desc_by_access["[ACCESS_BAR]"] = "Bar" - desc_by_access["[ACCESS_JANITOR]"] = "Custodial Closet" - desc_by_access["[ACCESS_ENGINEERING]"] = "Engineering" - desc_by_access["[ACCESS_ENGINE_EQUIP]"] = "Power and Engineering Equipment" - desc_by_access["[ACCESS_MAINT_TUNNELS]"] = "Maintenance" - desc_by_access["[ACCESS_EXTERNAL_AIRLOCKS]"] = "External Airlocks" - desc_by_access["[ACCESS_CHANGE_IDS]"] = "ID Console" - desc_by_access["[ACCESS_AI_UPLOAD]"] = "AI Chambers" - desc_by_access["[ACCESS_TELEPORTER]"] = "Teleporter" - desc_by_access["[ACCESS_EVA]"] = "EVA" - desc_by_access["[ACCESS_COMMAND]"] = "Command" - desc_by_access["[ACCESS_CAPTAIN]"] = "Captain" - desc_by_access["[ACCESS_ALL_PERSONAL_LOCKERS]"] = "Personal Lockers" - desc_by_access["[ACCESS_CHAPEL_OFFICE]"] = "Chapel Office" - desc_by_access["[ACCESS_TECH_STORAGE]"] = "Technical Storage" - desc_by_access["[ACCESS_ATMOSPHERICS]"] = "Atmospherics" - desc_by_access["[ACCESS_CREMATORIUM]"] = "Crematorium" - desc_by_access["[ACCESS_ARMORY]"] = "Armory" - desc_by_access["[ACCESS_CONSTRUCTION]"] = "Construction" - desc_by_access["[ACCESS_KITCHEN]"] = "Kitchen" - desc_by_access["[ACCESS_HYDROPONICS]"] = "Hydroponics" - desc_by_access["[ACCESS_LIBRARY]"] = "Library" - desc_by_access["[ACCESS_LAWYER]"] = "Law Office" - desc_by_access["[ACCESS_ROBOTICS]"] = "Robotics" - desc_by_access["[ACCESS_VIROLOGY]"] = "Virology" - desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology" - desc_by_access["[ACCESS_CMO]"] = "CMO Office" - desc_by_access["[ACCESS_PARAMEDIC]"] = "Paramedic Office" - desc_by_access["[ACCESS_QM]"] = "QM Office" - desc_by_access["[ACCESS_SURGERY]"] = "Surgery" - desc_by_access["[ACCESS_THEATRE]"] = "Theatre" - desc_by_access["[ACCESS_RESEARCH]"] = "Science" - desc_by_access["[ACCESS_MINING]"] = "Mining Dock" - desc_by_access["[ACCESS_SHIPPING]"] = "Cargo Shipping" - desc_by_access["[ACCESS_VAULT]"] = "Main Vault" - desc_by_access["[ACCESS_MINING_STATION]"] = "Mining Outpost" - desc_by_access["[ACCESS_XENOBIOLOGY]"] = "Xenobiology Lab" - desc_by_access["[ACCESS_HOP]"] = "HoP Office" - desc_by_access["[ACCESS_HOS]"] = "HoS Office" - desc_by_access["[ACCESS_CE]"] = "CE Office" - desc_by_access["[ACCESS_PHARMACY]"] = "Pharmacy" - desc_by_access["[ACCESS_RC_ANNOUNCE]"] = "RC Announcements" - desc_by_access["[ACCESS_KEYCARD_AUTH]"] = "Keycode Auth." - desc_by_access["[ACCESS_TCOMMS]"] = "Telecommunications" - desc_by_access["[ACCESS_GATEWAY]"] = "Gateway" - desc_by_access["[ACCESS_BRIG_ENTRANCE]"] = "Brig" - desc_by_access["[ACCESS_MINERAL_STOREROOM]"] = "Mineral Storage" - desc_by_access["[ACCESS_MINISAT]"] = "AI Satellite" - desc_by_access["[ACCESS_WEAPONS]"] = "Weapon Permit" - desc_by_access["[ACCESS_NETWORK]"] = "Network Access" - desc_by_access["[ACCESS_MECH_MINING]"] = "Mining Mech Access" - desc_by_access["[ACCESS_MECH_MEDICAL]"] = "Medical Mech Access" - desc_by_access["[ACCESS_MECH_SECURITY]"] = "Security Mech Access" - desc_by_access["[ACCESS_MECH_SCIENCE]"] = "Science Mech Access" - desc_by_access["[ACCESS_MECH_ENGINE]"] = "Engineering Mech Access" - desc_by_access["[ACCESS_AUX_BASE]"] = "Auxiliary Base" - desc_by_access["[ACCESS_SERVICE]"] = "Service Hallway" - desc_by_access["[ACCESS_CENT_GENERAL]"] = "CentCom General Access" - desc_by_access["[ACCESS_CENT_THUNDER]"] = "CentCom Thunderdome" - desc_by_access["[ACCESS_CENT_STORAGE]"] = "CentCom Storage" - desc_by_access["[ACCESS_CENT_LIVING]"] = "CentCom Living Quarters" - desc_by_access["[ACCESS_CENT_MEDICAL]"] = "CentCom Medical" - desc_by_access["[ACCESS_CENT_TELEPORTER]"] = "CentCom Teleporter" - desc_by_access["[ACCESS_CENT_SPECOPS]"] = "CentCom SpecOps" - desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "CentCom Captain" - desc_by_access["[ACCESS_CENT_BAR]"] = "CentCom Bar" - desc_by_access["[ACCESS_CENT_OFFICER]"] = "CentCom Officer" - desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den" + desc_by_access[ACCESS_CARGO] = "Cargo Bay" + desc_by_access[ACCESS_SECURITY] = "Security" + desc_by_access[ACCESS_BRIG] = "Holding Cells" + desc_by_access[ACCESS_COURT] = "Courtroom" + desc_by_access[ACCESS_DETECTIVE] = "Detective Office" + desc_by_access[ACCESS_MEDICAL] = "Medical" + desc_by_access[ACCESS_GENETICS] = "Genetics Lab" + desc_by_access[ACCESS_MORGUE] = "Morgue" + desc_by_access[ACCESS_MORGUE_SECURE] = "Coroner" + desc_by_access[ACCESS_SCIENCE] = "R&D Lab" + desc_by_access[ACCESS_ORDNANCE] = "Ordnance Lab" + desc_by_access[ACCESS_ORDNANCE_STORAGE] = "Ordnance Storage" + desc_by_access[ACCESS_PLUMBING] = "Chemistry Lab" + desc_by_access[ACCESS_RD] = "RD Office" + desc_by_access[ACCESS_BAR] = "Bar" + desc_by_access[ACCESS_JANITOR] = "Custodial Closet" + desc_by_access[ACCESS_ENGINEERING] = "Engineering" + desc_by_access[ACCESS_ENGINE_EQUIP] = "Power and Engineering Equipment" + desc_by_access[ACCESS_MAINT_TUNNELS] = "Maintenance" + desc_by_access[ACCESS_EXTERNAL_AIRLOCKS] = "External Airlocks" + desc_by_access[ACCESS_CHANGE_IDS] = "ID Console" + desc_by_access[ACCESS_AI_UPLOAD] = "AI Chambers" + desc_by_access[ACCESS_TELEPORTER] = "Teleporter" + desc_by_access[ACCESS_EVA] = "EVA" + desc_by_access[ACCESS_COMMAND] = "Command" + desc_by_access[ACCESS_CAPTAIN] = "Captain" + desc_by_access[ACCESS_ALL_PERSONAL_LOCKERS] = "Personal Lockers" + desc_by_access[ACCESS_CHAPEL_OFFICE] = "Chapel Office" + desc_by_access[ACCESS_TECH_STORAGE] = "Technical Storage" + desc_by_access[ACCESS_ATMOSPHERICS] = "Atmospherics" + desc_by_access[ACCESS_CREMATORIUM] = "Crematorium" + desc_by_access[ACCESS_ARMORY] = "Armory" + desc_by_access[ACCESS_CONSTRUCTION] = "Construction" + desc_by_access[ACCESS_KITCHEN] = "Kitchen" + desc_by_access[ACCESS_HYDROPONICS] = "Hydroponics" + desc_by_access[ACCESS_LIBRARY] = "Library" + desc_by_access[ACCESS_LAWYER] = "Law Office" + desc_by_access[ACCESS_ROBOTICS] = "Robotics" + desc_by_access[ACCESS_VIROLOGY] = "Virology" + desc_by_access[ACCESS_PSYCHOLOGY] = "Psychology" + desc_by_access[ACCESS_CMO] = "CMO Office" + desc_by_access[ACCESS_PARAMEDIC] = "Paramedic Office" + desc_by_access[ACCESS_QM] = "QM Office" + desc_by_access[ACCESS_SURGERY] = "Surgery" + desc_by_access[ACCESS_THEATRE] = "Theatre" + desc_by_access[ACCESS_RESEARCH] = "Science" + desc_by_access[ACCESS_MINING] = "Mining Dock" + desc_by_access[ACCESS_SHIPPING] = "Cargo Shipping" + desc_by_access[ACCESS_VAULT] = "Main Vault" + desc_by_access[ACCESS_MINING_STATION] = "Mining Outpost" + desc_by_access[ACCESS_XENOBIOLOGY] = "Xenobiology Lab" + desc_by_access[ACCESS_HOP] = "HoP Office" + desc_by_access[ACCESS_HOS] = "HoS Office" + desc_by_access[ACCESS_CE] = "CE Office" + desc_by_access[ACCESS_PHARMACY] = "Pharmacy" + desc_by_access[ACCESS_RC_ANNOUNCE] = "RC Announcements" + desc_by_access[ACCESS_KEYCARD_AUTH] = "Keycode Auth." + desc_by_access[ACCESS_TCOMMS] = "Telecommunications" + desc_by_access[ACCESS_GATEWAY] = "Gateway" + desc_by_access[ACCESS_BRIG_ENTRANCE] = "Brig" + desc_by_access[ACCESS_MINERAL_STOREROOM] = "Mineral Storage" + desc_by_access[ACCESS_MINISAT] = "AI Satellite" + desc_by_access[ACCESS_WEAPONS] = "Weapon Permit" + desc_by_access[ACCESS_NETWORK] = "Network Access" + desc_by_access[ACCESS_MECH_MINING] = "Mining Mech Access" + desc_by_access[ACCESS_MECH_MEDICAL] = "Medical Mech Access" + desc_by_access[ACCESS_MECH_SECURITY] = "Security Mech Access" + desc_by_access[ACCESS_MECH_SCIENCE] = "Science Mech Access" + desc_by_access[ACCESS_MECH_ENGINE] = "Engineering Mech Access" + desc_by_access[ACCESS_AUX_BASE] = "Auxiliary Base" + desc_by_access[ACCESS_SERVICE] = "Service Hallway" + desc_by_access[ACCESS_CENT_GENERAL] = "CentCom General Access" + desc_by_access[ACCESS_CENT_THUNDER] = "CentCom Thunderdome" + desc_by_access[ACCESS_CENT_STORAGE] = "CentCom Storage" + desc_by_access[ACCESS_CENT_LIVING] = "CentCom Living Quarters" + desc_by_access[ACCESS_CENT_MEDICAL] = "CentCom Medical" + desc_by_access[ACCESS_CENT_TELEPORTER] = "CentCom Teleporter" + desc_by_access[ACCESS_CENT_SPECOPS] = "CentCom SpecOps" + desc_by_access[ACCESS_CENT_CAPTAIN] = "CentCom Captain" + desc_by_access[ACCESS_CENT_BAR] = "CentCom Bar" + desc_by_access[ACCESS_CENT_OFFICER] = "CentCom Officer" + desc_by_access[ACCESS_BIT_DEN] = "Bitrunner Den" /** * Returns the access bitflags associated with any given access level. diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm index 703a485405d..2a0475302b4 100644 --- a/code/game/atom/atom_act.dm +++ b/code/game/atom/atom_act.dm @@ -253,7 +253,7 @@ * Default behaviour is to send [COMSIG_ATOM_RCD_ACT] and return FALSE */ /atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - SEND_SIGNAL(src, COMSIG_ATOM_RCD_ACT, user, the_rcd, rcd_data["[RCD_DESIGN_MODE]"]) + SEND_SIGNAL(src, COMSIG_ATOM_RCD_ACT, user, the_rcd, rcd_data[RCD_DESIGN_MODE]) return FALSE ///Return the values you get when an RCD eats you? diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 484e7e57f8f..17c88afe648 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1688,7 +1688,7 @@ return FALSE /obj/machinery/door/airlock/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_DECONSTRUCT) qdel(src) return TRUE diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index c3b1c0dd2a0..82d75de6cc3 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -951,7 +951,7 @@ return FALSE /obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_UPGRADE_SIMPLE_CIRCUITS) user.balloon_alert(user, "circuit installed") constructionStep = CONSTRUCTION_PANEL_OPEN diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 7579756590f..65fbe58e7e7 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -484,7 +484,7 @@ return FALSE /obj/machinery/door/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT) + if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT) qdel(src) return TRUE return FALSE diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index ec65d2c3a92..de2e334f540 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -513,7 +513,7 @@ return FALSE /obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_WALLFRAME) balloon_alert_to_viewers("circuit installed") buildstage = FIRE_ALARM_BUILD_NO_WIRES diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm index 09a177a1175..951580514a4 100644 --- a/code/game/objects/items/rcd/RCD.dm +++ b/code/game/objects/items/rcd/RCD.dm @@ -68,9 +68,9 @@ design_category = GLOB.rcd_designs[root_category][1] var/list/design = GLOB.rcd_designs[root_category][design_category][1] - rcd_design_path = design["[RCD_DESIGN_PATH]"] + rcd_design_path = design[RCD_DESIGN_PATH] design_title = initial(rcd_design_path.name) - mode = design["[RCD_DESIGN_MODE]"] + mode = design[RCD_DESIGN_MODE] construction_mode = mode GLOB.rcd_list += src @@ -138,8 +138,8 @@ * * [mob][user]- the user */ /obj/item/construction/rcd/proc/can_place(atom/target, list/rcd_results, mob/user) - var/rcd_mode = rcd_results["[RCD_DESIGN_MODE]"] - var/atom/movable/rcd_structure = rcd_results["[RCD_DESIGN_PATH]"] + var/rcd_mode = rcd_results[RCD_DESIGN_MODE] + var/atom/movable/rcd_structure = rcd_results[RCD_DESIGN_PATH] /** *For anything that does not go an a wall we have to make sure that turf is clear for us to put the structure on it *If we are just trying to destroy something then this check is not necessary @@ -257,8 +257,8 @@ balloon_alert(user, "too durable!") return ITEM_INTERACT_BLOCKING - rcd_results["[RCD_DESIGN_MODE]"] = mode - rcd_results["[RCD_DESIGN_PATH]"] = rcd_design_path + rcd_results[RCD_DESIGN_MODE] = mode + rcd_results[RCD_DESIGN_PATH] = rcd_design_path var/delay = rcd_results["delay"] * delay_mod if ( @@ -272,10 +272,10 @@ var/target_name = target.name //Store this information before it gets mutated by the rcd. var/target_path = target.type - var/atom/design_path = rcd_results["[RCD_DESIGN_PATH]"] + var/atom/design_path = rcd_results[RCD_DESIGN_PATH] var/location = AREACOORD(target) if(_rcd_create_effect(target, user, delay, rcd_results)) - log_tool("[key_name(user)] used [src] to [rcd_results["[RCD_DESIGN_MODE]"] != RCD_DECONSTRUCT ? "construct [initial(design_path.name)]([design_path])" : "deconstruct [target_name]([target_path])"] at [location]") + log_tool("[key_name(user)] used [src] to [rcd_results[RCD_DESIGN_MODE] != RCD_DECONSTRUCT ? "construct [initial(design_path.name)]([design_path])" : "deconstruct [target_name]([target_path])"] at [location]") current_active_effects -= 1 return ITEM_INTERACT_SUCCESS @@ -292,7 +292,7 @@ /obj/item/construction/rcd/proc/_rcd_create_effect(atom/target, mob/user, delay, list/rcd_results) PRIVATE_PROC(TRUE) - var/obj/effect/constructing_effect/rcd_effect = new(get_turf(target), delay, rcd_results["[RCD_DESIGN_MODE]"], construction_upgrades) + var/obj/effect/constructing_effect/rcd_effect = new(get_turf(target), delay, rcd_results[RCD_DESIGN_MODE], construction_upgrades) //resource & structure placement sanity checks before & after delay along with beam effects if(!useResource(rcd_results["cost"], user, TRUE) || !can_place(target, rcd_results, user)) @@ -421,9 +421,9 @@ if(design == null) //not a valid design return TRUE design_category = category_name - mode = design["[RCD_DESIGN_MODE]"] + mode = design[RCD_DESIGN_MODE] construction_mode = mode - rcd_design_path = design["[RCD_DESIGN_PATH]"] + rcd_design_path = design[RCD_DESIGN_PATH] design_title = initial(rcd_design_path.name) blueprint_changed = TRUE diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index a58dfd8abf4..bea64c05e8c 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -377,7 +377,7 @@ return FALSE /obj/structure/door_assembly/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT) + if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT) qdel(src) return TRUE return FALSE diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 70bee1f8f05..1b80d84dd01 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -524,7 +524,7 @@ return FALSE /obj/structure/girder/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_TURF) if(the_rcd.rcd_design_path != /turf/open/floor/plating/rcd) return FALSE diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index d21f7d457ab..141af49f66d 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -92,7 +92,7 @@ return FALSE /obj/structure/grille/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_DECONSTRUCT) qdel(src) return TRUE @@ -106,7 +106,7 @@ if(!clear_tile(user)) return FALSE - var/obj/structure/window/window_path = rcd_data["[RCD_DESIGN_PATH]"] + var/obj/structure/window/window_path = rcd_data[RCD_DESIGN_PATH] if(!ispath(window_path)) CRASH("Invalid window path type in RCD: [window_path]") diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index dd07dc3b965..7e0ec16d69a 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -86,8 +86,8 @@ return FALSE /obj/structure/lattice/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF) - var/design_structure = rcd_data["[RCD_DESIGN_PATH]"] + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF) + var/design_structure = rcd_data[RCD_DESIGN_PATH] if(design_structure == /turf/open/floor/plating/rcd) var/turf/T = src.loc if(isgroundlessturf(T)) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 72ad60b3c46..0f9403cfdf0 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -427,7 +427,7 @@ return FALSE /obj/structure/table/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT) + if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT) qdel(src) return TRUE return FALSE diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a0bd2032f05..fd786385993 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -105,7 +105,7 @@ return FALSE /obj/structure/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT) + if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT) qdel(src) return TRUE return FALSE diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index a416091aed5..5b4e791f8e2 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -224,7 +224,7 @@ .["delay"] *= RCD_RWALL_DELAY_MULT /turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(the_rcd.canRturf || rcd_data["[RCD_DESIGN_MODE]"] == RCD_WALLFRAME) + if(the_rcd.canRturf || rcd_data[RCD_DESIGN_MODE] == RCD_WALLFRAME) return ..() /turf/closed/wall/r_wall/rust_turf() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 21e645a0c70..1df2ea0251b 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -265,9 +265,9 @@ return FALSE /turf/closed/wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_WALLFRAME) - var/obj/item/wallframe/wallmount = rcd_data["[RCD_DESIGN_PATH]"] + var/obj/item/wallframe/wallmount = rcd_data[RCD_DESIGN_PATH] var/obj/item/wallframe/new_wallmount = new wallmount(user.drop_location()) if(new_wallmount.interact_with_atom(src, user) == ITEM_INTERACT_SUCCESS) return TRUE diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm index e490abceda7..df1278b29d4 100644 --- a/code/game/turfs/open/chasm.dm +++ b/code/game/turfs/open/chasm.dm @@ -42,7 +42,7 @@ return FALSE /turf/open/chasm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd) place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 0d7ef76fbd8..268af20d19e 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -268,7 +268,7 @@ return FALSE /turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - switch(rcd_data["[RCD_DESIGN_MODE]"]) + switch(rcd_data[RCD_DESIGN_MODE]) if(RCD_TURF) var/obj/structure/girder/girder = locate() in src if(girder) @@ -282,7 +282,7 @@ return grille.rcd_act(user, the_rcd, rcd_data) //allow directional windows to be built without grills - var/obj/structure/window/window_path = rcd_data["[RCD_DESIGN_PATH]"] + var/obj/structure/window/window_path = rcd_data[RCD_DESIGN_PATH] if(!initial(window_path.fulltile)) if(!valid_build_direction(src, user.dir, is_fulltile = FALSE)) balloon_alert(user, "window already here!") @@ -296,7 +296,7 @@ grille.set_anchored(TRUE) return TRUE if(RCD_AIRLOCK) - var/obj/machinery/door/airlock_type = rcd_data["[RCD_DESIGN_PATH]"] + var/obj/machinery/door/airlock_type = rcd_data[RCD_DESIGN_PATH] if(ispath(airlock_type, /obj/machinery/door/window)) if(!valid_build_direction(src, user.dir, is_fulltile = FALSE)) @@ -330,7 +330,7 @@ assembly.finish_door() return TRUE if(RCD_STRUCTURE) - var/atom/movable/design_type = rcd_data["[RCD_DESIGN_PATH]"] + var/atom/movable/design_type = rcd_data[RCD_DESIGN_PATH] //map absolute types to basic subtypes var/atom/movable/locate_type = design_type diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm index 8aa5c2ed393..2a440db7c74 100644 --- a/code/game/turfs/open/floor/plating.dm +++ b/code/game/turfs/open/floor/plating.dm @@ -187,7 +187,7 @@ return list("delay" = 0, "cost" = 1) /turf/open/floor/plating/foam/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd) ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index b362b8deff7..2cdf33542ae 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -190,7 +190,7 @@ return FALSE /turf/open/lava/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd) place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm index fcc5b2e3692..666ad1aef85 100644 --- a/code/game/turfs/open/misc.dm +++ b/code/game/turfs/open/misc.dm @@ -89,8 +89,8 @@ return FALSE /turf/open/misc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF) - if(rcd_data["[RCD_DESIGN_PATH]"] != /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF) + if(rcd_data[RCD_DESIGN_PATH] != /turf/open/floor/plating/rcd) return FALSE place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index d2149766faa..3f76eaab81d 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -142,7 +142,7 @@ return FALSE /turf/open/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd) place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE return FALSE diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index 4879e32dc31..edb8a337987 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -174,10 +174,10 @@ GLOBAL_LIST_EMPTY(starlight) /turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) if(the_rcd.mode == RCD_TURF) - if(rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd) + if(rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd) place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) return TRUE - else if(rcd_data["[RCD_DESIGN_PATH]"] == /obj/structure/lattice/catwalk) + else if(rcd_data[RCD_DESIGN_PATH] == /obj/structure/lattice/catwalk) var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src) if(lattice) qdel(lattice) diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm index 6061fbfc032..943a10766bb 100644 --- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm @@ -51,7 +51,7 @@ return FALSE /obj/machinery/airalarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_WALLFRAME) + if(rcd_data[RCD_DESIGN_MODE] == RCD_WALLFRAME) balloon_alert(user, "circuit installed") buildstage = AIR_ALARM_BUILD_NO_WIRES update_appearance() diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 66f745129be..fb85fe054ba 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -157,7 +157,7 @@ All the important duct code: if(ispath(drop_on_wrench)) var/obj/item/stack/ducts/duct_stack = new drop_on_wrench(drop_location()) duct_stack.duct_color = GLOB.pipe_color_name[duct_color] || DUCT_COLOR_OMNI - duct_stack.duct_layer = GLOB.plumbing_layer_names["[duct_layer]"] || GLOB.plumbing_layer_names["[DUCT_LAYER_DEFAULT]"] + duct_stack.duct_layer = GLOB.plumbing_layer_names["[duct_layer]"] || GLOB.plumbing_layer_names[DUCT_LAYER_DEFAULT] duct_stack.add_atom_colour(duct_color, FIXED_COLOUR_PRIORITY) drop_on_wrench = null if(!QDELING(src)) diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index 71bd3f226d3..f74860662bd 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -407,7 +407,7 @@ return FALSE /obj/machinery/power/apc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data) - if(!(the_rcd.construction_upgrades & RCD_UPGRADE_SIMPLE_CIRCUITS) || rcd_data["[RCD_DESIGN_MODE]"] != RCD_WALLFRAME) + if(!(the_rcd.construction_upgrades & RCD_UPGRADE_SIMPLE_CIRCUITS) || rcd_data[RCD_DESIGN_MODE] != RCD_WALLFRAME) return FALSE if(!has_electronics) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 366df8adbf9..8430b7b2d1d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -258,6 +258,7 @@ custom_materials = null grind_results = null emp_damage_modifier = 0 + abstract_type = /obj/item/stock_parts/power_store/cell/ethereal /obj/item/stock_parts/power_store/cell/ethereal/examine(mob/user) . = ..() diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index e40bf4299c5..ee45ebef611 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -67,24 +67,20 @@ item_reactions = list() valid_items = list() - for(var/I in typesof(/obj/item)) - if(ispath(I, /obj/item/relic)) - item_reactions["[I]"] = SCANTYPE_DISCOVER + for(var/obj/item/item_path as anything in valid_subtypesof(/obj/item)) + if(ispath(item_path, /obj/item/relic)) + item_reactions["[item_path]"] = SCANTYPE_DISCOVER else - item_reactions["[I]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) + item_reactions["[item_path]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) - if(is_type_in_typecache(I, banned_typecache)) + if(is_type_in_typecache(item_path, banned_typecache)) continue - if(ispath(I, /obj/item/stock_parts) || ispath(I, /obj/item/grenade/chem_grenade) || ispath(I, /obj/item/knife)) - var/obj/item/tempCheck = I - if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way - valid_items["[I]"] += 15 + if(ispath(item_path, /obj/item/stock_parts) || ispath(item_path, /obj/item/grenade/chem_grenade) || ispath(item_path, /obj/item/knife)) + valid_items["[item_path]"] += 15 - if(ispath(I, /obj/item/food)) - var/obj/item/tempCheck = I - if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way - valid_items["[I]"] += rand(1,4) + if(ispath(item_path, /obj/item/food)) + valid_items["[item_path]"] += rand(1,4) /obj/machinery/rnd/experimentor/Initialize(mapload) . = ..()