diff --git a/.versions.sh b/.versions.sh
index ad87d7fa54a..7def41c2547 100644
--- a/.versions.sh
+++ b/.versions.sh
@@ -5,4 +5,4 @@ export BYOND_MINOR=1560
export RUST_G_VERSION=v0.5.0+a2
export FLYWAY_BUILD=5.2.4
-export SPACEMAN_DMM_VERSION=suite-1.6
+export SPACEMAN_DMM_VERSION=suite-1.7
diff --git a/code/_onclick/hud/screen_object_types/internals.dm b/code/_onclick/hud/screen_object_types/internals.dm
index ef9dd903370..83f2ef87da8 100644
--- a/code/_onclick/hud/screen_object_types/internals.dm
+++ b/code/_onclick/hud/screen_object_types/internals.dm
@@ -122,7 +122,7 @@
else
contents.Add(0)
- if(!(istype(tankcheck[i], /obj/item/organ/vaurca/preserve)) & !(istype(tankcheck[i], /obj/item/tank)))
+ if(!(istype(tankcheck[i], /obj/item/organ/vaurca/preserve)) && !(istype(tankcheck[i], /obj/item/tank)))
//no tank so we set contents to 0
contents.Add(0)
diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm
index 187244c9575..265596648a7 100644
--- a/code/game/antagonist/station/rogue_ai.dm
+++ b/code/game/antagonist/station/rogue_ai.dm
@@ -45,16 +45,15 @@ var/datum/antagonist/rogue_ai/malf
/datum/antagonist/rogue_ai/greet(var/datum/mind/player)
// Initializes the AI's malfunction stuff.
+ if(!..())
+ return
+
+ var/mob/living/silicon/ai/A = player.current
+ if(!istype(A))
+ error("Non-AI mob designated malf AI! Report this.")
+ to_world("##ERROR: Non-AI mob designated malf AI! Report this.")
+ return 0
spawn(0)
- if(!..())
- return
-
- var/mob/living/silicon/ai/A = player.current
- if(!istype(A))
- error("Non-AI mob designated malf AI! Report this.")
- to_world("##ERROR: Non-AI mob designated malf AI! Report this.")
- return 0
-
A.setup_for_malf()
A.laws = new /datum/ai_laws/nanotrasen/malfunction
diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm
index 388f3524ac9..8b0d940c1e5 100644
--- a/code/game/machinery/body_scanner.dm
+++ b/code/game/machinery/body_scanner.dm
@@ -753,7 +753,7 @@
if(unknown_body)
imp += "Unknown body present:"
- if(!AN && !open && !infected & !imp)
+ if(!AN && !open && !infected && !imp)
AN = "None:"
if(!e.is_stump())
dat += "| [e.name] | [e.burn_dam] | [get_severity(e.brute_dam, TRUE)] | [robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured] | "
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 36fc9c6fb6c..b3951ae08bd 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -314,7 +314,7 @@
if(unknown_body)
imp += "Unknown body present:"
- if(!AN && !open && !infected & !imp)
+ if(!AN && !open && !infected && !imp)
AN = "None:"
if(!e.is_stump())
dat += "[e.name] | [e.burn_dam] | [get_severity(e.brute_dam, TRUE)] | [robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured] | "
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 3892938f984..55830b10971 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -20,7 +20,7 @@
spawn(15)
if(M)
if(!M.get_amount())
- return TRUE
+ return
while(metal_amount < 150000 && M.amount)
src.metal_amount += O.matter[DEFAULT_WALL_MATERIAL] /*O:height * O:width * O:length * 100000.0*/
M.use(1)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index ed566e246a5..08c54ce85f3 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -76,9 +76,9 @@
if(holder)
for(var/s in staff)
var/client/C = s
- if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights)) //Used to determine who shows up in admin rows
+ if(R_ADMIN & C.holder.rights) //Used to determine who shows up in admin rows
- if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Mentors can't see stealthmins
+ if(C.holder.fakekey && !(R_ADMIN & holder.rights || R_MOD & holder.rights)) //Mentors can't see stealthmins
continue
msg += "\t[C.key] is a [C.holder.rank]"
@@ -144,7 +144,7 @@
else
for(var/s in staff)
var/client/C = s
- if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights))
+ if(R_ADMIN & C.holder.rights)
if(!C.holder.fakekey)
if(C.is_afk())
msg += "\t[C.key] is a [C.holder.rank] (AFK)
"
@@ -185,4 +185,4 @@
var/datum/browser/staff_win = new(usr, "staffwho", "Staff Who", 450, 500)
staff_win.set_content(msg)
- staff_win.open()
\ No newline at end of file
+ staff_win.open()
diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm
index 89172ff0705..a5691b8417b 100644
--- a/code/modules/client/ui_style.dm
+++ b/code/modules/client/ui_style.dm
@@ -33,7 +33,7 @@ var/all_tooltip_styles = list(
if(!UI_style_new) return
var/UI_style_alpha_new = input(usr, "Select a new alpha (transparency) parameter for your UI, between 50 and 255") as null|num
- if(!UI_style_alpha_new | !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
+ if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50)) return
var/UI_style_color_new = input(usr, "Choose your UI color. Dark colors are not recommended!") as color|null
if(!UI_style_color_new) return
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 9f4d5c7c0d8..3747c0547c6 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -22,10 +22,8 @@ mob/living/carbon/proc/dream()
to_chat(src, "... [pick(dreams)] ...")
sleep(rand(40,70))
if(paralysis <= 0)
- dreaming = 0
- return 0
+ break
dreaming = 0
- return 1
mob/living/carbon/proc/handle_dreams()
if(client && !dreaming && prob(5))
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index d3ac33ece45..9a0d89eb583 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -239,8 +239,6 @@ var/list/holder_mob_icon_cache = list()
post_scoop()
- return success
-
// Override to add stuff that should happen when scooping
/mob/living/proc/post_scoop()
return
@@ -677,4 +675,4 @@ var/list/holder_mob_icon_cache = list()
name = "fat schlorrgo"
icon_state = "schlorrgo_fat"
item_state = "schlorrgo_fat"
- w_class = ITEMSIZE_LARGE
\ No newline at end of file
+ w_class = ITEMSIZE_LARGE
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 46c9dbc5b35..d223834fc8a 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -90,7 +90,7 @@
playsound(current_location, sound_takeoff, 25, 20, is_global = TRUE)
spawn(warmup_time*10)
if(moving_status == SHUTTLE_IDLE)
- return FALSE //someone cancelled the launch
+ return //someone cancelled the launch
if(!fuel_check()) //fuel error (probably out of fuel) occured, so cancel the launch
var/datum/shuttle/autodock/S = src
diff --git a/code/modules/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm
index f951bcce834..16d84f57cc1 100644
--- a/code/modules/shuttles/shuttle_autodock.dm
+++ b/code/modules/shuttles/shuttle_autodock.dm
@@ -132,9 +132,9 @@
in_use = null
return
if (get_travel_time() && landmark_transition)
- . = long_jump(next_location, landmark_transition, get_travel_time())
+ long_jump(next_location, landmark_transition, get_travel_time())
else
- . = short_jump(next_location)
+ short_jump(next_location)
set_process_state(WAIT_ARRIVE)
/*
@@ -189,4 +189,4 @@
//This can be used by subtypes to do things when the shuttle arrives.
//Note that this is called when the shuttle leaves the WAIT_FINISHED state, the proc name is a little misleading
/datum/shuttle/autodock/proc/arrived()
- return //do nothing for now
\ No newline at end of file
+ return //do nothing for now
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index feb8399397f..584006a6027 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -52,7 +52,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
for(var/obj/item/organ/internal/I in affected.internal_organs)
- if(I && I.damage > 0 && !BP_IS_ROBOTIC(I) && (!I.status & ORGAN_DEAD || I.can_recover()))
+ if(I && I.damage > 0 && !BP_IS_ROBOTIC(I) && (~I.status & ORGAN_DEAD || I.can_recover()))
user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
"You start treating damage to [target]'s [I.name] with [tool_name]." )
target.custom_pain("The pain in your [affected.name] is living hell!",100, affecting = affected)
diff --git a/code/modules/vueui/var_monitor.dm b/code/modules/vueui/var_monitor.dm
index 481f92d327f..0f88900d637 100644
--- a/code/modules/vueui/var_monitor.dm
+++ b/code/modules/vueui/var_monitor.dm
@@ -63,4 +63,4 @@
// Transform functions.
// Do not override.
/datum/vueui_var_monitor/proc/transform_to_boolean(invert, source, current)
- return !!source ^ invert
+ return (!!source) ^ invert
diff --git a/code/unit_tests/equipment_tests.dm b/code/unit_tests/equipment_tests.dm
index cb8cd9b7742..e720df720a4 100644
--- a/code/unit_tests/equipment_tests.dm
+++ b/code/unit_tests/equipment_tests.dm
@@ -10,21 +10,20 @@ datum/unit_test/vision_glasses/
async = 1
datum/unit_test/vision_glasses/start_test()
- spawn(0)
- var/list/test = create_test_mob_with_mind(null, /mob/living/carbon/human)
- if(isnull(test))
- fail("Check Runtimed in Mob creation")
+ var/list/test = create_test_mob_with_mind(null, /mob/living/carbon/human)
+ if(isnull(test))
+ fail("Check Runtimed in Mob creation")
- if(test["result"] == FAILURE)
- fail(test["msg"])
- async = 0
+ if(test["result"] == FAILURE)
+ fail(test["msg"])
+ async = 0
- return 0
+ return 0
- H = locate(test["mobref"])
+ H = locate(test["mobref"])
- var/obj/item/clothing/glasses/G = new glasses_type()
- H.glasses = G
+ var/obj/item/clothing/glasses/G = new glasses_type()
+ H.glasses = G
return 1
@@ -32,7 +31,7 @@ datum/unit_test/vision_glasses/start_test()
datum/unit_test/vision_glasses/check_result()
if(isnull(H) || H.life_tick < 2)
- return 0
+ return 0
if(isnull(H.glasses))
fail("Mob doesn't have glasses on")