diff --git a/.gitignore b/.gitignore
index 2bd093799f23..c0f3ce122633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,10 @@
*.lk
*.int
*.backup
+
+# Opendream compile result
+citadel.json
+
### https://raw.github.com/github/gitignore/cc542de017c606138a87ee4880e5f06b3a306def/Global/Linux.gitignore
*~
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index df763019a039..87869168fcf6 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,6 +7,7 @@
"stylemistake.auto-comment-blocks",
"donkie.vscode-tgstation-test-adapter",
"anturk.dmi-editor",
- "aaron-bond.better-comments"
+ "aaron-bond.better-comments",
+ "ss13.opendream"
]
}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 19869cde1dce..c140cec35d60 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -15,6 +15,13 @@
"name": "Launch DreamSeeker",
"preLaunchTask": "Build All",
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
+ },
+ {
+ "type": "opendream",
+ "request": "launch",
+ "name": "OpenDream",
+ "preLaunchTask": "OpenDream: compile ${command:CurrentDME}",
+ "json_path": "${workspaceFolder}/${command:CurrentJson}"
}
]
}
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index ef5f557edf27..a20c0a9b1a6e 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -80,7 +80,7 @@ GLOBAL_VAR_INIT(roundstart_hour, pick(2,7,12,17))
* Returns 1 if it is the selected month and day.
*/
/proc/isDay(var/month, var/day)
- if(isnum(month) && isnum(day))\
+ if(isnum(month) && isnum(day))
/// Get the current month.
var/MM = text2num(time2text(world.timeofday, "MM"))
/// Get the current day.
diff --git a/code/___compile_options.dm b/code/___compile_options.dm
index 0e18d0108079..ed656eb5a738 100644
--- a/code/___compile_options.dm
+++ b/code/___compile_options.dm
@@ -137,7 +137,7 @@
#endif
// ## LEGACY WARNING
-#if !defined(CBT) && !defined(SPACEMAN_DMM)
+#if !(defined(CBT) || defined(SPACEMAN_DMM) || defined(OPENDREAM))
#warn Building with Dream Maker is no longer supported and will result in errors.
#warn In order to build, run BUILD.bat in the root directory.
#warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build.
diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm
index 1d7cf7eed2f7..25bfb0bd6db9 100644
--- a/code/controllers/subsystem/mobs.dm
+++ b/code/controllers/subsystem/mobs.dm
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(mobs)
var/slept_mobs = 0
/datum/controller/subsystem/mobs/stat_entry()
- return ..() + " P: [global.GLOB.mob_list.len] | S: [slept_mobs]"
+ return ..() + " P: [GLOB.mob_list.len] | S: [slept_mobs]"
/datum/controller/subsystem/mobs/fire(resumed = 0)
var/list/busy_z_levels = src.busy_z_levels
diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm
index b85f92d07306..1545a91280b0 100644
--- a/code/controllers/subsystem/overlays.dm
+++ b/code/controllers/subsystem/overlays.dm
@@ -166,7 +166,7 @@ SUBSYSTEM_DEF(overlays)
else { \
appearance_bro.appearance = origin; \
if (!ispath(origin)) { \
- appearance_bro.dir = origin.dir; \
+ appearance_bro.dir = origin:dir; \
} \
target = appearance_bro.appearance; \
}
@@ -174,7 +174,7 @@ SUBSYSTEM_DEF(overlays)
// If the overlay has a planeset (e.g., emissive), mark for ZM mangle. This won't catch overlays on overlays, but the flag can just manually be set in that case.
#define ZM_AUTOMANGLE(target) if ((target):plane != FLOAT_PLANE) { SSoverlays.context_needs_automangle = TRUE; }
-/atom/proc/build_appearance_list(atom/new_overlays)
+/atom/proc/build_appearance_list(list/new_overlays)
var/static/image/appearance_bro = new
if (islist(new_overlays))
// A lot of code seems to assume that it's safe to pass long-lived lists to SSoverlays.
@@ -190,7 +190,7 @@ SUBSYSTEM_DEF(overlays)
APPEARANCEIFY(new_overlays, .)
// The same as the above, but with ZM_AUTOMANGLE.
-/atom/movable/build_appearance_list(atom/new_overlays)
+/atom/movable/build_appearance_list(list/new_overlays)
var/static/image/appearance_bro = new
if (islist(new_overlays))
new_overlays = new_overlays:Copy()
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index f3dfb5f75fad..1956e08c89e1 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -373,7 +373,7 @@
occupantData["name"] = connected.occupant.real_name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
- if (MUTATION_NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
+ if ((MUTATION_NOCLONE in connected.occupant.mutations) || !src.connected.occupant.dna)
occupantData["isViableSubject"] = 0
occupantData["health"] = connected.occupant.health
occupantData["maxHealth"] = connected.occupant.maxHealth
diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm
index dc51cc74d559..4712718eef10 100644
--- a/code/game/gamemodes/events/power_failure.dm
+++ b/code/game/gamemodes/events/power_failure.dm
@@ -7,7 +7,7 @@
for(var/obj/machinery/power/smes/S in GLOB.machines)
var/area/current_area = get_area(S)
- if(current_area.type in skipped_areas || !(S.z in (LEGACY_MAP_DATUM).station_levels))
+ if((current_area.type in skipped_areas) || !(S.z in (LEGACY_MAP_DATUM).station_levels))
continue
S.last_charge = S.charge
S.last_output_attempt = S.output_attempt
@@ -34,7 +34,7 @@
C.cell.charge = C.cell.maxcharge
for(var/obj/machinery/power/smes/S in GLOB.machines)
var/area/current_area = get_area(S)
- if(current_area.type in skipped_areas || isNotStationLevel(S.z))
+ if((current_area.type in skipped_areas) || isNotStationLevel(S.z))
continue
if(S.powerout_holders_used)
S.charge = S.last_charge
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index ca842dd509bb..99b4b1e6e3f5 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -593,7 +593,7 @@ datum
weight = 20
get_points(var/job)
- if(job in science_positions || job in command_positions)
+ if((job in science_positions) || (job in command_positions))
return 20
return 40
diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm
index 36156cf71e1d..9f35a7a73223 100644
--- a/code/game/machinery/computer/supply.dm
+++ b/code/game/machinery/computer/supply.dm
@@ -109,7 +109,7 @@
shuttle_status["engine"] = "Engaged"
else
- shuttle["mode"] = SUP_SHUTTLE_ERROR
+ shuttle_status["mode"] = SUP_SHUTTLE_ERROR
for(var/pack_name in SSsupply.legacy_supply_packs)
var/datum/supply_pack/P = SSsupply.legacy_supply_packs[pack_name]
diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm
index c3d4f223eb96..f6daa7fd28a6 100644
--- a/code/game/machinery/doors/door_vr.dm
+++ b/code/game/machinery/doors/door_vr.dm
@@ -43,7 +43,7 @@
var/obj/item/weldingtool/welder = I
if(welder.remove_fuel(0,user))
- to_chat(user, "You start weld \the plasteel into place.")
+ to_chat(user, "You start weld the plasteel into place.")
playsound(src, welder.tool_sound, 50, 1)
if(do_after(user, 10 * welder.tool_speed) && welder && welder.isOn())
to_chat(user, "You finish reinforcing \the [src].")
diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm
index 6c7cd305216f..a2cf6a659191 100644
--- a/code/game/machinery/oxygen_pump.dm
+++ b/code/game/machinery/oxygen_pump.dm
@@ -117,7 +117,7 @@
return
//when there is a breather:
if(breather && target != breather)
- to_chat(user, SPAN_WARNING("\The pump is already in use."))
+ to_chat(user, SPAN_WARNING("The pump is already in use."))
return
//Checking if breather is still valid
if(target == breather && target.wear_mask != contained)
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 47de7902a893..6ae67f191463 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -551,7 +551,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/atom/proc/test_telecomms()
var/datum/signal/signal = src.telecomms_process()
var/pos_z = get_z(src)
- return (pos_z in signal.data["level"] && signal.data["done"])
+ return ((pos_z in signal.data["level"]) && signal.data["done"])
/atom/proc/telecomms_process(var/do_sleep = 1)
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index a6673e2ed6de..57d948371125 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -126,7 +126,7 @@
if("network")
var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text
- if(newnet && ((usr in range(1, src) || issilicon(usr))))
+ if(newnet && (((usr in range(1, src)) || issilicon(usr))))
if(length(newnet) > 15)
set_temp("FAILED: NETWORK TAG STRING TOO LENGTHY", "bad")
return TRUE
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index ddf0bc204dd3..2877ce98bdd4 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -99,7 +99,7 @@
if("network")
var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text
- if(newnet && ((usr in range(1, src) || issilicon(usr))))
+ if(newnet && ((usr in range(1, src)) || issilicon(usr)))
if(length(newnet) > 15)
set_temp("FAILED: NETWORK TAG STRING TOO LENGTHY", "bad")
return TRUE
diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm
index f9d4af3472bf..5e3651932009 100644
--- a/code/game/machinery/wall_frames.dm
+++ b/code/game/machinery/wall_frames.dm
@@ -69,7 +69,7 @@
var/turf/loc = get_turf(user)
var/area/A = loc.loc
if(!istype(loc, /turf/simulated/floor))
- to_chat(user, "\The frame cannot be placed on this spot.")
+ to_chat(user, "The frame cannot be placed on this spot.")
return
if(A.requires_power == 0 || A.name == "Space")
diff --git a/code/game/objects/items/stacks/matter_synth.dm b/code/game/objects/items/stacks/matter_synth.dm
index d92cd5f8dda8..64216c46e1eb 100644
--- a/code/game/objects/items/stacks/matter_synth.dm
+++ b/code/game/objects/items/stacks/matter_synth.dm
@@ -4,9 +4,11 @@
var/recharge_rate = 2000
var/energy
-/datum/matter_synth/New(var/store = 0)
+/datum/matter_synth/New(var/store = 0, var/name = null)
if(store)
max_energy = store
+ if(name)
+ src.name = name
energy = max_energy
return
diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm
index ad8f68939402..05f1c7681468 100644
--- a/code/game/objects/structures/medical_stand_vr.dm
+++ b/code/game/objects/structures/medical_stand_vr.dm
@@ -274,7 +274,7 @@
to_chat(user, "There is no tank in \the [src].")
return
if(is_loosen)
- to_chat(user, "Tighten \the nut with a wrench first.")
+ to_chat(user, "Tighten the nut with a wrench first.")
return
if(!Adjacent(target))
return
diff --git a/code/game/turfs/simulated/misc/fancy_shuttles.dm b/code/game/turfs/simulated/misc/fancy_shuttles.dm
index aa1ceeca9099..678354d356c2 100644
--- a/code/game/turfs/simulated/misc/fancy_shuttles.dm
+++ b/code/game/turfs/simulated/misc/fancy_shuttles.dm
@@ -96,7 +96,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles)
do_plane = SPACE_PLANE
do_state = "white"
- under_EM = mutable_appearance('icons/turf/space.dmi', "white", src.plane = LIGHTING_PLANE)
+ under_EM = mutable_appearance('icons/turf/space.dmi', "white", plane = LIGHTING_PLANE)
under_EM.filters = filter(type = "alpha", icon = icon(src.icon, src.icon_state), flags = MASK_INVERSE)
under_MA = mutable_appearance(do_icon, do_state, layer = src.layer-0.02, plane = do_plane)
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index b901bf1f84dd..45da5598369d 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -261,7 +261,7 @@ GLOBAL_LIST_EMPTY(buildholders)
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
master.buildmode.varholder = input(usr,"Enter variable name:" ,"Name", "name")
- if(master.buildmode.varholder in locked && !check_rights(R_DEBUG,0))
+ if((master.buildmode.varholder in locked) && !check_rights(R_DEBUG,0))
return 1
var/thetype = input(usr,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
if(!thetype) return 1
diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm
index 58a215d74cd2..28bdaead151c 100644
--- a/code/modules/admin/view_variables/debug_variables.dm
+++ b/code/modules/admin/view_variables/debug_variables.dm
@@ -3,11 +3,12 @@
var/header
if(D)
if(islist(D))
+ var/list/D_l = D
var/index = name
if (value)
- name = D[name] //name is really the index until this line
+ name = D_l[name] //name is really the index until this line
else
- value = D[name]
+ value = D_l[name]
header = "([VV_HREF_TARGET_1V(D, VV_HK_LIST_EDIT, "E", index)]) ([VV_HREF_TARGET_1V(D, VV_HK_LIST_CHANGE, "C", index)]) ([VV_HREF_TARGET_1V(D, VV_HK_LIST_REMOVE, "-", index)]) "
else
header = "([VV_HREF_TARGET_1V(D, VV_HK_BASIC_EDIT, "E", name)]) ([VV_HREF_TARGET_1V(D, VV_HK_BASIC_CHANGE, "C", name)]) ([VV_HREF_TARGET_1V(D, VV_HK_BASIC_MASSEDIT, "M", name)]) "
diff --git a/code/modules/ai/holders/polaris/ai_holder_targeting.dm b/code/modules/ai/holders/polaris/ai_holder_targeting.dm
index bb119d77f86b..9f2f90656264 100644
--- a/code/modules/ai/holders/polaris/ai_holder_targeting.dm
+++ b/code/modules/ai/holders/polaris/ai_holder_targeting.dm
@@ -243,7 +243,7 @@
ai_log("react_to_attack_polaris() : Was attacked by [attacker], but we already have a target.", AI_LOG_TRACE)
on_attacked(attacker) // So we attack immediately and not threaten.
return FALSE
- else if(attacker in attackers && world.time > last_target_time + 3 SECONDS) // Otherwise, let 'er rip
+ else if((attacker in attackers) && world.time > last_target_time + 3 SECONDS) // Otherwise, let 'er rip
ai_log("react_to_attack_polaris() : Was attacked by [attacker]. Can retaliate, waited 3 seconds.", AI_LOG_INFO)
on_attacked(attacker) // So we attack immediately and not threaten.
return give_target(attacker) // Also handles setting the appropiate stance.
diff --git a/code/modules/artwork/crayon.dm b/code/modules/artwork/crayon.dm
index 5a96f1a575ee..fc1051634f79 100644
--- a/code/modules/artwork/crayon.dm
+++ b/code/modules/artwork/crayon.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(crayon_data_lookup_by_string_icon_path)
var/width = icon.Width()
var/height = icon.Height()
// pass path in directly
- var/list/states = fast_icon_states(icon_path)
+ var/list/states = icon_states(icon_path)
if(!islist(states))
stack_trace("failed to parse states for crayon pack [icon_path]")
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index b4dde9fa9bc3..4bb061d0d29f 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -103,7 +103,7 @@
msg = emoji_parse(msg)
- if((msg[1] in list(".",";",":","#") || findtext_char(msg, "say", 1, 5))) //SSticker.HasRoundStarted() &&
+ if(((msg[1] in list(".",";",":","#")) || findtext_char(msg, "say", 1, 5))) //SSticker.HasRoundStarted() &&
if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
return
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 26efe9469664..acb4b4120171 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -108,7 +108,7 @@
var/obj/item/pda/pda = O
id_card = pda.id
- if(ACCESS_SECURITY_EQUIPMENT in id_card.access || emagged)
+ if((ACCESS_SECURITY_EQUIPMENT in id_card.access) || emagged)
to_chat(user, "You imprint your ID details onto the badge.")
set_name(user.real_name)
else
diff --git a/code/modules/gamemaster/actions/_action.dm b/code/modules/gamemaster/actions/_action.dm
index 933c8939987b..4f3147906360 100644
--- a/code/modules/gamemaster/actions/_action.dm
+++ b/code/modules/gamemaster/actions/_action.dm
@@ -25,3 +25,11 @@
/datum/gm_action/proc/announce()
return
+
+/datum/gm_action/proc/pick_weight(var/mundande_weight, var/moderate_weight, var/major_weight)
+ var/picked = rand(1, mundande_weight + moderate_weight + major_weight)
+ if(picked < mundande_weight)
+ return EVENT_LEVEL_MUNDANE
+ if(picked < mundande_weight + moderate_weight)
+ return EVENT_LEVEL_MODERATE
+ return EVENT_LEVEL_MAJOR
diff --git a/code/modules/gamemaster/actions/atmos_leak.dm b/code/modules/gamemaster/actions/atmos_leak.dm
index bda6f5c4864c..9496865369e1 100644
--- a/code/modules/gamemaster/actions/atmos_leak.dm
+++ b/code/modules/gamemaster/actions/atmos_leak.dm
@@ -17,10 +17,7 @@
// Decide which area will be targeted!
/datum/gm_action/atmos_leak/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 8,
- EVENT_LEVEL_MODERATE = 5,
- EVENT_LEVEL_MAJOR = 3
- )
+ severity = pick_weight(mundande_weight = 8, moderate_weight = 5, major_weight = 3)
var/gas_choices = list(GAS_ID_CARBON_DIOXIDE, GAS_ID_NITROUS_OXIDE) // Annoying
if(severity >= EVENT_LEVEL_MODERATE)
diff --git a/code/modules/gamemaster/actions/blob.dm b/code/modules/gamemaster/actions/blob.dm
index 7a42937733cc..3b392d6b8c0c 100644
--- a/code/modules/gamemaster/actions/blob.dm
+++ b/code/modules/gamemaster/actions/blob.dm
@@ -18,10 +18,7 @@
var/spawn_blob_type = /obj/structure/blob/core/random_medium
/datum/gm_action/blob/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 4,
- EVENT_LEVEL_MODERATE = 2,
- EVENT_LEVEL_MAJOR = 1
- )
+ severity = pick_weight(mundande_weight = 4, moderate_weight = 2, major_weight = 1)
var/list/area/grand_list_of_areas = get_station_areas(excluded)
diff --git a/code/modules/gamemaster/actions/camera_damage.dm b/code/modules/gamemaster/actions/camera_damage.dm
index 4c5e22b61374..24246b8a66b5 100644
--- a/code/modules/gamemaster/actions/camera_damage.dm
+++ b/code/modules/gamemaster/actions/camera_damage.dm
@@ -10,10 +10,7 @@
..()
var/severity_range = 0
- severity = pickweight(EVENT_LEVEL_MUNDANE = 10,
- EVENT_LEVEL_MODERATE = 5,
- EVENT_LEVEL_MAJOR = 1
- )
+ severity = pick_weight(mundande_weight = 10, moderate_weight = 5, major_weight = 1)
switch(severity)
if(EVENT_LEVEL_MUNDANE)
diff --git a/code/modules/gamemaster/actions/electrified_door.dm b/code/modules/gamemaster/actions/electrified_door.dm
index c1d4ff1ad914..8691f6c0169a 100644
--- a/code/modules/gamemaster/actions/electrified_door.dm
+++ b/code/modules/gamemaster/actions/electrified_door.dm
@@ -13,10 +13,7 @@
/datum/gm_action/electrified_door/set_up()
var/list/area/grand_list_of_areas = get_station_areas(excluded)
- severity = pickweight(EVENT_LEVEL_MUNDANE = 10,
- EVENT_LEVEL_MODERATE = 5,
- EVENT_LEVEL_MAJOR = 1
- )
+ severity = pick_weight(mundande_weight = 10, moderate_weight = 5, major_weight = 1)
//try 10 times
for(var/i in 1 to 10)
diff --git a/code/modules/gamemaster/actions/meteor_defense.dm b/code/modules/gamemaster/actions/meteor_defense.dm
index 95fab26bb7a3..08497f6cea54 100644
--- a/code/modules/gamemaster/actions/meteor_defense.dm
+++ b/code/modules/gamemaster/actions/meteor_defense.dm
@@ -23,9 +23,7 @@
return weight
/datum/gm_action/meteor_defense/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 10,
- EVENT_LEVEL_MODERATE = 3
- )
+ severity = pick_weight(mundande_weight = 10, moderate_weight = 3, major_weight = 0)
switch(severity)
if(EVENT_LEVEL_MUNDANE)
diff --git a/code/modules/gamemaster/actions/spider_infestation.dm b/code/modules/gamemaster/actions/spider_infestation.dm
index 89e1e9c8bb3a..a2a3fa0b26b0 100644
--- a/code/modules/gamemaster/actions/spider_infestation.dm
+++ b/code/modules/gamemaster/actions/spider_infestation.dm
@@ -10,10 +10,10 @@
var/spawntype = /obj/effect/spider/spiderling
/datum/gm_action/spider_infestation/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = max(1,(12 - (3 * metric.count_people_in_department(DEPARTMENT_SECURITY)))),
- EVENT_LEVEL_MODERATE = (7 + (2 * metric.count_people_in_department(DEPARTMENT_SECURITY))),
- EVENT_LEVEL_MAJOR = (1 + (2 * metric.count_people_in_department(DEPARTMENT_SECURITY)))
- )
+ severity = pick_weight(mundande_weight = max(1,(12 - (3 * metric.count_people_in_department(DEPARTMENT_SECURITY)))),
+ moderate_weight = (7 + (2 * metric.count_people_in_department(DEPARTMENT_SECURITY))),
+ major_weight = (1 + (2 * metric.count_people_in_department(DEPARTMENT_SECURITY)))
+ )
switch(severity)
if(EVENT_LEVEL_MUNDANE)
diff --git a/code/modules/gamemaster/actions/stowaway.dm b/code/modules/gamemaster/actions/stowaway.dm
index 72b27ccc5313..9c5fc95a0bfa 100644
--- a/code/modules/gamemaster/actions/stowaway.dm
+++ b/code/modules/gamemaster/actions/stowaway.dm
@@ -19,10 +19,7 @@
)
/datum/gm_action/stowaway/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 20,
- EVENT_LEVEL_MODERATE = 5,
- EVENT_LEVEL_MAJOR = 1
- )
+ severity = pick_weight(mundande_weight = 20, moderate_weight = 5, major_weight = 1)
var/list/area/grand_list_of_areas = get_station_areas(excluded)
diff --git a/code/modules/gamemaster/actions/swarmboarder.dm b/code/modules/gamemaster/actions/swarmboarder.dm
index f1a27138d678..bcc145a3ecf5 100644
--- a/code/modules/gamemaster/actions/swarmboarder.dm
+++ b/code/modules/gamemaster/actions/swarmboarder.dm
@@ -19,10 +19,7 @@
)
/datum/gm_action/swarm_boarder/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 30,
- EVENT_LEVEL_MODERATE = 10,
- EVENT_LEVEL_MAJOR = 1
- )
+ severity = pick_weight(mundande_weight = 30, moderate_weight = 10, major_weight = 1)
var/list/area/grand_list_of_areas = get_station_areas(excluded)
diff --git a/code/modules/gamemaster/actions/viral_infection.dm b/code/modules/gamemaster/actions/viral_infection.dm
index c915a9c5a5b5..9e87b4031e94 100644
--- a/code/modules/gamemaster/actions/viral_infection.dm
+++ b/code/modules/gamemaster/actions/viral_infection.dm
@@ -8,10 +8,7 @@
severity = 1
/datum/gm_action/viral_infection/set_up()
- severity = pickweight(EVENT_LEVEL_MUNDANE = 20,
- EVENT_LEVEL_MODERATE = 10,
- EVENT_LEVEL_MAJOR = 3
- )
+ severity = pick_weight(mundande_weight = 20, moderate_weight = 10, major_weight = 3)
//generate 1-3 viruses. This way there's an upper limit on how many individual diseases need to be cured if many people are initially infected
var/num_diseases = rand(1,3)
diff --git a/code/modules/maps/turf_makers/planetary_turfs.dm b/code/modules/maps/turf_makers/planetary_turfs.dm
index 4bccd32be9d8..9b689e30b2f4 100644
--- a/code/modules/maps/turf_makers/planetary_turfs.dm
+++ b/code/modules/maps/turf_makers/planetary_turfs.dm
@@ -360,7 +360,7 @@ LAVALAND_TURF_CREATE(/turf/simulated/mineral/rich/triumph)
LAVALAND_TURF_CREATE(/turf/simulated/floor/bluegrid)
LAVALAND_TURF_CREATE(/turf/simulated/floor/greengrid)
LAVALAND_TURF_CREATE(/turf/unsimulated/mineral/triumph)
-LAVALAND_TURF_CREATE(/turf/simulated/mineral/)
+LAVALAND_TURF_CREATE(/turf/simulated/mineral)
/turf/simulated/mineral/floor/lavaland
diff --git a/code/modules/mob/inventory/inventory_slot.dm b/code/modules/mob/inventory/inventory_slot.dm
index f465688ef9aa..5ef3563998cb 100644
--- a/code/modules/mob/inventory/inventory_slot.dm
+++ b/code/modules/mob/inventory/inventory_slot.dm
@@ -209,7 +209,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
render_default_icons -= bodytype_str
continue
var/icon/I = render_default_icons[bodytype_str]
- render_state_cache[bodytype_str] = fast_icon_states(I)
+ render_state_cache[bodytype_str] = icon_states(I)
// turn into hash
for(var/state in render_state_cache[bodytype_str])
render_state_cache[bodytype_str][state] = TRUE
@@ -331,7 +331,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
render_rolldown_icons -= bodytype_str
continue
var/icon/I = render_rolldown_icons[bodytype_str]
- render_rolldown_states[bodytype_str] = fast_icon_states(I)
+ render_rolldown_states[bodytype_str] = icon_states(I)
// turn into hash
for(var/state in render_rolldown_states[bodytype_str])
render_rolldown_states[bodytype_str][state] = TRUE
@@ -343,7 +343,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
render_rollsleeve_icons -= bodytype_str
continue
var/icon/I = render_rollsleeve_icons[bodytype_str]
- render_rollsleeve_states[bodytype_str] = fast_icon_states(I)
+ render_rollsleeve_states[bodytype_str] = icon_states(I)
// turn into hash
for(var/state in render_rollsleeve_states[bodytype_str])
render_rollsleeve_states[bodytype_str][state] = TRUE
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index d293d7c59dec..6c03d9fd4db1 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -391,7 +391,7 @@
/obj/item/dogborg/sleeper/proc/inject_chem(mob/user, chem)
if(patient && patient.reagents)
- if(chem in injection_chems + "inaprovaline")
+ if(chem in (injection_chems + "inaprovaline"))
if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it.
to_chat(hound, "You don't have enough power to synthesize fluids.")
return
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/_robot_modules_defs.dm b/code/modules/mob/living/silicon/robot/robot_modules/_robot_modules_defs.dm
index ef2ee2b89a31..5ba30fc06357 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/_robot_modules_defs.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/_robot_modules_defs.dm
@@ -8,7 +8,7 @@
#define MATSYN_PLASTIC "plastic"
#define MATSYN_PLASTEEL "plasteel"
-#define MATTER_SYNTH_WITH_NAME(K,T,N,V...) .[K] = new /datum/matter_synth/##T { name = N } (V)
+#define MATTER_SYNTH_WITH_NAME(K,T,N,V...) .[K] = new /datum/matter_synth/##T (V, name = N)
#define MATTER_SYNTH(K,T,V...) .[K] = new /datum/matter_synth/##T (V)
#define CYBORG_STACK(T,K) do { var/obj/item/stack/S = new /obj/item/stack/##T(src); S.synths = __cyborg_stack_map(K); . += S } while (FALSE)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/horing.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/horing.dm
index 7039501e092d..2f8bf86e6d79 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/horing.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/horing.dm
@@ -191,7 +191,7 @@
//playsound(target, holder.say_list.threaten_sound, 50, 1) // Actual aim-mode also does that so at least it's consistant.
else // Otherwise we are waiting for them to go away or to wait long enough for escalate.
var/threatlevel = target.get_threat(holder)
- if(target in list_targets() && checkthreatened(target, threatlevel)) // Are they still visible and threatening ?
+ if((target in list_targets()) && checkthreatened(target, threatlevel)) // Are they still visible and threatening ?
var/should_escalate = FALSE
if(threaten_delay && last_threaten_time + threaten_delay < world.time) // Waited too long.
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm
index fd64686df306..a362c613559e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed.dm
@@ -96,15 +96,15 @@
/mob/living/simple_mob/humanoid/possessed/Destroy()
var/droploc = get_turf(src)
playsound(src, 'sound/effects/blobattack.ogg', 40, 1)
- visible_message(SPAN_CRITICAL(pick("\The The horrid screech of metal grating metal cuts through the air as the suit's interlocking joints grind and fold inwards upon itself. A putrid wash of decayed flesh spills forwards, staining the ground dark with the contents of the collapsing RIG's long expired pilot.",
- "\The The [src] shudders as some hurt living thing, reeling as screaming servos overcompensate beneath the weight of that debilitating strike - the horrid sounds of shattered metal resonate as the RIG rips itself apart. Limbs flung about in distinctly inhuman motions in a final failed effort at balance before buckling inwards at the joints, hydraulic fluid jettisoned as blood from a severed artery as the long liquidized contents of the suit's ex-pilot spill from its chassis in a thick slurry.",
- "\The Hissing atmosphereic valves pop and snap, breaking the ageless seal as the putrid stench of rot and carrion assaults the senses in debilitating waves. The damaged RIG's visor alight with warnings of hazardous atmospheric conditions as a final distorted scream echos from within the damaged chassis. The fetid miasma that breeches through those wheezing seals overtaken by a wet burble and plop as the suit is bathed in the liquid contents of its passenger, blackened flesh fed through those narrow seals as rotten grounds.",
- "\The The timeworn suit's seals finally crack open with a hiss - spilling forth a thick fungal mist. The control module ejects from the rig as it loses all control impulses - leaving behind but a pile of bones and the rotten sludge it had been swimming in for heaven knows how long.",
- "\The The [src]'s emergency protocols kick in, retracting around the former-person, who's now little more than a disgusting pile of parts not even a vulture would want. The control module appears to be intact, however.",
- "\The The suit finally lets go of the prisoner it had held for so long. Unfortunately, this guy reminds you of that news report of someone who forgot that Ganymede rock lobster in a fridge for a year, the thick miasma of fungi and rotten gasses visibly pouring out, pushing out rancid bits of meat and slimy bones. The only salvageable bit appears to be the Control Module.",
- "\The A few last desperate seals give out with a weary series of pops, and the suit contorts with the final pressure differentials resolved: the suit tangles and leaks, and finally compacts back into it's rightful shape.",
- "\The Tightening, the suit re-attempts to remain it's current form, before it collapses under the stress, supporting mechanisms closing in on themselves like a noose with nothing left to catch on.",
- "\The The suit makes a noise akin to clockwork binding, and shutters, before something imperceptible gives with an abysmal noise and the suit returns to it's default form.")))
+ visible_message(SPAN_CRITICAL(pick("The horrid screech of metal grating metal cuts through the air as the suit's interlocking joints grind and fold inwards upon itself. A putrid wash of decayed flesh spills forwards, staining the ground dark with the contents of the collapsing RIG's long expired pilot.",
+ "The [src] shudders as some hurt living thing, reeling as screaming servos overcompensate beneath the weight of that debilitating strike - the horrid sounds of shattered metal resonate as the RIG rips itself apart. Limbs flung about in distinctly inhuman motions in a final failed effort at balance before buckling inwards at the joints, hydraulic fluid jettisoned as blood from a severed artery as the long liquidized contents of the suit's ex-pilot spill from its chassis in a thick slurry.",
+ "Hissing atmosphereic valves pop and snap, breaking the ageless seal as the putrid stench of rot and carrion assaults the senses in debilitating waves. The damaged RIG's visor alight with warnings of hazardous atmospheric conditions as a final distorted scream echos from within the damaged chassis. The fetid miasma that breeches through those wheezing seals overtaken by a wet burble and plop as the suit is bathed in the liquid contents of its passenger, blackened flesh fed through those narrow seals as rotten grounds.",
+ "The timeworn suit's seals finally crack open with a hiss - spilling forth a thick fungal mist. The control module ejects from the rig as it loses all control impulses - leaving behind but a pile of bones and the rotten sludge it had been swimming in for heaven knows how long.",
+ "The [src]'s emergency protocols kick in, retracting around the former-person, who's now little more than a disgusting pile of parts not even a vulture would want. The control module appears to be intact, however.",
+ "The suit finally lets go of the prisoner it had held for so long. Unfortunately, this guy reminds you of that news report of someone who forgot that Ganymede rock lobster in a fridge for a year, the thick miasma of fungi and rotten gasses visibly pouring out, pushing out rancid bits of meat and slimy bones. The only salvageable bit appears to be the Control Module.",
+ "A few last desperate seals give out with a weary series of pops, and the suit contorts with the final pressure differentials resolved: the suit tangles and leaks, and finally compacts back into it's rightful shape.",
+ "Tightening, the suit re-attempts to remain it's current form, before it collapses under the stress, supporting mechanisms closing in on themselves like a noose with nothing left to catch on.",
+ "The suit makes a noise akin to clockwork binding, and shutters, before something imperceptible gives with an abysmal noise and the suit returns to it's default form.")))
// gib()
if(rand(1,2) == 1)
new rig1(droploc)
diff --git a/code/modules/mob/living/throwing.dm b/code/modules/mob/living/throwing.dm
index 3f1db65b03a5..ad63dcfd9d6d 100644
--- a/code/modules/mob/living/throwing.dm
+++ b/code/modules/mob/living/throwing.dm
@@ -1,5 +1,5 @@
//! shitcode in this file oop
-/mob/living/throw_item(obj/item/I, atom/target, overhand, neat = a_intent == INTENT_HELP, force = throw_impulse, overhand = in_throw_mode == THROW_MODE_OVERHAND)
+/mob/living/throw_item(obj/item/I, atom/target, overhand = in_throw_mode == THROW_MODE_OVERHAND, neat = a_intent == INTENT_HELP, force = throw_impulse)
if(!I)
return FALSE
throw_mode_off()
diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm
index ab7936ea2ff6..fb1b805b07b9 100644
--- a/code/modules/modular_computers/hardware/nano_printer.dm
+++ b/code/modules/modular_computers/hardware/nano_printer.dm
@@ -80,7 +80,7 @@
else if(B.pages.len == 1) //if only one item left, extract item and delete the one-item bundle
if(!user.attempt_consume_item_for_construction(B))
return
- user.put_in_hands(B[1])
+ user.put_in_hands(B.pages[1])
else //if at least two items remain, just update the bundle icon
B.update_icon()
to_chat(user, "You add [num_of_pages_added] papers from \the [W] into \the [src].")
diff --git a/code/modules/overmap/events/event_handler.dm b/code/modules/overmap/events/event_handler.dm
index 84de3b03c52b..defe89fb49d6 100644
--- a/code/modules/overmap/events/event_handler.dm
+++ b/code/modules/overmap/events/event_handler.dm
@@ -87,7 +87,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /singleton/overmap_event_handler, new)
/singleton/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T)
for(var/obj/overmap/tiled/hazard/hazard in hazard_by_turf[T])
- if(E in hazard.events && E.severity == hazard.difficulty)
+ if((E in hazard.events) && E.severity == hazard.difficulty)
return TRUE
/singleton/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/overmap/tiled/hazard/E, var/equal_or_better) // This proc is only used so it can break out of 2 loops cleanly
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index ddda3175ec37..34c513634ba1 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -167,7 +167,7 @@
to_chat(usr, "You remove the [W.name] from the bundle.")
if(pages.len <= 1)
- var/obj/item/paper/P = src[1]
+ var/obj/item/paper/P = pages[1]
usr.temporarily_remove_from_inventory(src, INV_OP_FORCE | INV_OP_SHOULD_NOT_INTERCEPT | INV_OP_SILENT)
usr.put_in_hands_or_drop(P)
qdel(src)
diff --git a/code/modules/preferences/preference_setup/vore/08_traits.dm b/code/modules/preferences/preference_setup/vore/08_traits.dm
index a932b7822b2d..ab73352ab7f9 100644
--- a/code/modules/preferences/preference_setup/vore/08_traits.dm
+++ b/code/modules/preferences/preference_setup/vore/08_traits.dm
@@ -93,13 +93,13 @@
var/constraints = compute_constraints()
apply_traits(TRUE, pref.pos_traits.Copy() + pref.neu_traits.Copy() + pref.neg_traits.Copy(), available_traits, constraints)
-
+
for(var/path in pref.id_hidden_traits)
var/datum/trait/T = all_traits[path]
if(!istype(T) || !T.extra_id_info_optional)
pref.id_hidden_traits -= path
continue
- if(!(path in pref.pos_traits + pref.neu_traits + pref.neg_traits))
+ if(!(path in (pref.pos_traits + pref.neu_traits + pref.neg_traits)))
pref.id_hidden_traits -= path
var/datum/species/selected_species = pref.real_species_datum()
@@ -192,7 +192,7 @@
var/list/id_traits = list()
for(var/path in pref.pos_traits + pref.neg_traits + pref.neu_traits)
- var/datum/trait/T = all_traits[path]
+ var/datum/trait/T = all_traits[path]
if(istype(T) && T.extra_id_info)
id_traits |= T
@@ -393,7 +393,7 @@
// NOTE: For some reason, this is only actually used for neutral traits??? Weird.
if (species_id != SPECIES_ID_CUSTOM)
- if (trait_path in positive_traits || (trait_path in neutral_traits && trait.custom_only))
+ if ((trait_path in positive_traits) || ((trait_path in neutral_traits) && trait.custom_only))
available_trait.forbidden_reason = "This trait is only allowed for custom species."
available_trait.exclusive_with = exclusions[trait_path]
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index ed75a96ada75..20d133ea8abd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -362,10 +362,10 @@
explosion(get_turf(src), -1, 0, 2, 3)
qdel(src)
if(11 to 49)
- to_chat(user, "You fail to disrupt \the electronic warfare suite.")
+ to_chat(user, "You fail to disrupt the electronic warfare suite.")
return
if(50 to 100)
- to_chat(user, "You disrupt \the electronic warfare suite.")
+ to_chat(user, "You disrupt the electronic warfare suite.")
scrambled = 1
else
to_chat(user, "\The [src] does not have an active electronic warfare suite!")
@@ -377,7 +377,7 @@
if(do_after(user, 60* A.tool_speed))
switch(rand(1,100))
if(1 to 10)
- to_chat(user, "You twist \the firing pin as you tug, destroying the firing pin.")
+ to_chat(user, "You twist the firing pin as you tug, destroying the firing pin.")
pin = null
if(11 to 74)
to_chat(user, "You grasp the firing pin, but it slips free!")
diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm
index 10ddd357b16b..cb15cedbcf32 100644
--- a/code/modules/resleeving/infomorph.dm
+++ b/code/modules/resleeving/infomorph.dm
@@ -85,7 +85,7 @@ var/list/infomorph_emotions = list(
/mob/living/silicon/infomorph/Initialize(mapload, obj/item/sleevecard/SC, name = "Unknown")
ASSERT(SC)
- name = "[initial(name)] ([name])"
+ name = "Unknown ([name])"
src.forceMove(SC)
card = SC
sradio = new(src)
diff --git a/code/modules/species/station/alraune.dm b/code/modules/species/station/alraune.dm
index 107e48cc6570..4666f4372fb1 100644
--- a/code/modules/species/station/alraune.dm
+++ b/code/modules/species/station/alraune.dm
@@ -361,7 +361,7 @@
/mob/living/carbon/human/proc/alraune_fruit_pick()
set name = "Pick Fruit"
- set desc = "Pick fruit off of [src]."
+ set desc = "Pick fruit."
set category = VERB_CATEGORY_OBJECT
set src in view(1)
diff --git a/code/modules/species/station/apidaen.dm b/code/modules/species/station/apidaen.dm
index fd7609e82af5..74e3317abc35 100644
--- a/code/modules/species/station/apidaen.dm
+++ b/code/modules/species/station/apidaen.dm
@@ -159,7 +159,7 @@
/mob/living/carbon/human/proc/nectar_pick()
set name = "Collect Waxcomb"
- set desc = "Coax waxcomb from [src]."
+ set desc = "Coax waxcomb from them."
set category = "Abilities"
set src in view(1)
var/mob/user = usr
diff --git a/code/modules/spells/artifacts.dm b/code/modules/spells/artifacts.dm
index 4267467db1cf..268329c57c84 100644
--- a/code/modules/spells/artifacts.dm
+++ b/code/modules/spells/artifacts.dm
@@ -230,8 +230,7 @@
for(var/obj/item/I in H)
//H.dropItemtoGround(I) //Just gonna disable this until I figure out what it does.
- var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/romancent)
- H.equip_to_slot_or_del(new hat(H), SLOT_HEAD)
+ H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/roman(H), SLOT_HEAD)
H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), SLOT_ID_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_FEET)
H.put_in_hands(new /obj/item/shield/riot/roman(H), INV_OP_FORCE)
diff --git a/code/modules/spells/general/area_teleport.dm b/code/modules/spells/general/area_teleport.dm
index c364e18aa42a..92d57a93eeff 100644
--- a/code/modules/spells/general/area_teleport.dm
+++ b/code/modules/spells/general/area_teleport.dm
@@ -37,7 +37,8 @@
/spell/area_teleport/cast(area/thearea, mob/user)
if(!istype(thearea))
if(istype(thearea, /list))
- thearea = thearea[1]
+ var/list/thearea_l = thearea
+ thearea = thearea_l[1]
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
if(!T.density)
diff --git a/code/modules/tgui/modules/general/cardmod.dm b/code/modules/tgui/modules/general/cardmod.dm
index 194e95514edc..6a7880a82716 100644
--- a/code/modules/tgui/modules/general/cardmod.dm
+++ b/code/modules/tgui/modules/general/cardmod.dm
@@ -293,7 +293,7 @@
/datum/tgui_module/card_mod/standard/query_access_ids(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
. = list()
- for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
+ for(var/id in (direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant)))
var/datum/access/A = SSjob.access_lookup(id)
if(isnull(A.access_edit_list))
continue
@@ -304,19 +304,19 @@
/datum/tgui_module/card_mod/standard/query_access_types(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
. = NONE
- for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
+ for(var/id in (direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant)))
var/datum/access/A = SSjob.access_lookup(id)
. |= A.access_edit_type
/datum/tgui_module/card_mod/standard/query_access_categories(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
. = list()
- for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
+ for(var/id in (direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant)))
var/datum/access/A = SSjob.access_lookup(id)
. |= A.access_edit_category
/datum/tgui_module/card_mod/standard/query_access_regions(mob/user, obj/item/card/id/editing, obj/item/card/id/authing, list/direct)
. = NONE
- for(var/id in direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant))
+ for(var/id in (direct || (((authing?.access || list())) & SSjob.cached_access_edit_relevant)))
var/datum/access/A = SSjob.access_lookup(id)
if(isnull(A.access_edit_region))
continue
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index 8124a1a7954c..28c479504a72 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -26,7 +26,7 @@
report("Scan Complete: No antibodies detected.", user)
return
- if (MUTATION_CLUMSY in user.mutations && prob(50))
+ if ((MUTATION_CLUMSY in user.mutations) && prob(50))
// I was tempted to be really evil and rot13 the output.
report("Antibodies detected: [reverse_text(antigens2string(C.antibodies))]", user)
else
diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm
index c50af8d390e3..98b8a1f7ceda 100644
--- a/code/modules/xenoarcheaology/finds/special.dm
+++ b/code/modules/xenoarcheaology/finds/special.dm
@@ -56,7 +56,7 @@
//see if we've identified anyone nearby
if(world.time - last_bloodcall > bloodcall_interval && nearby_mobs.len)
var/mob/living/carbon/human/M = pop(nearby_mobs)
- if(M in view(7,src) && M.health > 20)
+ if((M in view(7,src)) && M.health > 20)
if(prob(50))
bloodcall(M)
nearby_mobs.Add(M)
diff --git a/rust_g.dll b/rust_g.dll
index 0cb6c1f3b415..29b00c88aeec 100644
Binary files a/rust_g.dll and b/rust_g.dll differ