diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm
index c8ec7280bd..bd8786ed0c 100644
--- a/code/controllers/subsystems/transcore_vr.dm
+++ b/code/controllers/subsystems/transcore_vr.dm
@@ -115,14 +115,14 @@ SUBSYSTEM_DEF(transcore)
/datum/controller/subsystem/transcore/Recover()
if (istype(SStranscore.body_scans))
- for(var/N in SStranscore.body_scans[N])
- if(N) body_scans[N] = SStranscore.body_scans[N]
+ for(var/N in SStranscore.body_scans)
+ if(N && SStranscore.body_scans[N]) body_scans[N] = SStranscore.body_scans[N]
if(SStranscore.core_dumped)
core_dumped = TRUE
can_fire = FALSE
else if (istype(SStranscore.backed_up))
- for(var/N in SStranscore.backed_up[N])
- if(N) backed_up[N] = SStranscore.backed_up[N]
+ for(var/N in SStranscore.backed_up)
+ if(N && SStranscore.backed_up[N]) backed_up[N] = SStranscore.backed_up[N]
/datum/controller/subsystem/transcore/proc/m_backup(var/datum/mind/mind, var/obj/item/device/nif/nif, var/one_time = FALSE)
ASSERT(mind)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 1aa1967d6d..de0d8dbcd9 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -486,7 +486,7 @@
if(unknown_body)
imp += "Unknown body present:"
- if(!AN && !open && !infected & !imp)
+ if(!AN && !open && !infected && !imp)
AN = "None:"
if(!(e.status & ORGAN_DESTROYED))
dat += "
[e.name] | [e.burn_dam] | [e.brute_dam] | [robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured][o_dead] | "
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index e410914bee..47d26c7ab1 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -319,8 +319,8 @@ Class Procs:
qdel(C)
C = new /obj/item/weapon/cell/high(src)
component_parts += C
- return C
RefreshParts()
+ return C
/obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R)
if(!istype(R))
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index f6422259d3..dcbf63688a 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -188,50 +188,34 @@
entry_vent = null
else if(entry_vent)
if(get_dist(src, entry_vent) <= 1)
- //VOREStation Edit Start
+ //VOREStation Edit Start
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = get_safe_ventcrawl_target(entry_vent)
if(!exit_vent)
return
- if(1) //To maintain indentation level
- //VOREStation Edit End
- /* //VOREStation Removal Start - prevent spiders in dorms
- if(entry_vent.network && entry_vent.network.normal_members.len)
- var/list/vents = list()
- for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in entry_vent.network.normal_members)
- vents.Add(temp_vent)
- if(!vents.len)
- entry_vent = null
- return
- var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
- */ //VOREStation Removal End
- /*if(prob(50))
- src.visible_message("[src] scrambles into the ventillation ducts!")*/
+ spawn(rand(20,60))
+ loc = exit_vent
+ var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
+ spawn(travel_time)
- spawn(rand(20,60))
- loc = exit_vent
- var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
- spawn(travel_time)
-
- if(!exit_vent || exit_vent.welded)
- loc = entry_vent
- entry_vent = null
- return
-
- if(prob(50))
- src.visible_message("You hear something squeezing through the ventilation ducts.",2)
- sleep(travel_time)
-
- if(!exit_vent || exit_vent.welded)
- loc = entry_vent
- entry_vent = null
- return
- loc = exit_vent.loc
+ if(!exit_vent || exit_vent.welded)
+ loc = entry_vent
entry_vent = null
- var/area/new_area = get_area(loc)
- if(new_area)
- new_area.Entered(src)
- else
- entry_vent = null
+ return
+
+ if(prob(50))
+ src.visible_message("You hear something squeezing through the ventilation ducts.",2)
+ sleep(travel_time)
+
+ if(!exit_vent || exit_vent.welded)
+ loc = entry_vent
+ entry_vent = null
+ return
+ loc = exit_vent.loc
+ entry_vent = null
+ var/area/new_area = get_area(loc)
+ if(new_area)
+ new_area.Entered(src)
+ //VOREStation Edit End
//=================
if(isturf(loc))
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 7e38782092..3f7e3fc1b8 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -259,4 +259,4 @@ obj/item/clothing/mask/chewable/Destroy()
/obj/item/clothing/mask/chewable/candy/pocky/Initialize()
. = ..()
- reagents.add_reagent("chocolate" = 10)
\ No newline at end of file
+ reagents.add_reagent("chocolate", 10)
\ No newline at end of file
diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm
index 91524d6899..587214a0cb 100644
--- a/code/modules/blob/blob.dm
+++ b/code/modules/blob/blob.dm
@@ -22,7 +22,7 @@
update_icon()
return ..(loc)
-/obj/effect/blob/CanPass(var/atom/movable/mover, vra/turf/target)
+/obj/effect/blob/CanPass(var/atom/movable/mover, var/turf/target)
return FALSE
/obj/effect/blob/ex_act(var/severity)
diff --git a/code/modules/client/ui_style.dm b/code/modules/client/ui_style.dm
index 84c8055d9f..bcf580bd47 100644
--- a/code/modules/client/ui_style.dm
+++ b/code/modules/client/ui_style.dm
@@ -49,7 +49,7 @@ var/global/list/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/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index 98bf1ceaf4..aba31abd19 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -38,7 +38,6 @@
set src in usr
adjust_fibers(usr)
- ..()
/obj/item/clothing/under/hyperfiber/proc/adjust_fibers(mob/user)
if(hides_bulges == FALSE)
@@ -63,7 +62,6 @@
set category = "Object"
set src in usr
bluespace_size(usr)
- ..()
/obj/item/clothing/under/hyperfiber/bluespace/proc/bluespace_size(mob/usr as mob)
if (!ishuman(usr))
diff --git a/code/modules/emotes/definitions/audible_scream_vr.dm b/code/modules/emotes/definitions/audible_scream_vr.dm
index 7114d0eb66..f2c69ba3c3 100644
--- a/code/modules/emotes/definitions/audible_scream_vr.dm
+++ b/code/modules/emotes/definitions/audible_scream_vr.dm
@@ -10,4 +10,3 @@
"sound" = H.species.male_scream_sound,
"vol" = emote_volume
)
- return ..()
diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm
index e76c2055b7..a554cdd20a 100644
--- a/code/modules/ext_scripts/irc.dm
+++ b/code/modules/ext_scripts/irc.dm
@@ -1,5 +1,6 @@
/proc/send2irc(var/channel, var/msg)
return // VOREStation Edit - Can't exploit shell if we never call shell!
+ /* Unreachable with above VOREStation Edit
if (config.use_irc_bot)
if (config.use_node_bot)
shell("node bridge.js -h \"[config.irc_bot_host]\" -p \"[config.irc_bot_port]\" -c \"[channel]\" -m \"[escape_shell_arg(msg)]\"")
@@ -22,6 +23,7 @@
spawn(0)
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [escape_shell_arg(msg)]")
return
+ */
/proc/send2mainirc(var/msg)
if(config.main_irc)
diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm
index eb6e61aea2..c8fbdd9303 100644
--- a/code/modules/ext_scripts/python.dm
+++ b/code/modules/ext_scripts/python.dm
@@ -18,6 +18,7 @@
/proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
return // VOREStation Edit - Can't exploit shell if we never call shell!
+ /* Unreachable with above vorestation edit
if(scriptsprefix)
script = "scripts/" + script
@@ -25,4 +26,6 @@
script = replacetext(script, "/", "\\")
var/command = config.python_path + " " + script + " " + args
- return shell(command)
\ No newline at end of file
+ return shell(command)
+ */
+
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
index 8bd2192be8..2713e1beec 100755
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
@@ -176,7 +176,7 @@
for(var/obj/item/organ/I in H.internal_organs)
I.removed()
- for(var/obj/item/I in src)
+ for(var/obj/item/I in H.contents)
H.drop_from_inventory(I)
qdel(H)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index cc238fe792..b4836d168f 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -481,7 +481,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ.head_offset)
apply_layer(HAIR_LAYER)
- return
+ //return //VOREStation Edit
// VOREStation Edit - START
var/icon/hair_acc_s = get_hair_accessory_overlay()
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index fc0c3bebdd..47ccbfac25 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -55,8 +55,7 @@
var/mob/living/silicon/ai/O = ..(move)
if(O)
O.flavor_text = O.client?.prefs?.flavor_texts["general"]
-
- return O
+ return O
//VOREStation Edit End
return ..(move)
diff --git a/code/modules/overmap/disperser/disperser_fire.dm b/code/modules/overmap/disperser/disperser_fire.dm
index 421c9b4a20..86116b0677 100644
--- a/code/modules/overmap/disperser/disperser_fire.dm
+++ b/code/modules/overmap/disperser/disperser_fire.dm
@@ -67,7 +67,7 @@
return TRUE
var/obj/effect/overmap/event/finaltarget = pick(candidates)
- log_and_message_admins("A type [chargetype] disperser beam was launched at [finaltarget].", location=finaltarget)
+ log_and_message_admins("A type [chargetype] disperser beam was launched at [finaltarget].")
fire_at_event(finaltarget, chargetype)
return TRUE
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
index 1ec51e1e90..4f95b54d5a 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
@@ -38,7 +38,6 @@
if(istype(other_batt,chambered.type) && other_batt.shots_left)
switch_to(other_batt)
return new chambered.projectile_type()
- break
return null
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index d2a6a0a35a..bac505f612 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -197,7 +197,7 @@
// Irradiate everyone in telescience!
for(var/obj/machinery/telepad/E in machines)
var/L = get_turf(E)
- sparks(target = L)
+ sparks()
for(var/mob/living/carbon/human/M in viewers(L, null))
M.apply_effect((rand(10, 20)), IRRADIATE, 0)
to_chat(M, "You feel strange.")
diff --git a/code/modules/tgui/modules/admin_shuttle_controller.dm b/code/modules/tgui/modules/admin_shuttle_controller.dm
index 20e5c47367..d2ce9bc69e 100644
--- a/code/modules/tgui/modules/admin_shuttle_controller.dm
+++ b/code/modules/tgui/modules/admin_shuttle_controller.dm
@@ -58,11 +58,11 @@
target = V.restricted_waypoints[1]
else
to_chat(C, "Unable to jump to [V].")
- return FALSE
+ return
var/turf/T = get_turf(target)
if(!istype(T))
to_chat(C, "Unable to jump to [V].")
- return FALSE
+ return
C.jumptoturf(T)
return TRUE
if("classicmove")
diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm
index 2e566e1267..097bf84a05 100644
--- a/code/modules/tgui/modules/overmap.dm
+++ b/code/modules/tgui/modules/overmap.dm
@@ -158,7 +158,6 @@
. = ..()
if(!istype(new_linked))
CRASH("Warning, [new_linked] is not an overmap ship! Something went horribly wrong for [usr]!")
- return
linked = new_linked
name = initial(name) + " ([linked.name])"
// HELM
diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm
index 3372910973..3bae4a8524 100644
--- a/code/modules/vore/persist/persist_vr.dm
+++ b/code/modules/vore/persist/persist_vr.dm
@@ -48,12 +48,12 @@
// Okay this mob has a real loaded-from-savefile mind in it!
var/datum/preferences/prefs = preferences_datums[persister.mind.loaded_from_ckey]
if(!prefs)
- WARNING("Persist (P4P): [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found.")
+ warning("Persist (P4P): [persister.mind] was loaded from ckey [persister.mind.loaded_from_ckey] but no prefs datum found.")
return
// Okay, lets do a few checks to see if we should really save tho!
if(!prefs.load_character(persister.mind.loaded_from_slot))
- WARNING("Persist (P4P): [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
+ warning("Persist (P4P): [persister.mind] was loaded from slot [persister.mind.loaded_from_slot] but loading prefs failed.")
return // Failed to load character
// For now as a safety measure we will only save if the name matches.
@@ -79,7 +79,7 @@
var/datum/preferences/prefs = prep_for_persist(occupant)
if(!prefs)
- WARNING("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
+ warning("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
return
//This one doesn't rely on persistence prefs
@@ -232,7 +232,7 @@
prefs = prep_for_persist(H)
if(!prefs)
- WARNING("Persist (NIF): [H] has no prefs datum, skipping")
+ warning("Persist (NIF): [H] has no prefs datum, skipping")
return
var/obj/item/device/nif/nif = H.nif
@@ -254,6 +254,6 @@
var/datum/category_item/player_setup_item/vore/nif/nif_prefs = vore_cat.items_by_name["NIF Data"]
var/savefile/S = new /savefile(prefs.path)
- if(!S) WARNING ("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
+ if(!S) warning("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
S.cd = "/character[prefs.default_slot]"
nif_prefs.save_character(S)
diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm
index 41775af2a5..b25cea2291 100644
--- a/code/modules/vore/resizing/sizegun_vr.dm
+++ b/code/modules/vore/resizing/sizegun_vr.dm
@@ -24,10 +24,7 @@
/obj/item/weapon/gun/energy/sizegun/New()
..()
- if(istype(src, /obj/item/weapon/gun/energy/sizegun/admin))
- verbs += /obj/item/weapon/gun/energy/sizegun/admin/select_size
- else
- verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size
+ verbs += .proc/select_size
/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user)
. = ..()