diff --git a/code/__DEFINES/ZAS.dm b/code/__DEFINES/atmospherics/environmental.dm similarity index 100% rename from code/__DEFINES/ZAS.dm rename to code/__DEFINES/atmospherics/environmental.dm diff --git a/code/__DEFINES/holomap.dm b/code/__DEFINES/holomap.dm index a5ee3688d72..78169363bbd 100644 --- a/code/__DEFINES/holomap.dm +++ b/code/__DEFINES/holomap.dm @@ -2,8 +2,6 @@ // Constants and standard colors for the holomap // -#define WORLD_ICON_SIZE 32 // Size of a standard tile in pixels (world.icon_size) -#define PIXEL_MULTIPLIER WORLD_ICON_SIZE/32 // Convert from normal icon size of 32 to whatever insane thing this server is using. #define HOLOMAP_ICON 'icons/480x480.dmi' // Icon file to start with when drawing holomaps (to get a 480x480 canvas). #define HOLOMAP_ICON_SIZE 480 // Pixel width & height of the holomap icon. Used for auto-centering etc. #define ui_holomap "CENTER-7, CENTER-7" // Screen location of the holomap "hud" @@ -49,4 +47,4 @@ #define HOLOMAP_EXTRA_STATIONMAP "stationmapformatted" #define HOLOMAP_EXTRA_STATIONMAPAREAS "stationareas" -#define HOLOMAP_EXTRA_STATIONMAPSMALL "stationmapsmall" \ No newline at end of file +#define HOLOMAP_EXTRA_STATIONMAPSMALL "stationmapsmall" diff --git a/code/__DEFINES/xenoarcheaology.dm b/code/__DEFINES/xenoarcheaology.dm index 8a4988b78c0..8037e2922d5 100644 --- a/code/__DEFINES/xenoarcheaology.dm +++ b/code/__DEFINES/xenoarcheaology.dm @@ -73,4 +73,4 @@ #define EFFECT_PARTICLE 4 #define EFFECT_ORGANIC 5 #define EFFECT_BLUESPACE 6 -#define EFFECT_SYNTH 7 \ No newline at end of file +#define EFFECT_SYNTH 7 diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 8ef81a64961..950cd2a87cf 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -86,13 +86,13 @@ var/obj/screen/robot_inventory action_intent = using //Cell - mymob:cells = new /obj/screen() - mymob:cells.icon = ui_style - mymob:cells.icon_state = "charge-empty" - mymob:cells.alpha = ui_alpha - mymob:cells.name = "cell" - mymob:cells.screen_loc = ui_toxin - src.other += mymob:cells + mymob.cells = new /obj/screen() + mymob.cells.icon = ui_style + mymob.cells.icon_state = "charge-empty" + mymob.cells.alpha = ui_alpha + mymob.cells.name = "cell" + mymob.cells.screen_loc = ui_toxin + src.other += mymob.cells //Health mymob.healths = new /obj/screen() @@ -195,7 +195,7 @@ var/obj/screen/robot_inventory mymob.client.screen = list() - mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob:cells, mymob.pullin, robot_inventory, mymob.gun_setting_icon) + mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob.cells, mymob.pullin, robot_inventory, mymob.gun_setting_icon) mymob.client.screen += src.adding + src.other mymob.client.screen += mymob.client.void @@ -278,4 +278,4 @@ var/obj/screen/robot_inventory /mob/living/silicon/robot/update_hud() if(modtype) hands.icon_state = lowertext(modtype) - ..() \ No newline at end of file + ..() diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index 5b452972b19..a525381cd21 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -25,7 +25,7 @@ SUBSYSTEM_DEF(transcore) var/datum/transhuman/mind_record/list/backed_up = list() // All known mind records, indexed by MR.mindname/mind.name var/datum/transhuman/mind_record/list/has_left = list() // Why do we even have this? var/datum/transhuman/body_record/list/body_scans = list() // All known body records, indexed by BR.mydna.name - var/list/obj/item/implant/backup/list/implants = list() // All OPERATING implants that are being ticked + var/list/obj/item/implant/backup/implants = list() // All OPERATING implants that are being ticked var/list/current_run = list() @@ -167,14 +167,14 @@ SUBSYSTEM_DEF(transcore) global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical") // Called from mind_record to add itself to the transcore. -/datum/controller/subsystem/transcore/proc/add_backup(var/datum/transhuman/mind_record/MR) +/datum/controller/subsystem/transcore/proc/add_backup(datum/transhuman/mind_record/MR) ASSERT(MR) backed_up[MR.mindname] = MR backed_up = sortTim(backed_up, /proc/cmp_text_asc, TRUE) subsystem_log("Added [MR.mindname] to transcore DB.") // Remove a mind_record from the backup-checking list. Keeps track of it in has_left // Why do we do that? ~Leshana -/datum/controller/subsystem/transcore/proc/stop_backup(var/datum/transhuman/mind_record/MR) +/datum/controller/subsystem/transcore/proc/stop_backup(datum/transhuman/mind_record/MR) ASSERT(MR) has_left[MR.mindname] = MR backed_up.Remove("[MR.mindname]") @@ -182,20 +182,20 @@ SUBSYSTEM_DEF(transcore) subsystem_log("Put [MR.mindname] in transcore suspended DB.") // Called from body_record to add itself to the transcore. -/datum/controller/subsystem/transcore/proc/add_body(var/datum/transhuman/body_record/BR) +/datum/controller/subsystem/transcore/proc/add_body(datum/transhuman/body_record/BR) ASSERT(BR) body_scans[BR.mydna.name] = BR body_scans = sortTim(body_scans, /proc/cmp_text_asc, TRUE) subsystem_log("Added [BR.mydna.name] to transcore body DB.") // Remove a body record from the database (Usually done when someone cryos) // Why? ~Leshana -/datum/controller/subsystem/transcore/proc/remove_body(var/datum/transhuman/body_record/BR) +/datum/controller/subsystem/transcore/proc/remove_body(datum/transhuman/body_record/BR) ASSERT(BR) body_scans.Remove("[BR.mydna.name]") subsystem_log("Removed [BR.mydna.name] from transcore body DB.") // Moves all mind records from the databaes into the disk and shuts down all backup canary processing. -/datum/controller/subsystem/transcore/proc/core_dump(var/obj/item/disk/transcore/disk) +/datum/controller/subsystem/transcore/proc/core_dump(obj/item/disk/transcore/disk) ASSERT(disk) global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Command") global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Medical") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 681ac918a18..de547498770 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -238,7 +238,7 @@ var/mob/def_target = null var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain) if (objective&&(objective.type in objective_list) && objective:target) - def_target = objective:target.current + def_target = objective.target.current var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets if (!new_target) return diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index 9bb71ec08e6..a2514533c9b 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -47,7 +47,7 @@ var/datum/antagonist/highlander/highlanders var/obj/item/card/id/W = new(player) W.name = "[player.real_name]'s ID Card" W.icon_state = "centcom" - W.access = get_all_station_access().Copy + W.access = get_all_station_access() W.access |= get_all_centcom_access() W.assignment = "Highlander" W.registered_name = player.real_name diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 23d8c7b60fa..d13e35b5424 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -77,10 +77,6 @@ var/global/list/datum/dna/gene/dna_genes[0] // Used for genes that check for value rather than a binary on/off. #define GENE_ALWAYS_ACTIVATE 1 -// Skip checking if it's already active. -// Used for genes that check for value rather than a binary on/off. -#define GENE_ALWAYS_ACTIVATE 1 - /datum/dna // READ-ONLY, GETS OVERWRITTEN // DO NOT FUCK WITH THESE OR BYOND WILL EAT YOUR FACE diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index efd27d82e3f..c073b800100 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -194,7 +194,7 @@ sleep(300) // Hack all APCs, including those built during hack sequence. for(var/obj/machinery/power/apc/A in machines) - if((!A.hacker || A.hacker != src) && !A.aidisabled && A.z in GLOB.using_map.station_levels) + if((!A.hacker || (A.hacker != src)) && !A.aidisabled && (A.z in GLOB.using_map.station_levels)) A.ai_hack(src) @@ -206,4 +206,4 @@ user.verbs += new/datum/game_mode/malfunction/verb/ai_destroy_station() -// END ABILITY VERBS \ No newline at end of file +// END ABILITY VERBS diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index ea6f6823263..8e01b3b9cdc 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -53,9 +53,9 @@ continue if(L.invisibility > owner.see_invisible) // Don't target ourselves or people we can't see. continue - if(!L in viewers(owner)) // So we don't shoot at walls if someone is hiding behind one. + if(!(L in viewers(owner))) // So we don't shoot at walls if someone is hiding behind one. continue if(!L.stat) // Don't want to target dead people or SSDs. chosen_target = L break - return chosen_target \ No newline at end of file + return chosen_target diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index b9ed2159cdb..4f328a2ead4 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -49,9 +49,9 @@ return /obj/machinery/optable/CanAllowThrough(atom/movable/mover, turf/target) + . = ..() if(istype(mover) && mover.checkpass(PASSTABLE)) return TRUE - return FALSE /obj/machinery/optable/MouseDrop_T(obj/O as obj, mob/user as mob) @@ -132,4 +132,4 @@ if(patient.buckled) to_chat(usr, "Unbuckle \the [patient] first!") return 0 - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 2911f15a9a6..78a7b2466c1 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -6,7 +6,7 @@ /mob/living/silicon/ai/var/stored_locations[0] /proc/InvalidPlayerTurf(turf/T as turf) - return !(T && T.z in GLOB.using_map.player_levels) + return !(T && (T.z in GLOB.using_map.player_levels)) /mob/living/silicon/ai/proc/get_camera_list() if(src.stat == 2) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 9a1ba16fe75..cd928431731 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -158,7 +158,8 @@ if(newjob in job.alt_titles) foundjob = job break - if(!newjob in getOpenOnDutyJobs(usr, SSjobs.GetJob(card.rank).department)) + var/datum/job/cardjob = SSjobs.GetJob(card.rank) + if(!(newjob in getOpenOnDutyJobs(usr, cardjob.department))) return if(foundjob && card) card.access = foundjob.get_access() @@ -271,4 +272,4 @@ /obj/machinery/computer/timeclock/premade/west dir = 4 - pixel_x = -26 \ No newline at end of file + pixel_x = -26 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0a576d3373f..15320f16268 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -822,7 +822,7 @@ About the new airlock wires panel: if (user) src.attack_ai(user) -/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target) +/obj/machinery/door/airlock/Bumped(atom/movable/mover, turf/target) if (src.isElectrified()) if (istype(mover, /obj/item)) var/obj/item/i = mover diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 9f9a8f8c787..2d68032271d 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -298,7 +298,7 @@ // Broadcast the signal - radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) + radio_connection.post_signal(src, signal, RADIO_MAGNETS) spawn(1) updateUsrDialog() // pretty sure this increases responsiveness @@ -365,7 +365,7 @@ // Broadcast the signal spawn() - radio_connection.post_signal(src, signal, filter = RADIO_MAGNETS) + radio_connection.post_signal(src, signal, RADIO_MAGNETS) if(speed == 10) sleep(1) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index a9c2993136a..2e45cb14c95 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -298,7 +298,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(CHANNEL.is_admin_channel) dat+="[CHANNEL.channel_name]
" else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : null]
" dat+="
Refresh" dat+="
Back" if(2) @@ -323,11 +323,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(6) dat+="ERROR: Could not submit Feed story to Network.

" if(channel_name=="") - dat+="•Invalid receiving channel name.
" + dat+="�Invalid receiving channel name.
" if(scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="�Channel author unverified.
" if(msg == "" || msg == "\[REDACTED\]") - dat+="•Invalid message body.
" + dat+="�Invalid message body.
" dat+="
Return
" if(7) @@ -339,18 +339,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else existing_authors += FC.author if(scanned_user in existing_authors) - dat+="•There already exists a Feed channel under your name.
" + dat+="�There already exists a Feed channel under your name.
" if(channel_name=="" || channel_name == "\[REDACTED\]") - dat+="•Invalid channel name.
" + dat+="�Invalid channel name.
" var/check = 0 for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == channel_name) check = 1 break if(check) - dat+="•Channel name already in use.
" + dat+="�Channel name already in use.
" if(scanned_user=="Unknown") - dat+="•Channel author unverified.
" + dat+="�Channel author unverified.
" dat+="
Return
" if(8) var/total_num=length(news_network.network_channels) @@ -396,7 +396,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="No feed channels found active...
" else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ]
" dat+="
Cancel" if(11) dat+="[GLOB.using_map.company_name] D-Notice Handler
" @@ -407,7 +407,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="No feed channels found active...
" else for(var/datum/feed_channel/CHANNEL in news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : null]
" dat+="
Back" if(12) @@ -464,11 +464,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(16) dat+="ERROR: Wanted Issue rejected by Network.

" if(channel_name=="" || channel_name == "\[REDACTED\]") - dat+="•Invalid name for person wanted.
" + dat+="�Invalid name for person wanted.
" if(scanned_user=="Unknown") - dat+="•Issue author unverified.
" + dat+="�Issue author unverified.
" if(msg == "" || msg == "\[REDACTED\]") - dat+="•Invalid description.
" + dat+="�Invalid description.
" dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" @@ -814,7 +814,7 @@ obj/item/newspaper/attack_self(mob/user as mob) switch(screen) if(0) //Cover dat+="
The Griffon
" - dat+="
[GLOB.using_map.company_name]-standard newspaper, for use on [GLOB.using_map.company_name]© Space Facilities
" + dat+="
[GLOB.using_map.company_name]-standard newspaper, for use on [GLOB.using_map.company_name]� Space Facilities
" if(!length(news_content)) if(important_message) dat+="Contents:
" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index bac408bbc6d..d23c3ffdc11 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -251,4 +251,4 @@ #undef FOND_SIZE #undef FONT_COLOR #undef FONT_STYLE -#undef SCROLL_SPEED \ No newline at end of file +#undef SCROLL_SPEED diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index b7f142e0baa..966541972ea 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -7,7 +7,7 @@ name = "window grille spawner" icon = 'icons/obj/structures.dmi' icon_state = "wingrille" - density = 1 + density = TRUE anchored = 1.0 pressure_resistance = 4*ONE_ATMOSPHERE can_atmos_pass = ATMOS_PASS_NO @@ -23,9 +23,6 @@ /obj/effect/wingrille_spawn/attack_generic() activate() -/obj/effect/wingrille_spawn/CanAllowThrough(atom/movable/mover, turf/target) - return FALSE - /obj/effect/wingrille_spawn/Initialize() . = ..() if(!win_path) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 01d027dedae..ad9beb0b88b 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -79,7 +79,7 @@ var/output = "Radio Report
" for (var/fq in radio_controller.frequencies) output += "Freq: [fq]
" - var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq] + var/datum/radio_frequency/fqs = radio_controller.frequencies[fq] if (!fqs) output += "  ERROR
" continue diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 42539f10063..6523e66075f 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -43,8 +43,6 @@ GLOBAL_LIST_BOILERPLATE(all_debugging_effects, /obj/effect/debugging) set category = "Mapping" set name = "-None of these are for ingame use!!" - ..() - /client/proc/camera_view() set category = "Mapping" set name = "Camera Range Display" diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 5779e3a9018..ee4259e63d4 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -103,7 +103,8 @@ special_assembly.HasProximity(AM) -/obj/item/assembly_holder/Crossed(atom/movable/AM as mob|obj) +/obj/item/assembly_holder/Crossed(atom/movable/AM) + . = ..() if(a_left) a_left.Crossed(AM) if(a_right) @@ -111,7 +112,6 @@ if(special_assembly) special_assembly.Crossed(AM) - /obj/item/assembly_holder/on_found(mob/finder as mob) if(a_left) a_left.on_found(finder) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 31bd952a5a5..ae6e1081d07 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -241,13 +241,11 @@ hit() return -/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj) +/obj/effect/beam/i_beam/Crossed(atom/movable/AM) + . = ..() if(istype(AM, /obj/effect/beam)) return - spawn(0) - hit() - return - return + hit() /obj/effect/beam/i_beam/Destroy() . = ..() diff --git a/code/modules/atmospherics/atmospherics.dm b/code/modules/atmospherics/atmospherics.dm index 8f288b976ac..d912b2e461b 100644 --- a/code/modules/atmospherics/atmospherics.dm +++ b/code/modules/atmospherics/atmospherics.dm @@ -143,7 +143,7 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network) // Used when two pipe_networks are combining -/obj/machinery/atmospherics/proc/return_network_air(datum/network/reference) +/obj/machinery/atmospherics/proc/return_network_air(datum/pipe_network/reference) // Return a list of gas_mixture(s) in the object // associated with reference pipe_network for use in rebuilding the networks gases list // Is permitted to return null