diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml
index 0bbcc77454b..def7739d2e9 100644
--- a/.github/workflows/byond.yml
+++ b/.github/workflows/byond.yml
@@ -29,16 +29,19 @@ jobs:
pip install --user -r ./tools/requirements.txt
chmod +x ./scripts/code_check.sh && ./scripts/code_check.sh $PWD
bash tools/ci/install_spaceman_dmm.sh dreamchecker
+ bash tools/ci/setup_od.sh
- name: Code checks
run: |
awk -f tools/indentation.awk **/*.dm
- python3 tools/TagMatcher/tag-matcher.py ../..
python3 tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run
python3 tools/mapmerge2/travis_mapcheck.py
echo "6a5ae087fe5bfa66e52e508655e57120 *html/changelogs/example.yml" | md5sum -c -
- name: Run dreamchecker
id: runDreamchecker
run: ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
+ - name: Run OpenDream Lint
+ id: runOpenDreamLint
+ run: bash tools/ci/run_od.sh
- name: Annotate Lints
if: failure() && steps.runDreamchecker.outcome == 'failure'
uses: yogstation13/DreamAnnotate@v2
diff --git a/aurorastation.dme b/aurorastation.dme
index cb234e402ae..d4b0a09276d 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -10,6 +10,9 @@
#define DEBUG
// END_PREFERENCES
// BEGIN_INCLUDE
+#ifdef OPENDREAM
+#include "code\___odlint.dm"
+#endif
#include "code\global.dm"
#include "code\hub.dm"
#include "code\names.dm"
diff --git a/code/___odlint.dm b/code/___odlint.dm
new file mode 100644
index 00000000000..1d7179a6f68
--- /dev/null
+++ b/code/___odlint.dm
@@ -0,0 +1,30 @@
+#ifndef SPACEMAN_DMM
+
+#pragma FileAlreadyIncluded error
+#pragma MissingIncludedFile error
+#pragma MisplacedDirective error
+#pragma UndefineMissingDirective error
+#pragma DefinedMissingParen error
+#pragma ErrorDirective error
+#pragma WarningDirective error
+#pragma MiscapitalizedDirective error
+
+//2000-2999
+#pragma SoftReservedKeyword error
+#pragma DuplicateVariable error
+#pragma DuplicateProcDefinition error
+#pragma TooManyArguments error
+#pragma PointlessParentCall error
+#pragma PointlessBuiltinCall error
+#pragma SuspiciousMatrixCall error
+#pragma MalformedRange error
+#pragma InvalidRange error
+#pragma InvalidSetStatement error
+#pragma InvalidOverride error
+#pragma DanglingVarType error
+#pragma MissingInterpolatedExpression error
+
+//3000-3999
+#pragma EmptyBlock error
+
+#endif
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 675b130014a..a4a50788643 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -961,7 +961,7 @@ var/list/wall_items = typecacheof(list(
// Returns a variable type as string, optionally with some details:
// Objects (datums) get their type, paths get the type name, scalars show length (text) and value (numbers), lists show length.
// Also attempts some detection of otherwise undetectable types using ref IDs
-var/global/known_proc = new /proc/get_type_ref_bytes
+var/global/known_proc = /proc/get_type_ref_bytes
/proc/get_debug_type(var/V, var/details = TRUE, var/print_numbers = TRUE, var/path_names = TRUE, var/text_lengths = TRUE, var/list_lengths = TRUE, var/show_useless_subtypes = TRUE)
// scalars / basic types
if(isnull(V))
diff --git a/code/controllers/subsystems/initialization/atoms.dm b/code/controllers/subsystems/initialization/atoms.dm
index 6ff69e93307..153fa46d17e 100644
--- a/code/controllers/subsystems/initialization/atoms.dm
+++ b/code/controllers/subsystems/initialization/atoms.dm
@@ -98,25 +98,24 @@ var/datum/controller/subsystem/atoms/SSatoms
if(start_tick != world.time)
BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
- switch(result)
- if(INITIALIZE_HINT_NORMAL)
- // Pass
- if(INITIALIZE_HINT_LATELOAD)
- if(arguments[1]) //mapload
- late_loaders += A
- else
- A.LateInitialize()
- if(INITIALIZE_HINT_QDEL)
- qdel(A)
- return TRUE
- if(INITIALIZE_HINT_LATEQDEL)
- if(arguments[1]) //mapload
- late_qdel += A
- else
+ if(result !=INITIALIZE_HINT_NORMAL)
+ switch(result)
+ if(INITIALIZE_HINT_LATELOAD)
+ if(arguments[1]) //mapload
+ late_loaders += A
+ else
+ A.LateInitialize()
+ if(INITIALIZE_HINT_QDEL)
qdel(A)
return TRUE
- else
- BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
+ if(INITIALIZE_HINT_LATEQDEL)
+ if(arguments[1]) //mapload
+ late_qdel += A
+ else
+ qdel(A)
+ return TRUE
+ else
+ BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
if(!A) //possible harddel
return TRUE
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 2172f69e19e..90a6f10da3e 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -374,7 +374,7 @@
to_chat(H, "You somehow have become the recipient of a loyalty transplant, and it just activated!")
H.implant_loyalty(H, override = TRUE)
log_admin("[key_name_admin(usr)] has loyalty implanted [current].",admin_key=key_name(usr),ckey=key_name(usr))
- else
+
else if (href_list["silicon"])
BITSET(current.hud_updateflag, SPECIALROLE_HUD)
switch(href_list["silicon"])
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 9499224fb7c..9501194e813 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -61,7 +61,7 @@
/obj/structure/spaceship
name = "Abandoned Shuttle"
desc = "An ancient and inoperable shuttle-craft"
- icon = 'icons/obj/machinery/spaceship.dmi'
+ icon = 'icons/obj/machinery/SpaceShip.dmi'
anchored = 1
density = 1
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index a1243a66a26..846104eda15 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -200,7 +200,6 @@
//SN src = null
qdel(src)
return
- else
return
/obj/machinery/computer/scan_consolenew
@@ -253,7 +252,6 @@
//SN src = null
qdel(src)
return
- else
return
/obj/machinery/computer/scan_consolenew/New()
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
index 8782ffa3209..f7739b766aa 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
@@ -10,33 +10,33 @@
// BEGIN RESEARCH DATUMS
/datum/malf_research_ability/interdiction/recall_shuttle
- ability = new/datum/game_mode/malfunction/verb/recall_shuttle()
+ ability = /datum/game_mode/malfunction/verb/recall_shuttle
price = 75
- next = new/datum/malf_research_ability/interdiction/unlock_cyborg()
+ next = /datum/malf_research_ability/interdiction/unlock_cyborg
name = "Recall Shuttle"
/datum/malf_research_ability/interdiction/unlock_cyborg
- ability = new/datum/game_mode/malfunction/verb/unlock_cyborg()
+ ability = /datum/game_mode/malfunction/verb/unlock_cyborg
price = 1200
- next = new/datum/malf_research_ability/interdiction/hack_drone()
+ next = /datum/malf_research_ability/interdiction/hack_drone
name = "Unlock Cyborg"
/datum/malf_research_ability/interdiction/hack_drone
- ability = new/datum/game_mode/malfunction/verb/hack_drone()
+ ability = /datum/game_mode/malfunction/verb/hack_drone
price = 2500
- next = new/datum/malf_research_ability/interdiction/hack_cyborg()
+ next = /datum/malf_research_ability/interdiction/hack_cyborg
name = "Hack maintenance drone"
/datum/malf_research_ability/interdiction/hack_cyborg
- ability = new/datum/game_mode/malfunction/verb/hack_cyborg()
+ ability = /datum/game_mode/malfunction/verb/hack_cyborg
price = 3000
- next = new/datum/malf_research_ability/interdiction/hack_ai()
+ next = /datum/malf_research_ability/interdiction/hack_ai
name = "Hack Cyborg"
/datum/malf_research_ability/interdiction/hack_ai
- ability = new/datum/game_mode/malfunction/verb/hack_ai()
+ ability = /datum/game_mode/malfunction/verb/hack_ai
price = 7500
name = "Hack AI"
@@ -160,7 +160,7 @@
if(hacked_num >= config.hacked_drones_limit)
to_chat(user, SPAN_WARNING("ERROR: maximum active hacked drones limit reached. Report: [hacked_num] drones hacked out of [config.hacked_drones_limit] maximum possible."))
return
-
+
if(!ability_prechecks(user, price) || !ability_pay(user, price))
return
var/mob/living/silicon/robot/drone/D = pick(drone_list)
@@ -321,4 +321,4 @@
log_ability_use(user, "hack AI", target)
-// END ABILITY VERBS
\ No newline at end of file
+// END ABILITY VERBS
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
index edb3828260a..5f951f4115e 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
@@ -10,33 +10,33 @@
// BEGIN RESEARCH DATUMS
/datum/malf_research_ability/manipulation/hack_holopad
- ability = new/datum/game_mode/malfunction/verb/hack_holopad()
+ ability = /datum/game_mode/malfunction/verb/hack_holopad
price = 50
- next = new/datum/malf_research_ability/manipulation/hack_camera()
+ next = /datum/malf_research_ability/manipulation/hack_camera
name = "Hack Holopad"
/datum/malf_research_ability/manipulation/hack_camera
- ability = new/datum/game_mode/malfunction/verb/hack_camera()
+ ability = /datum/game_mode/malfunction/verb/hack_camera
price = 1200
- next = new/datum/malf_research_ability/manipulation/emergency_forcefield()
+ next = /datum/malf_research_ability/manipulation/emergency_forcefield
name = "Hack Camera"
/datum/malf_research_ability/manipulation/emergency_forcefield
- ability = new/datum/game_mode/malfunction/verb/emergency_forcefield()
+ ability = /datum/game_mode/malfunction/verb/emergency_forcefield
price = 1750
- next = new/datum/malf_research_ability/manipulation/gravity_malfunction()
+ next = /datum/malf_research_ability/manipulation/gravity_malfunction
name = "Emergency Forcefield"
/datum/malf_research_ability/manipulation/gravity_malfunction
- ability = new/datum/game_mode/malfunction/verb/gravity_malfunction()
+ ability = /datum/game_mode/malfunction/verb/gravity_malfunction
price = 2500
- next = new/datum/malf_research_ability/manipulation/machine_overload()
+ next = /datum/malf_research_ability/manipulation/machine_overload
name = "Gravity Malfunction"
/datum/malf_research_ability/manipulation/machine_overload
- ability = new/datum/game_mode/malfunction/verb/machine_overload()
+ ability = /datum/game_mode/malfunction/verb/machine_overload
price = 5000
name = "Machine Overload"
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 66aa1834437..03cc988f971 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -10,26 +10,26 @@
// BEGIN RESEARCH DATUMS
/datum/malf_research_ability/networking/basic_hack
- ability = new/datum/game_mode/malfunction/verb/basic_encryption_hack()
+ ability = /datum/game_mode/malfunction/verb/basic_encryption_hack
price = 25
- next = new/datum/malf_research_ability/networking/advanced_hack()
+ next = /datum/malf_research_ability/networking/advanced_hack
name = "Basic Encryption Hack"
/datum/malf_research_ability/networking/advanced_hack
- ability = new/datum/game_mode/malfunction/verb/advanced_encryption_hack()
+ ability = /datum/game_mode/malfunction/verb/advanced_encryption_hack
price = 400
- next = new/datum/malf_research_ability/networking/elite_hack()
+ next = /datum/malf_research_ability/networking/elite_hack
name = "Advanced Encryption Hack"
/datum/malf_research_ability/networking/elite_hack
- ability = new/datum/game_mode/malfunction/verb/elite_encryption_hack()
+ ability = /datum/game_mode/malfunction/verb/elite_encryption_hack
price = 1000
- next = new/datum/malf_research_ability/networking/system_override()
+ next = /datum/malf_research_ability/networking/system_override
name = "Elite Encryption Hack"
/datum/malf_research_ability/networking/system_override
- ability = new/datum/game_mode/malfunction/verb/system_override()
+ ability = /datum/game_mode/malfunction/verb/system_override
price = 5000
name = "System Override"
@@ -143,7 +143,6 @@
var/resp = alert(usr, "Would you like it to appear as if CCIAMS made the report?",,"Yes","No")
if (resp == "Yes")
reportbody += "\n\n- CCIAMS, [commstation_name()]"
- else
switch(alert("Should this be announced to the general population?",,"Yes","No"))
if("Yes")
@@ -289,7 +288,7 @@
user.hack_can_fail = 0
user.hacking = 0
user.system_override = 2
- add_verb(user, new/datum/game_mode/malfunction/verb/ai_destroy_station())
+ add_verb(user, /datum/game_mode/malfunction/verb/ai_destroy_station)
// END ABILITY VERBS
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm
index dfa54a6e969..ddc2049eb0f 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_synthetic.dm
@@ -10,28 +10,28 @@
// BEGIN RESEARCH DATUMS
/datum/malf_research_ability/synthetic/reset_module
- ability = new/datum/game_mode/malfunction/verb/reset_module()
+ ability = /datum/game_mode/malfunction/verb/reset_module
price = 100
- next = new/datum/malf_research_ability/synthetic/infect_apc()
+ next = /datum/malf_research_ability/synthetic/infect_apc
name = "Reset Cyborg Module"
/datum/malf_research_ability/synthetic/infect_apc
- ability = new/datum/game_mode/malfunction/verb/infect_apc()
+ ability = /datum/game_mode/malfunction/verb/infect_apc
price = 500
- next = new/datum/malf_research_ability/synthetic/overclock_borg()
+ next = /datum/malf_research_ability/synthetic/overclock_borg
name = "Infect APC"
/datum/malf_research_ability/synthetic/overclock_borg
- ability = new/datum/game_mode/malfunction/verb/overclock_borg()
+ ability = /datum/game_mode/malfunction/verb/overclock_borg
price = 1300
- next = new/datum/malf_research_ability/synthetic/synthetic_takeover
+ next = /datum/malf_research_ability/synthetic/synthetic_takeover
name = "Overclock Cyborg"
/datum/malf_research_ability/synthetic/synthetic_takeover
- ability = new/datum/game_mode/malfunction/verb/synthetic_takeover()
+ ability = /datum/game_mode/malfunction/verb/synthetic_takeover
price = 4000
name = "Synthetic Takeover"
diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm
index cdc9553c099..1f2f8118591 100644
--- a/code/game/machinery/CableLayer.dm
+++ b/code/game/machinery/CableLayer.dm
@@ -41,7 +41,7 @@
m = min(m, cable.amount)
m = min(m, 30)
if(m)
- playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
var/cable_color = use_cable(m)
var/obj/item/stack/cable_coil/CC = new(get_turf(src), m, cable_color)
user.put_in_hands(CC)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index f66e48560fc..102bf0d3e3d 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -243,7 +243,7 @@
return TRUE
if(!istype(L))
- to_chat(user, "\The machine won't accept that.")
+ to_chat(user, "The machine won't accept that.")
return TRUE
if(display_loading_message)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 35436b2ede9..fb00092242c 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -779,7 +779,7 @@
if (wiresexposed && W.iswirecutter())
user.visible_message("[user] has cut the wires inside \the [src]!", "You cut the wires inside \the [src].")
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
new/obj/item/stack/cable_coil(get_turf(src), 5)
buildstage = 1
update_icon()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 5a1b6980d5d..09dd12b7135 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -232,7 +232,7 @@
visible_message(" [user] has deactivated [src]!")
else
visible_message(" [src] clicks and shuts down. ")
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = "[initial(icon_state)]1"
add_hiddenprint(user)
else
@@ -240,7 +240,7 @@
visible_message(" [user] has reactivated [src]!")
else
visible_message(" [src] clicks and reactivates itself. ")
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = initial(icon_state)
add_hiddenprint(user)
@@ -367,7 +367,7 @@
// Do after stuff here
to_chat(user, "You start to weld the [src]..")
- playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
user.flash_act(FLASH_PROTECTION_MAJOR)
busy = 1
if(WT.use_tool(src, user, 100, volume = 50))
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index f12d18d6596..e936f7b86d2 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -118,7 +118,7 @@
else if(W.iswirecutter())
new/obj/item/stack/cable_coil(get_turf(src), 2)
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
to_chat(user, "You cut the wires from the circuits.")
state = 2
return TRUE
@@ -166,7 +166,7 @@
return 0
to_chat(user, "You start to weld the [src]..")
- playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
user.flash_act(FLASH_PROTECTION_MAJOR)
busy = 1
if(WT.use_tool(src, user, 20, volume = 50))
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 7f33f9f281b..583409a10b9 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -366,7 +366,6 @@
ex_act(severity)
qdel(src)
return
- else
return
/obj/machinery/clonepod/update_icon()
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index e6d41143173..7a8b2fd73d5 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -86,7 +86,7 @@
if (brain)
to_chat(user, "Get that brain out of there first")
else
- playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
to_chat(user, "You remove the cables.")
state = 2
icon_state = "2"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 4c179264ed9..8315df20f32 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -84,7 +84,7 @@
return TRUE
if(3)
if(P.iswirecutter())
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
to_chat(user, "You remove the cables.")
src.state = 2
src.icon_state = "2"
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index f5875c3f053..882ff8a970d 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -54,7 +54,6 @@
for(var/x in verbs)
verbs -= x
set_broken()
- else
return
/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index c42c5a99ab4..4a7af7ff895 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -237,7 +237,7 @@ for reference:
src.health -= W.force * 0.75
if("brute")
src.health -= W.force * 0.5
- else
+
if (src.health <= 0)
src.explode()
..()
@@ -322,7 +322,7 @@ for reference:
qdel(src)
/obj/item/deployable_kit/proc/assemble_kit(mob/user)
- playsound(src.loc, 'sound/items/screwdriver.ogg', 25, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1)
var/atom/A = new kit_product(user.loc)
user.visible_message(SPAN_NOTICE("[user] assembles \a [A]."), SPAN_NOTICE("You assemble \a [A]."))
A.add_fingerprint(user)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 67da41378f2..eb20e1de320 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -7,7 +7,7 @@
/obj/machinery/door/airlock
name = "Airlock"
- icon = 'icons/obj/doors/Doorint.dmi'
+ icon = 'icons/obj/doors/doorint.dmi'
icon_state = "door_closed"
power_channel = ENVIRON
hatch_colour = "#7d7d7d"
@@ -54,8 +54,8 @@
var/open_sound_unpowered = 'sound/machines/airlock_open_force.ogg'
var/close_sound_unpowered = 'sound/machines/airlock_close_force.ogg'
- var/bolts_dropping = 'sound/machines/boltsdown.ogg'
- var/bolts_rising = 'sound/machines/boltsup.ogg'
+ var/bolts_dropping = 'sound/machines/BoltsDown.ogg'
+ var/bolts_rising = 'sound/machines/BoltsUp.ogg'
hashatch = TRUE
@@ -184,7 +184,7 @@
hatch_colour = "#caa638"
/obj/machinery/door/airlock/medical
- icon = 'icons/obj/doors/Doormed.dmi'
+ icon = 'icons/obj/doors/doormed.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_med
hatch_colour = "#d2d2d2"
@@ -206,13 +206,13 @@
close_sound_powered = 'sound/machines/airlock/space1c.ogg'
/obj/machinery/door/airlock/science
- icon = 'icons/obj/doors/Doorsci.dmi'
+ icon = 'icons/obj/doors/doorsci.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_science
hatch_colour = "#d2d2d2"
/obj/machinery/door/airlock/glass_science
name = "Glass Airlocks"
- icon = 'icons/obj/doors/Doorsciglass.dmi'
+ icon = 'icons/obj/doors/doorsciglass.dmi'
opacity = FALSE
assembly_type = /obj/structure/door_assembly/door_assembly_science
glass = 1
@@ -431,7 +431,7 @@
/obj/machinery/door/airlock/glass_medical
name = "Glass Airlock"
- icon = 'icons/obj/doors/Doormedglass.dmi'
+ icon = 'icons/obj/doors/doormedglass.dmi'
hitsound = 'sound/effects/glass_hit.ogg'
maxhealth = 300
explosion_resistance = 5
@@ -456,13 +456,13 @@
/obj/machinery/door/airlock/research
name = "Airlock"
- icon = 'icons/obj/doors/Doorresearch.dmi'
+ icon = 'icons/obj/doors/doorresearch.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_research
hatch_colour = "#d2d2d2"
/obj/machinery/door/airlock/glass_research
name = "Glass Airlock"
- icon = 'icons/obj/doors/Doorresearchglass.dmi'
+ icon = 'icons/obj/doors/doorresearchglass.dmi'
hitsound = 'sound/effects/glass_hit.ogg'
maxhealth = 300
explosion_resistance = 5
@@ -1144,12 +1144,12 @@ About the new airlock wires panel:
to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
return
cut_verb = "cutting"
- cut_sound = 'sound/items/welder.ogg'
+ cut_sound = 'sound/items/Welder.ogg'
cut_delay *= 1.5/WT.toolspeed
cutting = TRUE
else if(istype(tool,/obj/item/gun/energy/plasmacutter))
cut_verb = "cutting"
- cut_sound = 'sound/items/welder.ogg'
+ cut_sound = 'sound/items/Welder.ogg'
cut_delay *= 1
cutting = TRUE
else if(istype(tool,/obj/item/melee/energy/blade) || istype(tool,/obj/item/melee/energy/sword))
@@ -1297,7 +1297,7 @@ About the new airlock wires panel:
SPAN_NOTICE("You begin welding [src] [welded ? "open" : "shut"]."),
"You hear a welding torch on metal."
)
- playsound(src, 'sound/items/welder.ogg', 50, 1)
+ playsound(src, 'sound/items/Welder.ogg', 50, 1)
if(!WT.use_tool(src, user, 20, volume = 50, extra_checks = CALLBACK(src, PROC_REF(is_open), src.density)))
return TRUE
if(!WT.use(0,user))
@@ -1331,8 +1331,7 @@ About the new airlock wires panel:
return TRUE
else if(!repairing && C.iscrowbar())
if(istype(C, /obj/item/melee/arm_blade))
- if(!arePowerSystemsOn()) //if this check isn't done and empty, the armblade will never be used to hit the airlock
- else if(!(stat & BROKEN))
+ if(arePowerSystemsOn() &&!(stat & BROKEN))
..()
return
if(p_open && !operating && welded)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index d18f07ff8ff..82506c1d342 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -4,7 +4,7 @@
/obj/machinery/door
name = "Door"
desc = "It opens and closes."
- icon = 'icons/obj/doors/Doorint.dmi'
+ icon = 'icons/obj/doors/doorint.dmi'
icon_state = "door_closed"
anchored = 1
opacity = 1
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 55ed6d25c72..7fcce496755 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -274,7 +274,7 @@
SPAN_NOTICE("You begin welding [src] [blocked ? "open" : "shut"]."),
SPAN_ITALIC("You hear a welding torch on metal.")
)
- playsound(src, 'sound/items/welder.ogg', 50, 1)
+ playsound(src, 'sound/items/Welder.ogg', 50, 1)
if(!WT.use_tool(src, user, 20, volume = 50, extra_checks = CALLBACK(src, PROC_REF(is_open), src.density)))
return
if(!WT.use(0,user))
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 443917e67da..c30d7aaaa6b 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -109,7 +109,7 @@
else if (W.iswirecutter())
user.visible_message("\The [user] has cut the wires inside \the [src]!", "You have cut the wires inside \the [src].")
new/obj/item/stack/cable_coil(get_turf(src), 5)
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
buildstage = 1
update_icon()
return TRUE
diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm
index 8713b768c09..33313c0520d 100644
--- a/code/game/machinery/floor_light.dm
+++ b/code/game/machinery/floor_light.dm
@@ -28,7 +28,7 @@ var/list/floor_light_cache = list()
if(W.isscrewdriver())
anchored = !anchored
visible_message("\The [user] has [anchored ? "attached" : "detached"] \the [src].")
- playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
return TRUE
else if(W.iswelder() && (damaged || (stat & BROKEN)))
var/obj/item/weldingtool/WT = W
diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index 820ad0918de..227d3959967 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -31,7 +31,7 @@
new/datum/track("Endless Space", 'sound/music/space.ogg'),
new/datum/track("Scratch", 'sound/music/title1.ogg'),
new/datum/track("Suspenseful", 'sound/music/traitor.ogg'),
- new/datum/track("Thunderdome", 'sound/music/thunderdome.ogg'),
+ new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'),
new/datum/track("Velvet Rose", 'sound/music/velvet_rose.ogg')
)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 5c130942233..7bedd994cf6 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -212,7 +212,6 @@ Class Procs:
if (prob(25))
qdel(src)
return
- else
return
/proc/is_operable(var/obj/machinery/M, var/mob/user)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 6223c2fe1c0..039268c6e30 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -890,7 +890,7 @@
to_chat(user, "You need more fuel to complete this task.")
return TRUE
- playsound(loc, pick('sound/items/welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
+ playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
if(I.use_tool(src, user, 20, volume = 50))
if(!src || !WT.use(5, user)) return TRUE
build_step = 1
@@ -979,7 +979,7 @@
if(WT.get_fuel() < 5)
to_chat(user, "You need more fuel to complete this task.")
- playsound(loc, pick('sound/items/welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
+ playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/welder_pry.ogg'), 50, 1)
if(I.use_tool(src, user, 30, volume = 50))
if(!src || !WT.use(5, user))
return
@@ -1096,7 +1096,7 @@
sprite_set = "crossbow"
eprojectile = /obj/item/projectile/energy/bolt/large
- eshot_sound = 'sound/weapons/genhit.ogg'
+ eshot_sound = 'sound/weapons/Genhit.ogg'
req_one_access = list(access_syndicate)
/obj/machinery/porta_turret/cannon
diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm
index 488b01609a3..51ebc89bce8 100644
--- a/code/game/machinery/status_display_ai.dm
+++ b/code/game/machinery/status_display_ai.dm
@@ -84,7 +84,7 @@ var/list/ai_status_emotions = list(
src.update()
/proc/get_ai_emotion(mob/user as mob)
- return input(user, "Please, select a status!", "AI Status", null, null) in get_ai_emotions(user.ckey)
+ return input(user, "Please, select a status!", "AI Status", null) in get_ai_emotions(user.ckey)
/obj/machinery/ai_status_display/proc/update()
switch (mode)
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index cc75c2af474..c93b54a9796 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -51,7 +51,7 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return
if(canuse)
- playsound(src.loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
use_power_oneoff(6000) // Use a lot of power.
message_admins("[key_name(H)] has been borgified by the Autoborger 5000.")
visible_message("The machine makes a series of loud sounds as it starts to replace [H]'s organs and limbs with robotic parts!")
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 148a9a20f74..9bf883f16e5 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -219,7 +219,6 @@
src.malfunction()
return
return
- else
return
/obj/machinery/vending/emag_act(var/remaining_charges, var/mob/user)
diff --git a/code/game/modifiers/modifiers.dm b/code/game/modifiers/modifiers.dm
index a4010e59d7d..331809bc396 100644
--- a/code/game/modifiers/modifiers.dm
+++ b/code/game/modifiers/modifiers.dm
@@ -201,30 +201,29 @@ it should be avoided in favour of manual removal where possible
if (!target || !modifier_type)
return invalid_creation("No target and/or no modifier type was submitted")
- switch (modifier_type)
- if (MODIFIER_EQUIPMENT)
- if (!istype(target, /mob))
- return invalid_creation("Equipment type requires a mob target")
-
- if (!source || !istype(source, /obj))
- return invalid_creation("Equipment type requires an object source")
-
- //TODO: Port equip slot var
- if (MODIFIER_ITEM)
- if (!source || !istype(source, /obj))
- return invalid_creation("Item type requires a source")
-
- if (MODIFIER_AURA)
- if (!source || !istype(source, /atom))
- return invalid_creation("Aura type requires an atom source")
-
- if (MODIFIER_TIMED)
- if (!duration || duration <= 0)
- return invalid_creation("Timed type requires a duration")
- if (MODIFIER_CUSTOM)
- //No code here, just to prevent else
- else
- return invalid_creation("Invalid or unrecognised modifier type")//Not a valid modifier type.
+ if(modifier_type != MODIFIER_CUSTOM)
+ switch (modifier_type)
+ if (MODIFIER_EQUIPMENT)
+ if (!istype(target, /mob))
+ return invalid_creation("Equipment type requires a mob target")
+
+ if (!source || !istype(source, /obj))
+ return invalid_creation("Equipment type requires an object source")
+
+ //TODO: Port equip slot var
+ if (MODIFIER_ITEM)
+ if (!source || !istype(source, /obj))
+ return invalid_creation("Item type requires a source")
+
+ if (MODIFIER_AURA)
+ if (!source || !istype(source, /atom))
+ return invalid_creation("Aura type requires an atom source")
+
+ if (MODIFIER_TIMED)
+ if (!duration || duration <= 0)
+ return invalid_creation("Timed type requires a duration")
+ else
+ return invalid_creation("Invalid or unrecognised modifier type")//Not a valid modifier type.
return 1
diff --git a/code/game/objects/effects/burnt_wall.dm b/code/game/objects/effects/burnt_wall.dm
index 74966314be4..c8660152296 100644
--- a/code/game/objects/effects/burnt_wall.dm
+++ b/code/game/objects/effects/burnt_wall.dm
@@ -23,7 +23,7 @@
return TRUE
if(WT.use(0,user))
user.visible_message("[user] starts slicing \the [src] apart.", SPAN_NOTICE("You start slicing \the [src] apart."))
- playsound(src, 'sound/items/welder.ogg', 100, 1)
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
var/slice_time = reinf_material ? 100 : 30
if(WT.use_tool(src, user, slice_time, volume = 50))
user.visible_message("[user] slices \the [src] apart.", SPAN_NOTICE("You slice \the [src] apart."))
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 4d0ce3f0827..e537e6209a3 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -128,7 +128,7 @@
/obj/structure/sign/poster/attackby(obj/item/W as obj, mob/user as mob)
if(W.iswirecutter())
- playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(ruined)
to_chat(user, "You remove the remnants of the poster.")
qdel(src)
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 9260746d4d7..6e4335ca116 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -27,7 +27,7 @@
var/obj/item/weldingtool/WT = W
if(WT.use(0, user))
damage = 15
- playsound(loc, 'sound/items/welder.ogg', 100, 1)
+ playsound(loc, 'sound/items/Welder.ogg', 100, 1)
return TRUE
else
user.do_attack_animation(src)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 068c613a972..440bd644adb 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -163,7 +163,7 @@
if (prob(5))
qdel(src)
return
- else
+
return
/obj/item/verb/move_to_top(obj/item/I in range(1))
@@ -330,7 +330,7 @@
else if(hitsound)
playsound(hit_atom, hitsound, volume, TRUE, -1)
else
- playsound(hit_atom, 'sound/weapons/genhit.ogg', volume, TRUE, -1)
+ playsound(hit_atom, 'sound/weapons/Genhit.ogg', volume, TRUE, -1)
else
playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
else
diff --git a/code/game/objects/items/airbubble.dm b/code/game/objects/items/airbubble.dm
index 9147cdfd0ae..b6b60303c51 100644
--- a/code/game/objects/items/airbubble.dm
+++ b/code/game/objects/items/airbubble.dm
@@ -451,7 +451,7 @@
"[user] begins cutting cable restrains on zipper of [src].",
"You begin cutting cable restrains on zipper of [src]."
)
- playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
if (!do_after(user, 3 SECONDS, act_target = src, extra_checks = CALLBACK(src, PROC_REF(is_closed))))
return TRUE
zipped = !zipped
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 1b4952d3ae8..afff3d80316 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -268,14 +268,14 @@
if (!isturf(NT) || (NT in found) || (NT in pending))
continue
- switch(check_tile_is_border(NT,dir))
- if(BORDER_NONE)
- pending+=NT
- if(BORDER_BETWEEN)
- //do nothing, may be later i'll add 'rejected' list as optimization
- if(BORDER_2NDTILE)
- found+=NT //tile included to new area, but we dont seek more
- if(BORDER_SPACE)
- return ROOM_ERR_SPACE
+ var/tile_is_border = check_tile_is_border(NT,dir)
+ if(tile_is_border != BORDER_BETWEEN)
+ switch(tile_is_border)
+ if(BORDER_NONE)
+ pending+=NT
+ if(BORDER_2NDTILE)
+ found+=NT //tile included to new area, but we dont seek more
+ if(BORDER_SPACE)
+ return ROOM_ERR_SPACE
found+=T
return found
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index ab0fad61f59..439ae59b527 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -90,7 +90,7 @@
return TRUE
else if(W.iswirecutter())
to_chat(user, "You cut the tag off the bodybag.")
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
src.name = "body bag"
LAZYREMOVE(overlays, image(icon, "bodybag_label"))
return TRUE
diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index 37527c4df50..eccf6873b1f 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/code/game/objects/items/devices/floor_painter.dm
@@ -251,7 +251,7 @@
if(usr.incapacitated())
return
- var/new_colour = input(usr, "Choose a colour.", "paintgun", paint_colour) as color|anything in preset_colors
+ var/new_colour = input(usr, "Choose a colour.", "paintgun", paint_colour) as null|anything in preset_colors
if(new_colour && new_colour != paint_colour)
paint_colour = preset_colors[new_colour]
to_chat(usr, "You set \the [src] to paint with a new colour.")
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index 83ca884ea5f..61204df1f1a 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -32,7 +32,7 @@
/obj/item/device/multitool/hacktool/attackby(var/obj/item/W, var/mob/user)
if(W.isscrewdriver())
in_hack_mode = !in_hack_mode
- playsound(src.loc, 'sound/items/screwdriver.ogg', 50, TRUE)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, TRUE)
return TRUE
else
return ..()
diff --git a/code/game/objects/items/devices/magnetic_lock.dm b/code/game/objects/items/devices/magnetic_lock.dm
index 86ffeef4892..005c644cb85 100644
--- a/code/game/objects/items/devices/magnetic_lock.dm
+++ b/code/game/objects/items/devices/magnetic_lock.dm
@@ -145,7 +145,7 @@
addtimer(CALLBACK(GLOBAL_PROC, /proc/playsound, loc, "sound/effects/sparks[rand(1,4)].ogg", 30, 1), 3, TIMER_CLIENT_TIME)
else
user.visible_message("[user] hits [src] with [I] but fails to damage it.", "You hit [src] with [I], [I.force >= 10 ? "and it almost makes a dent!" : "but it appears to have no visible effect."]")
- playsound(loc, "sound/weapons/genhit.ogg", I.force*2.5, 1)
+ playsound(loc, "sound/weapons/Genhit.ogg", I.force*2.5, 1)
return TRUE
if(invincible)
@@ -167,7 +167,7 @@
var/obj/item/weldingtool/WT = I
if (WT.use(2, user))
user.visible_message(SPAN_NOTICE("[user] starts welding the metal shell of [src]."), SPAN_NOTICE("You start [hacked ? "repairing" : "welding open"] the metal covering of [src]."))
- playsound(loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(loc, 'sound/items/Welder.ogg', 50, 1)
add_overlay("overlay_welding")
if(WT.use_tool(src, user, 25, volume = 50))
to_chat(user, SPAN_NOTICE("You are able to [hacked ? "repair" : "weld through"] the metal shell of [src]."))
@@ -222,7 +222,7 @@
if (3)
if (I.iswirecutter())
to_chat(user, SPAN_NOTICE("You cut the wires connecting the [src]'s magnets to their internal powersupply, [target ? "making the device fall off [target] and rendering it unusable." : "rendering the device unusable."]"))
- playsound(loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
setconstructionstate(4)
return TRUE
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 8ac7354e600..2687e2c2eb3 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -49,7 +49,7 @@
to_chat(user, SPAN_WARNING("\The [O] must be safely placed on the ground for modification."))
return
- playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message(
SPAN_NOTICE("\The [user] opens \the [src] and modifies \the [O]."),
@@ -310,4 +310,4 @@
/obj/item/storage/box/dominianvoid
name = "dominian voidsman's modkit box"
desc = "Contains modkits to convert Dominian voidsuits into a voidsman's variant."
- starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4)
\ No newline at end of file
+ starts_with = list(/obj/item/voidsuit_modkit/dominianvoid = 4)
diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
index 13b0c7f114d..277c27bdb82 100644
--- a/code/game/objects/items/paintkit.dm
+++ b/code/game/objects/items/paintkit.dm
@@ -13,7 +13,7 @@
/obj/item/device/kit/use(var/amt, var/mob/user)
uses -= amt
- playsound(get_turf(user), 'sound/items/screwdriver.ogg', 50, 1)
+ playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
if(uses<1)
user.drop_from_inventory(src,get_turf(src))
qdel(src)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index c0e4af3ccd1..c6f36ed3577 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -138,7 +138,7 @@
else if(O.iswirecutter())
user.drop_from_inventory(O,get_turf(src))
to_chat(user, "You detach the wire from the [name].")
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/cable_coil(user.loc, 5)
new /obj/item/stack/material/glass(user.loc)
use(1)
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index bf953fefe54..80c147de8d7 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -221,7 +221,7 @@
update_icon(user)
else if(can_be_cut && I.iswirecutter())
user.visible_message("[user] cuts the [src].", SPAN_NOTICE("You cut the [src]."))
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
new/obj/item/stack/cable_coil(get_turf(src), 15, color)
qdel(src)
update_icon(user)
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index b40137de5af..60a33d2e9ae 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -74,7 +74,7 @@
/obj/item/shield/riot/handle_shield(mob/user)
. = ..()
- if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
+ if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/riot/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
@@ -113,7 +113,7 @@
/obj/item/shield/buckler/handle_shield(mob/user)
. = ..()
- if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
+ if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/buckler/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
@@ -323,7 +323,7 @@
. = ..()
if(.)
- if(.) playsound(user.loc, 'sound/weapons/genhit.ogg', 50, 1)
+ if(.) playsound(user.loc, 'sound/weapons/Genhit.ogg', 50, 1)
/obj/item/shield/riot/tact/attack_self(mob/living/user)
active = !active
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 99acfc4aa5e..743b718d266 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -62,7 +62,7 @@
w_class = ITEMSIZE_TINY
matter = list(DEFAULT_WALL_MATERIAL = 75)
attack_verb = list("stabbed")
- usesound = 'sound/items/screwdriver.ogg'
+ usesound = 'sound/items/Screwdriver.ogg'
drop_sound = 'sound/items/drop/screwdriver.ogg'
pickup_sound = 'sound/items/pickup/screwdriver.ogg'
lock_picking_level = 5
@@ -137,7 +137,7 @@
attack_verb = list("pinched", "nipped")
sharp = TRUE
edge = TRUE
- usesound = 'sound/items/wirecutter.ogg'
+ usesound = 'sound/items/Wirecutter.ogg'
drop_sound = 'sound/items/drop/wirecutter.ogg'
pickup_sound = 'sound/items/pickup/wirecutter.ogg'
var/bomb_defusal_chance = 30 // 30% chance to safely defuse a bomb
@@ -219,7 +219,7 @@
slot_flags = SLOT_BELT
drop_sound = 'sound/items/drop/weldingtool.ogg'
pickup_sound = 'sound/items/pickup/weldingtool.ogg'
- usesound = 'sound/items/welder.ogg'
+ usesound = 'sound/items/Welder.ogg'
attack_verb = list("hit", "bludgeoned", "whacked")
diff --git a/code/game/objects/structures/barricades/_barricade.dm b/code/game/objects/structures/barricades/_barricade.dm
index 948e1eef3a5..ffa4a8f491a 100644
--- a/code/game/objects/structures/barricades/_barricade.dm
+++ b/code/game/objects/structures/barricades/_barricade.dm
@@ -54,7 +54,7 @@
switch(dir)
if(SOUTH)
layer = ABOVE_MOB_LAYER
- else if(NORTH)
+ if(NORTH)
layer = initial(layer) - 0.01
else
layer = initial(layer)
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 38995573ff1..ca422548c0e 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -15,7 +15,6 @@ var/global/list/total_active_bonfires = list()
var/max_fuel = 2000
var/on_fire = FALSE
var/safe = FALSE
- var/obj/machinery/appliance/bonfire/cook_machine
var/list/burnable_materials = list(MATERIAL_WOOD = 200, MATERIAL_WOOD_LOG = 400, MATERIAL_WOOD_BRANCH = 40, MATERIAL_COTTON = 20, MATERIAL_CLOTH = 50, MATERIAL_CARPET = 20, MATERIAL_CARDBOARD = 35)
var/list/burnable_other = list(/obj/item/ore/coal = 750, /obj/item/torch = 20) //For items without material/default material
var/heat_range = 5 //Range in which it will heat other people
@@ -385,4 +384,4 @@ var/global/list/total_active_bonfires = list()
return !density
return TRUE
-#undef MAX_ACTIVE_BONFIRE_LIMIT
\ No newline at end of file
+#undef MAX_ACTIVE_BONFIRE_LIMIT
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index e404feb7784..cf13c2b4559 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -414,7 +414,7 @@
screwed = FALSE
else if(!screwed && wrenched)
to_chat(user, SPAN_NOTICE("You start to screw the \the [src] to the floor..."))
- playsound(src, 'sound/items/welder.ogg', 80, 1)
+ playsound(src, 'sound/items/Welder.ogg', 80, 1)
if (do_after(user, 15/W.toolspeed SECONDS, act_target = src))
to_chat(user, SPAN_NOTICE("You screw \the [src]!"))
playsound(loc, W.usesound, 50, 1)
diff --git a/code/game/objects/structures/crystals.dm b/code/game/objects/structures/crystals.dm
index e8821e9182b..c277698399c 100644
--- a/code/game/objects/structures/crystals.dm
+++ b/code/game/objects/structures/crystals.dm
@@ -114,7 +114,7 @@
return
else
health -= rand(40,80)
- else
+
if(health <= 0)
harvest()
return
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index e163def59f4..fc6105694cd 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -258,7 +258,7 @@
to_chat(user, SPAN_WARNING("\The [src]'s wires cannot be reached, take out the electronics first."))
return
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message("[user] starts cutting the wires from the airlock assembly.", SPAN_NOTICE("You start cutting the wires from airlock assembly."))
if(W.use_tool(src, user, 40, volume = 50))
@@ -277,7 +277,7 @@
return
var/obj/item/airlock_electronics/EL = W
if(!EL.is_installed)
- playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] starts installing \the [EL] into the airlock assembly.", SPAN_NOTICE("You start installing \the [EL] into the airlock assembly."))
EL.is_installed = TRUE
if(W.use_tool(src, user, 40, volume = 50) && state == STATE_WIRED)
diff --git a/code/game/objects/structures/full_window_frame.dm b/code/game/objects/structures/full_window_frame.dm
index cf7fd691917..38446ceb9f8 100644
--- a/code/game/objects/structures/full_window_frame.dm
+++ b/code/game/objects/structures/full_window_frame.dm
@@ -115,7 +115,7 @@
if(!WT.isOn())
to_chat(user, SPAN_NOTICE("\The [WT] isn't turned on."))
return
- playsound(src, 'sound/items/welder.ogg', 50, TRUE)
+ playsound(src, 'sound/items/Welder.ogg', 50, TRUE)
user.visible_message(
SPAN_WARNING("\The [user] starts welding \the [src] apart!"),
SPAN_NOTICE("You start welding \the [src] apart..."),
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 88720ee245f..ccb56b28b93 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -301,7 +301,6 @@
return
else
health -= rand(40,80)
- else
if(health <= 0)
dismantle()
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index d8f4b3394b0..b448fb31960 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -99,7 +99,7 @@
/obj/structure/grille/attackby(obj/item/W, mob/user)
if(W.iswirecutter())
if(!shock(user, 100))
- playsound(loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
qdel(src)
else if(istype(W, /obj/item/gun/energy/plasmacutter))
@@ -112,7 +112,7 @@
qdel(src)
else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
- playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
anchored = !anchored
user.visible_message("[user] [anchored ? "fastens" : "unfastens"] the grille.", \
"You have [anchored ? "fastened the grille to" : "unfastened the grill from"] the floor.")
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 395da6b8f43..64aedb87f39 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -69,7 +69,7 @@
var/obj/item/stack/rods/R = C
if (R.use(2))
to_chat(user, "Constructing catwalk ...")
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
new /obj/structure/lattice/catwalk(src.loc)
qdel(src)
return
@@ -164,7 +164,7 @@
var/obj/item/weldingtool/WT = C
if(C.use_tool(src, user, 5, volume = 50) && WT.use(1, user))
to_chat(user, SPAN_NOTICE("You slice apart the [src] leaving nothing useful behind."))
- playsound(src, 'sound/items/welder.ogg', 50, 1)
+ playsound(src, 'sound/items/Welder.ogg', 50, 1)
qdel(src)
else
..()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 5a937821763..fe83c28414e 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -275,9 +275,9 @@
desperation = rand(1,5)
switch(desperation) //This is messy. A better solution would probably be to make more sounds, but...
if(1)
- playsound(src.loc, 'sound/weapons/genhit.ogg', 45, 1)
+ playsound(src.loc, 'sound/weapons/Genhit.ogg', 45, 1)
shake_animation(2)
- playsound(src.loc, 'sound/weapons/genhit.ogg', 45, 1)
+ playsound(src.loc, 'sound/weapons/Genhit.ogg', 45, 1)
if(2)
playsound(src.loc, 'sound/effects/grillehit.ogg', 45, 1)
shake_animation(3)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 867edbaa9a1..9b4bb2a39f7 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -188,7 +188,7 @@
to_chat(user, "\The [src] has no padding to remove.")
return
to_chat(user, "You remove the padding from \the [src].")
- playsound(src, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
painted_colour = null
remove_padding()
@@ -199,7 +199,7 @@
else
anchored = TRUE
to_chat(user, "You fasten \the [src] to the floor.")
- playsound(src, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
else if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 157480aa55d..f7a67ca90b7 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -150,7 +150,7 @@
//Removing wire from the assembly. Step 5 undone.
if(W.iswirecutter() && !src.electronics)
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.")
if(W.use_tool(src, user, 40, volume = 50))
@@ -168,7 +168,7 @@
else if(istype(W, /obj/item/airlock_electronics) && W:icon_state != "door_electronics_smoked")
var/obj/item/airlock_electronics/EL = W
if(!EL.is_installed)
- playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly.")
EL.is_installed = 1
if(do_after(user, 40))
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index ba9f952443c..969f02243e7 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -23,7 +23,7 @@
return
to_chat(user, "You unscrew and remove the [flooring.descriptor].")
make_plating(1)
- playsound(src, 'sound/items/screwdriver.ogg', 80, 1)
+ playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
return
else if(C.iswrench() && (flooring.flags & TURF_REMOVE_WRENCH))
to_chat(user, "You unwrench and remove the [flooring.descriptor].")
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index db7a2c344e8..37706f6219c 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -125,7 +125,7 @@
var/obj/item/weldingtool/WT = W
if(WT.use(0,user))
to_chat(user, SPAN_NOTICE("You burn away the fungi with \the [WT]."))
- playsound(src, 'sound/items/welder.ogg', 10, 1)
+ playsound(src, 'sound/items/Welder.ogg', 10, 1)
for(var/obj/effect/overlay/wallrot/WR in src)
qdel(WR)
return
@@ -175,7 +175,7 @@
if(WT.use(0,user))
to_chat(user, SPAN_NOTICE("You start repairing the damage to [src]."))
- playsound(src, 'sound/items/welder.ogg', 50, 1)
+ playsound(src, 'sound/items/Welder.ogg', 50, 1)
if(WT.use_tool(src, user, max(5, damage / 5), volume = 50) && WT && WT.isOn())
to_chat(user, SPAN_NOTICE("You finish repairing the damage to [src]."))
take_damage(-damage)
@@ -200,7 +200,7 @@
to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
return
dismantle_verb = "cutting"
- dismantle_sound = 'sound/items/welder.ogg'
+ dismantle_sound = 'sound/items/Welder.ogg'
cut_delay *= 0.7
else if(istype(W, /obj/item/gun/energy/plasmacutter))
var/obj/item/gun/energy/plasmacutter/PC = W
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 4d6e0a3a6d1..6178368a43c 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -30,7 +30,7 @@
var/material/reinf_material
var/last_state
var/construction_stage
- var/hitsound = 'sound/weapons/genhit.ogg'
+ var/hitsound = 'sound/weapons/Genhit.ogg'
var/use_set_icon_state
var/under_turf = /turf/simulated/floor/plating
@@ -84,7 +84,7 @@
burn(2500)
else if(istype(Proj,/obj/item/projectile/ion))
burn(500)
-
+
bullet_ping(Proj)
create_bullethole(Proj)
@@ -190,7 +190,7 @@
/turf/simulated/wall/proc/dismantle_wall(var/devastated, var/explode, var/no_product, var/no_change = FALSE)
if (!no_change) // No change is TRUE when this is called by destroy.
- playsound(src, 'sound/items/welder.ogg', 100, 1)
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(!no_product)
if(reinf_material)
@@ -226,7 +226,7 @@
dismantle_wall(1,1)
if(3.0)
take_damage(rand(0, 250))
- else
+
return
// Wall-rot effect, a nasty fungus that destroys walls.
@@ -271,4 +271,4 @@
D.ignite(temperature/4)
/turf/simulated/wall/is_wall()
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 1bbfb6e55ed..2d095343f36 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -87,7 +87,7 @@
var/obj/item/stack/rods/R = C
if (R.use(1))
to_chat(user, "Constructing support lattice ...")
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
ReplaceWithLattice()
return
@@ -98,7 +98,7 @@
if (S.get_amount() < 1)
return
qdel(L)
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
S.use(1)
ChangeTurf(/turf/simulated/floor/airless, keep_air = TRUE)
return
diff --git a/code/global.dm b/code/global.dm
index 1f1d52adc5d..a8e3879b56c 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -125,7 +125,7 @@ var/static/list/scarySounds = list(
'sound/effects/glass_break1.ogg',
'sound/effects/glass_break2.ogg',
'sound/effects/glass_break3.ogg',
- 'sound/items/welder.ogg',
+ 'sound/items/Welder.ogg',
'sound/items/welder_pry.ogg',
'sound/machines/airlock.ogg',
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index a4d982aeac6..41ba1092b77 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -28,8 +28,6 @@
return
if("Cancel")
return
- if("No")
- ; // do nothing
callproc_targetpicked(targetselected, target)
@@ -137,8 +135,6 @@
current = get_area(M)
if(!current)
switch(alert("\The [M] appears to not have an area; do you want to pass null instead?",, "Yes", "Cancel"))
- if("Yes")
- ; // do nothing
if("Cancel")
return
@@ -146,8 +142,6 @@
current = holder.marked_datum
if(!current)
switch(alert("You do not currently have a marked datum; do you want to pass null instead?",, "Yes", "Cancel"))
- if("Yes")
- ; // do nothing
if("Cancel")
return
if(!done)
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 4bae4199a6f..ea7255a1e27 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -310,11 +310,10 @@ var/list/VVdynamic_lock = list(
mod_list(variable, O, original_name, objectvar)
if("restore to default")
- new_var = initial(variable)
if(assoc)
- L[assoc_key] = new_var
+ L[assoc_key] = variable
else
- L[L.Find(variable)] = new_var
+ L[L.Find(variable)] = variable
if("edit referenced object")
modify_variables(variable)
diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm
index bf7f5be1093..847cea42a79 100644
--- a/code/modules/admin/view_variables/view_variables.dm
+++ b/code/modules/admin/view_variables/view_variables.dm
@@ -131,9 +131,7 @@
var/vtext = ""
var/debug_type = get_debug_type(value, FALSE)
var/extra = list()
- if(isnull(value))
- // get_debug_type displays this
- else if(istext(value))
+ if(istext(value))
debug_type = null // it's kinda annoying here; we can tell the type by the quotes
vtext = "\"[html_encode(value)]\""
else if(isicon(value))
diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm
index fcf6ba659ad..52b262eeb98 100644
--- a/code/modules/asset_cache/asset_cache.dm
+++ b/code/modules/asset_cache/asset_cache.dm
@@ -582,7 +582,7 @@ var/list/asset_datums = list()
"sovjetbox.woff" = 'html/fonts/OFL/SovjetBox.woff',
"torsha.woff" = 'html/fonts/OFL/Torsha.woff',
"web3of9ascii.woff" = 'html/fonts/OFL/Web3Of9ASCII.woff',
- "zeshit.woff" = 'html/fonts/OFL/zeshit.woff',
+ "zeshit.woff" = 'html/fonts/OFL/Zeshit.woff',
"bilboinc.woff" = 'html/fonts/OFL/BilboINC.woff',
"fproject.woff" = 'html/fonts/OFL/FProject.woff',
"gelasio.woff" = 'html/fonts/OFL/Gelasio.woff',
diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm
index 265a8d89a1c..e3e271a99a7 100644
--- a/code/modules/cargo/export_scanner.dm
+++ b/code/modules/cargo/export_scanner.dm
@@ -7,7 +7,6 @@
item_flags = NOBLUDGEON
w_class = ITEMSIZE_SMALL
siemens_coefficient = 1
- var/obj/machinery/computer/cargo/cargo_console = null
/obj/item/export_scanner/afterattack(obj/O, mob/user, proximity)
. = ..()
diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm
index e3317b74189..1d779b21964 100644
--- a/code/modules/client/preference_setup/general/06_flavor.dm
+++ b/code/modules/client/preference_setup/general/06_flavor.dm
@@ -134,30 +134,30 @@
/datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user)
if(href_list["flavor_text"])
- switch(href_list["flavor_text"])
- if("open")
- if("general")
- var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
- if(CanUseTopic(user))
- pref.flavor_texts[href_list["flavor_text"]] = msg
- else
- var/msg = sanitize(input(usr,"Set the flavor text for your [href_list["flavor_text"]].","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
- if(CanUseTopic(user))
- pref.flavor_texts[href_list["flavor_text"]] = msg
+ if(href_list["flavor_text"] != "open")
+ switch(href_list["flavor_text"])
+ if("general")
+ var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
+ if(CanUseTopic(user))
+ pref.flavor_texts[href_list["flavor_text"]] = msg
+ else
+ var/msg = sanitize(input(usr,"Set the flavor text for your [href_list["flavor_text"]].","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
+ if(CanUseTopic(user))
+ pref.flavor_texts[href_list["flavor_text"]] = msg
SetFlavorText(user)
return TOPIC_HANDLED
else if(href_list["flavour_text_robot"])
- switch(href_list["flavour_text_robot"])
- if("open")
- if("Default")
- var/msg = sanitize(input(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"])) as message, extra = 0)
- if(CanUseTopic(user))
- pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
- else
- var/msg = sanitize(input(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this empty, default flavour text will be used for this module.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]])) as message, extra = 0)
- if(CanUseTopic(user))
- pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
+ if(href_list["flavour_text_robot"] != "open")
+ switch(href_list["flavour_text_robot"])
+ if("Default")
+ var/msg = sanitize(input(usr,"Set the default flavour text for your robot. It will be used for any module without individual setting.","Flavour Text",html_decode(pref.flavour_texts_robot["Default"])) as message, extra = 0)
+ if(CanUseTopic(user))
+ pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
+ else
+ var/msg = sanitize(input(usr,"Set the flavour text for your robot with [href_list["flavour_text_robot"]] module. If you leave this empty, default flavour text will be used for this module.","Flavour Text",html_decode(pref.flavour_texts_robot[href_list["flavour_text_robot"]])) as message, extra = 0)
+ if(CanUseTopic(user))
+ pref.flavour_texts_robot[href_list["flavour_text_robot"]] = msg
SetFlavourTextRobot(user)
return TOPIC_HANDLED
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1e43f2d1490..2ae8225a4c5 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -465,7 +465,7 @@
update_icon()
return
- playsound(src.loc, 'sound/items/wirecutter.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user.visible_message(SPAN_WARNING("[user] cuts the fingertips off of \the [src]."),SPAN_WARNING("You cut the fingertips off of \the [src]."))
clipped = 1
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 1f054e14c62..31a03d741df 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -277,7 +277,7 @@
var/choice = input("What component would you like to remove?") as null|anything in list(helmet,boots,tank,cooler)
if(!choice) return
- playsound(src, 'sound/items/screwdriver.ogg', 50, 1)
+ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
if(choice == tank) //No, a switch doesn't work here. Sorry. ~Techhead
to_chat(user, "You pop \the [tank] out of \the [src]'s storage compartment.")
tank.forceMove(get_turf(src))
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index dd383479e98..50f661569f3 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -346,7 +346,7 @@
name = "tallit"
desc = "A tallit is a fringed garment worn as a prayer shawl by religious Jews. \
The tallit has special twined and knotted fringes known as tzitzit attached to its four corners."
- icon = 'icons/clothing/accessories/tallit.dmi'
+ icon = 'icons/clothing/accessories/Tallit.dmi'
item_state = "tallit"
icon_state = "tallit"
contained_sprite = TRUE
diff --git a/code/modules/clothing/wrists/watches.dm b/code/modules/clothing/wrists/watches.dm
index 4e8bf3db9a5..7d5fbe94b00 100644
--- a/code/modules/clothing/wrists/watches.dm
+++ b/code/modules/clothing/wrists/watches.dm
@@ -22,7 +22,7 @@
icon_state = "watch_gold"
item_state = "watch_gold"
-/obj/item/clothing/wrists/watch/holo
+/obj/item/clothing/wrists/watch/holo
desc = "It's a GaussIo ZeitMeister with a holographic screen."
desc_extended = "The latest Elyran technology!"
icon_state = "watch_holo"
@@ -77,7 +77,7 @@
/obj/item/clothing/wrists/watch/attackby(obj/item/W, mob/user)
if(W.isscrewdriver())
user.visible_message(SPAN_NOTICE("[user] [screwed ? "unscrews" : "screws"] the cover of the [src] [screwed ? "open" : "closed"]."), SPAN_NOTICE("You [screwed ? "unscrews" : "screws"] the cover of the [src] [screwed ? "open" : "closed"]."))
- playsound(src.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
screwed = !screwed
return
if(wired)
diff --git a/code/modules/cooking/recipes/recipe.dm b/code/modules/cooking/recipes/recipe.dm
index 617b5492dad..c37961e51e1 100644
--- a/code/modules/cooking/recipes/recipe.dm
+++ b/code/modules/cooking/recipes/recipe.dm
@@ -268,8 +268,6 @@
switch(reagent_mix)
- if (RECIPE_REAGENT_REPLACE)
- //We do no transferring
if (RECIPE_REAGENT_SUM)
//Sum is easy, just shove the entire buffer into the result
buffer.trans_to_holder(holder, buffer.total_volume)
diff --git a/code/modules/custom_ka/core.dm b/code/modules/custom_ka/core.dm
index b98d9a3180a..b282ddc3749 100644
--- a/code/modules/custom_ka/core.dm
+++ b/code/modules/custom_ka/core.dm
@@ -433,7 +433,7 @@
installed_cell.forceMove(src)
update_stats()
update_icon()
- playsound(src,'sound/items/wirecutter.ogg', 50, 0)
+ playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
return TRUE
else if(istype(I,/obj/item/custom_ka_upgrade/barrels))
if(!installed_cell)
@@ -447,7 +447,7 @@
installed_barrel.forceMove(src)
update_stats()
update_icon()
- playsound(src,'sound/items/wirecutter.ogg', 50, 0)
+ playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
return TRUE
else if(istype(I,/obj/item/custom_ka_upgrade/upgrade_chips))
if(!installed_cell || !installed_barrel)
@@ -465,7 +465,7 @@
installed_upgrade_chip.forceMove(src)
update_stats()
update_icon()
- playsound(src,'sound/items/wirecutter.ogg', 50, 0)
+ playsound(src,'sound/items/Wirecutter.ogg', 50, 0)
return TRUE
if(installed_cell)
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 626c7825332..d1bf3373e73 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -237,8 +237,8 @@
authenticated_account = SSeconomy.attempt_account_access(text2num(params["account_num"]), tried_pin, potential_account.security_level)
if (3) // Security level two
if (held_card)
- if (text2num(params["account_num"]) != held_card.associated_account_number)
- else authenticated_account = SSeconomy.attempt_account_access(tried_account_num, tried_pin, potential_account.security_level)
+ if (text2num(params["account_num"]) == held_card.associated_account_number)
+ authenticated_account = SSeconomy.attempt_account_access(tried_account_num, tried_pin, potential_account.security_level)
else to_chat(usr, SPAN_WARNING("Account not found."))
if (!authenticated_account)
number_incorrect_tries++
diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index 55915a83f18..37a59288e94 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -243,13 +243,13 @@
key = "growl"
emote_message_3p_target = "USER growls at TARGET."
emote_message_3p = "USER growls."
- emote_sound = 'sound/voice/Lizardgrowl.ogg'
+ emote_sound = 'sound/voice/lizardgrowl.ogg'
/singleton/emote/audible/hiss/long
key = "hiss2"
emote_message_3p_target = "USER hisses loudly at TARGET!"
emote_message_3p = "USER hisses loudly!"
- emote_sound = 'sound/voice/lizardhiss2.ogg'
+ emote_sound = 'sound/voice/Lizardhiss2.ogg'
/singleton/emote/audible/lizard_bellow
key = "bellow"
diff --git a/code/modules/hallucinations/types/sound.dm b/code/modules/hallucinations/types/sound.dm
index c1f55a1afb9..97b01e504b7 100644
--- a/code/modules/hallucinations/types/sound.dm
+++ b/code/modules/hallucinations/types/sound.dm
@@ -30,9 +30,9 @@
'sound/voice/chitter2.ogg',
'sound/effects/squelch1.ogg',
'sound/items/wrench.ogg',
- 'sound/items/welder.ogg',
+ 'sound/items/Welder.ogg',
/singleton/sound_category/crowbar_sound,
- 'sound/items/screwdriver.ogg',
+ 'sound/items/Screwdriver.ogg',
'sound/items/drill_use.ogg',
'sound/items/air_wrench.ogg')
diff --git a/code/modules/heavy_vehicle/components/_components.dm b/code/modules/heavy_vehicle/components/_components.dm
index 4d80478e946..1dc4a18bb86 100644
--- a/code/modules/heavy_vehicle/components/_components.dm
+++ b/code/modules/heavy_vehicle/components/_components.dm
@@ -129,7 +129,7 @@
if(brute_damage)
repair_brute_damage(repair_value)
to_chat(user, SPAN_NOTICE("You mend the damage to \the [src]."))
- playsound(user.loc, 'sound/items/welder.ogg', 25, 1)
+ playsound(user.loc, 'sound/items/Welder.ogg', 25, 1)
/obj/item/mech_component/proc/repair_burn_generic(var/obj/item/stack/cable_coil/CC, var/mob/user)
if(!istype(CC))
diff --git a/code/modules/heavy_vehicle/components/frame.dm b/code/modules/heavy_vehicle/components/frame.dm
index 71210e05745..5da1f06e2f6 100644
--- a/code/modules/heavy_vehicle/components/frame.dm
+++ b/code/modules/heavy_vehicle/components/frame.dm
@@ -169,7 +169,7 @@
// We're all done. Finalize the mech and pass the frame to the new system.
var/mob/living/heavy_vehicle/M = new(get_turf(src), src)
visible_message("\The [user] finishes off \the [M].")
- playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
arms = null
legs = null
diff --git a/code/modules/heavy_vehicle/mech_construction.dm b/code/modules/heavy_vehicle/mech_construction.dm
index a34ce712564..0a1c0e32c42 100644
--- a/code/modules/heavy_vehicle/mech_construction.dm
+++ b/code/modules/heavy_vehicle/mech_construction.dm
@@ -125,7 +125,7 @@
if(user.unEquip(system))
to_chat(user, "You install \the [system] in \the [src]'s [system_hardpoint].")
- playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
else return FALSE
var/obj/item/mecha_equipment/ME = system
if(istype(ME))
@@ -201,6 +201,6 @@
system.forceMove(get_turf(user))
user.put_in_hands(system)
to_chat(user, "You remove \the [system] in \the [src]'s [system_hardpoint].")
- playsound(user.loc, 'sound/items/screwdriver.ogg', 100, 1)
+ playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
return system
diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index 2b62a9e04cc..db2e8b2b94d 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -475,7 +475,7 @@
thing.forceMove(body)
body.cell = thing
to_chat(user, "You install \the [body.cell] into \the [src].")
- playsound(user.loc, 'sound/items/screwdriver.ogg', 50, 1)
+ playsound(user.loc, 'sound/items/Screwdriver.ogg', 50, 1)
visible_message("\The [user] installs \the [body.cell] into \the [src].")
return
else if(istype(thing, /obj/item/device/robotanalyzer))
diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm
index 8849ffa45df..c5010c6f9fb 100644
--- a/code/modules/heavy_vehicle/mecha.dm
+++ b/code/modules/heavy_vehicle/mecha.dm
@@ -57,9 +57,6 @@
var/obj/item/mech_component/sensors/head
var/obj/item/mech_component/chassis/body
- // Invisible components.
- var/datum/effect/effect/system/spark_spread/sparks
-
// Equipment tracking vars.
var/obj/item/mecha_equipment/selected_system
var/selected_hardpoint
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index f1d88d1581e..0b6023efe8c 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -284,7 +284,7 @@
if (prob(5))
die_off()
return
- else
+
return
/obj/effect/plant/proc/check_health()
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 068fefc2c0e..9f3e6df74cc 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -83,7 +83,7 @@
b.forceMove(get_turf(src))
qdel(src)
return
- else
+
return
/obj/structure/bookcase/update_icon()
diff --git a/code/modules/maps/swapmaps.dm b/code/modules/maps/swapmaps.dm
index 05691306abb..93665fb98e0 100644
--- a/code/modules/maps/swapmaps.dm
+++ b/code/modules/maps/swapmaps.dm
@@ -187,62 +187,6 @@
qdel(areas)
..()
- /*
- Savefile format:
- map
- id
- x // size, not coords
- y
- z
- areas // list of areas, not including default
- [each z; 1 to depth]
- [each y; 1 to height]
- [each x; 1 to width]
- type // of turf
- AREA // if non-default; saved as a number (index into areas list)
- vars // all other changed vars
- */
-/swapmap/Write(savefile/S)
- var/x
- var/y
- var/z
- var/n
- var/list/areas
- var/area/defarea=locate(world.area)
- if(!defarea) defarea=new world.area
- areas=list()
- for(var/turf/T in block(locate(x1,y1,z1),locate(x2,y2,z2)))
- areas[T.loc]=null
- for(n in areas) // quickly eliminate associations for smaller storage
- areas-=n
- areas+=n
- areas-=defarea
- InitializeSwapMaps()
- locked=1
- S["id"] << id
- S["z"] << z2-z1+1
- S["y"] << y2-y1+1
- S["x"] << x2-x1+1
- S["areas"] << areas
- for(n in 1 to areas.len) areas[areas[n]]=n
- var/oldcd=S.cd
- for(z=z1,z<=z2,++z)
- S.cd="[z-z1+1]"
- for(y=y1,y<=y2,++y)
- S.cd="[y-y1+1]"
- for(x=x1,x<=x2,++x)
- S.cd="[x-x1+1]"
- var/turf/T=locate(x,y,z)
- S["type"] << T.type
- if(T.loc!=defarea) S["AREA"] << areas[T.loc]
- T.Write(S)
- S.cd=".."
- S.cd=".."
- sleep()
- S.cd=oldcd
- locked=0
- qdel(areas)
-
/swapmap/Read(savefile/S,_id,turf/locorner)
var/x
var/y
@@ -453,28 +397,6 @@
/swapmap/proc/BuildInTurfs(list/turfs,item)
for(var/T in turfs) new item(T)
-/atom/Write(savefile/S)
- for(var/V in vars-"x"-"y"-"z"-"contents"-"icon"-"overlays"-"underlays")
- if(issaved(vars[V]))
- if(vars[V]!=initial(vars[V])) S[V]< ID.mining_points)
- else
+ if(prize.cost <= ID.mining_points)
if(prize.shuttle)
if(SScargo.order_mining(prize.equipment_path))
ID.mining_points -= prize.cost
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 8d86c5cd25f..bdec8dd6580 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -1208,7 +1208,7 @@ var/list/total_extraction_beacons = list()
user.visible_message(SPAN_NOTICE("\The [user] begins sculpting."), SPAN_NOTICE("You begin sculpting."))
if(prob(25))
- playsound(loc, 'sound/items/screwdriver.ogg', 20, TRUE)
+ playsound(loc, 'sound/items/Screwdriver.ogg', 20, TRUE)
else
playsound(loc, /singleton/sound_category/pickaxe_sound, 20, TRUE)
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 405be2adf19..7f631bae4b6 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -710,7 +710,7 @@ var/list/asteroid_floor_smooth = list(
var/obj/item/stack/rods/R = W
if(R.use(1))
to_chat(user, SPAN_NOTICE("Constructing support lattice..."))
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
ReplaceWithLattice()
return
@@ -721,7 +721,7 @@ var/list/asteroid_floor_smooth = list(
if(S.get_amount() < 1)
return
qdel(L)
- playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, TRUE)
S.use(1)
ChangeTurf(/turf/simulated/floor/airless)
return
diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm
index ce3f597ccc0..50f121051b7 100644
--- a/code/modules/mob/abstract/observer/observer.dm
+++ b/code/modules/mob/abstract/observer/observer.dm
@@ -12,7 +12,7 @@
invisibility = INVISIBILITY_OBSERVER
simulated = FALSE
var/can_reenter_corpse
- var/datum/hud/living/carbon/hud = null // hud
+ var/datum/hud/hud = null // hud
var/bootime = 0
var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
//If you died in the game and are a ghsot - this will remain as null.
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index e6b9ec6a318..25fa6a5943e 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -235,11 +235,12 @@
if("whisper")
whisper(message, speaking, is_singing)
return TRUE
- else if(message_mode)
- var/obj/item/device/radio/R = get_radio()
- if(R)
- used_radios += R
- R.talk_into(src, message, message_mode, verb, speaking)
+ else
+ if(message_mode)
+ var/obj/item/device/radio/R = get_radio()
+ if(R)
+ used_radios += R
+ R.talk_into(src, message, message_mode, verb, speaking)
/mob/living/carbon/human/handle_speech_sound()
var/list/returns = ..()
diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm
index 6bbe819d67d..db95d62d278 100644
--- a/code/modules/mob/living/carbon/human/species/species_attack.dm
+++ b/code/modules/mob/living/carbon/human/species/species_attack.dm
@@ -236,7 +236,7 @@
attack_verb = list("scorched", "burned")
attack_noun = list("flaming fist")
damage = 10
- attack_sound = 'sound/items/welder.ogg'
+ attack_sound = 'sound/items/Welder.ogg'
attack_name = "flaming touch"
damage_type = DAMAGE_BURN
@@ -289,4 +289,4 @@
user.visible_message(SPAN_DANGER("\The [user] crackles with energy!"))
if(iscarbon(target))
var/mob/living/carbon/L = target
- L.electrocute_act(20,user, 1, user.zone_sel.selecting)
\ No newline at end of file
+ L.electrocute_act(20,user, 1, user.zone_sel.selecting)
diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm
index 3c85edc754a..02461d5f097 100644
--- a/code/modules/mob/living/carbon/human/species/station/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/station/golem.dm
@@ -816,7 +816,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
death_message = "collapses into a pile of flesh!"
death_message_range = 7
- death_sound = 'sound/magic/disintegrate.ogg'
+ death_sound = 'sound/magic/Disintegrate.ogg'
golem_designation = "Flesh"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b47749f2111..416469a1381 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -589,8 +589,7 @@ default behaviour is:
if (!restrained())
var/diag = get_dir(src, pulling)
- if ((diag - 1) & diag)
- else
+ if (!((diag - 1) & diag))
diag = null
if ((get_dist(src, pulling) > 1 || diag))
if (isliving(pulling))
diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm
index cfe703d165a..863a555debe 100644
--- a/code/modules/mob/living/silicon/ai/malf.dm
+++ b/code/modules/mob/living/silicon/ai/malf.dm
@@ -5,14 +5,14 @@
var/mob/living/silicon/ai/user = src
// Setup Variables
malfunctioning = 1
- research = new/datum/malf_research()
+ research = /datum/malf_research
research.owner = src
hacked_apcs = list()
recalc_cpu()
- add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_hardware())
- add_verb(src, new/datum/game_mode/malfunction/verb/ai_select_research())
- add_verb(src, new/datum/game_mode/malfunction/verb/ai_help())
+ add_verb(src, /datum/game_mode/malfunction/verb/ai_select_hardware)
+ add_verb(src, /datum/game_mode/malfunction/verb/ai_select_research)
+ add_verb(src, /datum/game_mode/malfunction/verb/ai_help)
// And greet user with some OOC info.
to_chat(user, "You are malfunctioning, you do not have to follow any laws.")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 02205c8f5f5..0edd7b9f4a2 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -120,7 +120,7 @@
if(wood)
wood.add_charge(4000)
else if(istype(W, /obj/item/pipe))
- // This allows drones and engiborgs to clear pipe assemblies from floors.
+ continue // This allows drones and engiborgs to clear pipe assemblies from floors.
else if(istype(W, /obj/item/broken_bottle))
if(glass)
glass.add_charge(2000)
@@ -194,4 +194,4 @@
dat += resources
- src << browse(dat, "window=robotmod")
\ No newline at end of file
+ src << browse(dat, "window=robotmod")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index e2a0c38be64..85e185acd21 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -17,7 +17,7 @@
var/icon_selected = 0 //If icon selection has been completed yet
var/spawn_sound = 'sound/voice/liveagain.ogg'
var/pitch_toggle = TRUE
- var/datum/effect/effect/system/ion_trail_follow/ion_trail
+ var/datum/effect_system/ion_trail/ion_trail
var/datum/effect_system/sparks/spark_system
// Wiring
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 4d833c7264b..e9a3f911510 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -33,7 +33,6 @@
var/obj/screen/gun/item/item_use_icon = null
var/obj/screen/gun/radio/radio_use_icon = null
var/obj/screen/gun/move/gun_move_icon = null
- var/obj/screen/gun/run/gun_run_icon = null
var/obj/screen/gun/mode/gun_setting_icon = null
var/obj/screen/gun/unique_action_icon = null
var/obj/screen/gun/toggle_firing_mode = null
@@ -207,7 +206,6 @@
//Monkey/infected mode
var/list/resistances = list()
- var/datum/disease/virus = null
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 816e0d18280..e409b1a64ab 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -232,7 +232,7 @@
new_slime = new /mob/living/carbon/slime(loc)
if(adult)
new_slime.is_adult = 1
- else
+
new_slime.key = key
to_chat(new_slime, "You are now a slime. Skreee!")
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index d82909a9126..608c392a16e 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -289,7 +289,7 @@
return TRUE
to_chat(user, SPAN_NOTICE("You begin repairing the damage to \the [src]..."))
- playsound(get_turf(src), 'sound/items/welder.ogg', 100, 1)
+ playsound(get_turf(src), 'sound/items/Welder.ogg', 100, 1)
if(WT.use(round(damage / 75)) && do_after(user, damage / 10))
damage = 0
to_chat(user, SPAN_NOTICE("You fully repair \the [src]."))
diff --git a/code/modules/multiz/_stubs.dm b/code/modules/multiz/_stubs.dm
index 6efa98ecd1d..2b8fe09e0dd 100644
--- a/code/modules/multiz/_stubs.dm
+++ b/code/modules/multiz/_stubs.dm
@@ -5,15 +5,3 @@
var/height = 1 ///< The number of Z-Levels in the map.
var/turf/edge_type ///< What the map edge should be formed with. (null = world.turf)
-
-// FOR THE LOVE OF GOD USE THESE. DO NOT FUCKING SPAGHETTIFY THIS.
-// Use the Has*() functions if you ONLY need to check.
-// If you need to do something, use Get*().
-/HasAbove(var/z)
-
-/HasBelow(var/z)
-
-// These give either the turf or null.
-/GetAbove(var/atom/atom)
-
-/GetBelow(var/atom/atom)
diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm
index 6e778dff344..4d98c04a312 100644
--- a/code/modules/multiz/turfs/open_space.dm
+++ b/code/modules/multiz/turfs/open_space.dm
@@ -218,7 +218,7 @@
var/obj/item/stack/rods/R = C
if (R.use(1))
to_chat(user, "You lay down the support lattice.")
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
new /obj/structure/lattice(locate(src.x, src.y, src.z))
return
@@ -229,7 +229,7 @@
if (S.get_amount() < 1)
return
qdel(L)
- playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
+ playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
S.use(1)
ChangeTurf(/turf/simulated/floor/airless)
return
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index 5d6caedba89..fb4c2e620e1 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -364,7 +364,7 @@
if(WT.use(0,user))
to_chat(user, "You start repairing the damage to [src].")
- playsound(src, 'sound/items/welder.ogg', 100, 1)
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(WT.use_tool(src, user, max(5, damage / 5), volume = 50) && WT && WT.isOn())
to_chat(user, "You finish repairing the damage to [src].")
take_damage(-damage)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 60dbb12b0a8..21c23ff07b9 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -681,7 +681,7 @@
user.visible_message(SPAN_WARNING("[user.name] welds [src]."), \
"You start welding the APC frame...", \
"You hear welding.")
- playsound(loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(loc, 'sound/items/Welder.ogg', 50, 1)
if(W.use_tool(src, user, 50, volume = 50))
if(!src || !WT.use(3, user))
return
@@ -765,7 +765,7 @@
if (WT.get_fuel() <1)
to_chat(user, SPAN_WARNING("You need more welding fuel to complete this task."))
return
- playsound(loc, 'sound/items/welder.ogg', 50, 1)
+ playsound(loc, 'sound/items/Welder.ogg', 50, 1)
if(W.use_tool(src, user, 10, volume = 50))
if(!src || !WT.use(1, user))
return
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 6bed4f1ee1d..b0a6d654171 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -156,7 +156,7 @@ By design, d1 is the smallest direction and d2 is the highest
for(var/mob/O in viewers(src, null))
O.show_message(SPAN_WARNING("[user] cuts the cable."), 1)
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
if(d1 == 11 || d2 == 11)
var/turf/turf = GetBelow(src)
@@ -605,7 +605,7 @@ By design, d1 is the smallest direction and d2 is the highest
)
affecting.heal_damage(burn = 15, robo_repair = TRUE)
user.visible_message(SPAN_NOTICE("\The [user] [pick(repair_messages)] in [target]'s [affecting.name] with \the [src]."))
- playsound(target, 'sound/items/wirecutter.ogg', 15)
+ playsound(target, 'sound/items/Wirecutter.ogg', 15)
repair_organ(user, target, affecting)
else
to_chat(user, SPAN_WARNING("You don't have enough cable for this!"))
@@ -1043,7 +1043,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/noose/attackby(obj/item/I, mob/user, params)
if(I.iswirecutter())
user.visible_message("[user] cuts \the [src].", SPAN_NOTICE("You cut \the [src]."))
- playsound(src.loc, 'sound/items/wirecutter.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
if(istype(buckled, /mob/living))
var/mob/living/M = buckled
M.visible_message(SPAN_DANGER("[M] falls over and hits the ground!"),\
diff --git a/code/modules/power/lights/construction.dm b/code/modules/power/lights/construction.dm
index 3d8ab871efa..3a489d70333 100644
--- a/code/modules/power/lights/construction.dm
+++ b/code/modules/power/lights/construction.dm
@@ -74,7 +74,7 @@
icon_state = "bulb-construct-stage1"
new /obj/item/stack/cable_coil(get_turf(src), 1, "red")
user.visible_message(SPAN_NOTICE("\The [user] removes the wiring from \the [src]."), SPAN_NOTICE("You remove the wiring from [src]."), SPAN_WARNING("You hear something being cut."))
- playsound(get_turf(src), 'sound/items/wirecutter.ogg', 100, TRUE)
+ playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 100, TRUE)
return
if(W.iscoil())
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 5376de13dc4..f58429251f8 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -125,7 +125,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(prob(25))
qdel(src)
return
- else
+
return
/obj/structure/particle_accelerator/update_icon()
@@ -273,7 +273,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(prob(25))
qdel(src)
return
- else
+
return
/obj/machinery/particle_accelerator/proc/update_state()
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 2b05b40caec..0828076bce4 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -384,7 +384,7 @@
/obj/machinery/power/solar_control/attackby(var/obj/I, user as mob)
if(I.isscrewdriver())
- playsound(src.loc, 'sound/items/screwdriver.ogg', 50, 1)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
if (src.stat & BROKEN)
to_chat(user, "The broken glass falls out.")
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 3f82466dec9..c1c42b1c537 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -226,7 +226,7 @@
fire_sound = 'sound/weapons/Laser2.ogg'
modifystate = null
charge_failure_message = "'s charging socket was removed to make room for a recharger."
- secondary_fire_sound = 'sound/weapons/Laser3.ogg'
+ secondary_fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/gun/energy/gun/skrell/emp_act(severity)
return //Fuck robots.
@@ -244,7 +244,7 @@
firemodes = list(
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
- list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/Laser3.ogg')
+ list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/laser3.ogg')
)
/obj/item/gun/energy/gun/skrell/smg
@@ -261,7 +261,7 @@
firemodes = list(
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
- list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/Laser3.ogg', burst = 2, burst_delay = 2)
+ list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/laser3.ogg', burst = 2, burst_delay = 2)
)
/obj/item/gun/energy/gun/qukala
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 4f3ece2c284..f0253419621 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -48,7 +48,7 @@
matter = list(DEFAULT_WALL_MATERIAL = 2000)
slot_flags = SLOT_BELT
silenced = 1
- fire_sound = 'sound/weapons/genhit.ogg'
+ fire_sound = 'sound/weapons/Genhit.ogg'
projectile_type = /obj/item/projectile/energy/bolt
max_shots = 5
self_recharge = 1
diff --git a/code/modules/projectiles/modular/laser_components.dm b/code/modules/projectiles/modular/laser_components.dm
index b47691082fe..c464ea133ab 100644
--- a/code/modules/projectiles/modular/laser_components.dm
+++ b/code/modules/projectiles/modular/laser_components.dm
@@ -412,7 +412,7 @@
projectile = /obj/item/projectile/energy/dart
damage = 0.25
icon_state = "dart"
- firing_sound = 'sound/weapons/genhit.ogg'
+ firing_sound = 'sound/weapons/Genhit.ogg'
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
/obj/item/laser_components/modulator/blaster
@@ -452,4 +452,4 @@
projectile = /obj/item/projectile/beam/freezer
icon_state = "blue"
firing_sound = 'sound/weapons/pulse3.ogg'
- origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 5, TECH_MATERIAL = 4)
\ No newline at end of file
+ origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 5, TECH_MATERIAL = 4)
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 9cac358a07e..0054a75255b 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -70,7 +70,7 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I
/obj/item/reagent_containers/food/drinks/proc/boom(mob/user as mob)
user.visible_message("\The [src] explodes all over [user] as they open it!","\The [src] explodes all over you as you open it!","You can hear a soda can explode.")
- playsound(loc,'sound/items/soda_burst.ogg', rand(20,50), 1)
+ playsound(loc,'sound/items/Soda_Burst.ogg', rand(20,50), 1)
reagents.clear_reagents()
flags |= OPENCONTAINER
shaken = 0
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 08f10f55f36..901f63c063e 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -33,7 +33,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (2 centimetre excavation depth)."
excavation_amount = 1
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
@@ -52,7 +52,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (4 centimetre excavation depth)."
excavation_amount = 2
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
@@ -71,7 +71,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (6 centimetre excavation depth)."
excavation_amount = 3
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
@@ -90,7 +90,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (8 centimetre excavation depth)."
excavation_amount = 4
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
@@ -109,7 +109,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (10 centimetre excavation depth)."
excavation_amount = 5
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
@@ -128,7 +128,7 @@
force = 2.0
desc = "A miniature excavation tool for precise digging (12 centimetre excavation depth)."
excavation_amount = 6
- drill_sound = 'sound/items/screwdriver.ogg'
+ drill_sound = 'sound/items/Screwdriver.ogg'
drill_verb = "delicately picking"
w_class = ITEMSIZE_SMALL
can_wield = 0
diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm
index 6cc05a9a9c2..866db3ade89 100644
--- a/code/modules/shuttles/shuttle_console.dm
+++ b/code/modules/shuttles/shuttle_console.dm
@@ -133,7 +133,7 @@
ui.open()
ui.set_auto_update(1)
-/obj/machinery/computer/shuttle_control/Topic(href_list, href_list)
+/obj/machinery/computer/shuttle_control/Topic(href, href_list)
..()
handle_topic_href(SSshuttle.shuttles[shuttle_tag], href_list, usr)
diff --git a/code/modules/spell_system/spells/spell_list/conjure.dm b/code/modules/spell_system/spells/spell_list/conjure.dm
index b181dd72b09..b8b909c5093 100644
--- a/code/modules/spell_system/spells/spell_list/conjure.dm
+++ b/code/modules/spell_system/spells/spell_list/conjure.dm
@@ -22,7 +22,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example
- cast_sound = 'sound/items/welder.ogg'
+ cast_sound = 'sound/items/Welder.ogg'
/spell/aoe_turf/conjure/cast(list/targets, mob/user)
diff --git a/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/cultify_area.dm b/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/cultify_area.dm
index 769aeb48d44..dabcfe267ba 100644
--- a/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/cultify_area.dm
+++ b/code/modules/spell_system/spells/spell_list/self/conjure/construct_spells/cultify_area.dm
@@ -14,7 +14,7 @@
hud_state = "const_floor"
- cast_sound = 'sound/items/welder.ogg'
+ cast_sound = 'sound/items/Welder.ogg'
/spell/aoe_turf/cultify_area/cast(list/targets, mob/user)
for(var/turf/target in targets)
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index cf82d7ab045..c986805e750 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -228,7 +228,7 @@
SPAN_NOTICE("You clamp bleeders in [target]'s [affected.name] with \the [tool]."))
affected.clamp_organ()
spread_germs_to_organ(affected, user)
- playsound(target.loc, 'sound/items/welder.ogg', 15, 1)
+ playsound(target.loc, 'sound/items/Welder.ogg', 15, 1)
/singleton/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
diff --git a/code/modules/synthesized_instruments/instrument_data/brass.dm b/code/modules/synthesized_instruments/instrument_data/brass.dm
index 968d7a2c5e5..ffae42e8f92 100644
--- a/code/modules/synthesized_instruments/instrument_data/brass.dm
+++ b/code/modules/synthesized_instruments/instrument_data/brass.dm
@@ -15,14 +15,14 @@
/datum/instrument/brass/crisis_trombone
name = "Crisis Trombone"
id = "crtrombone"
- samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c2.ogg',
- "48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c3.ogg',
- "60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/c5.ogg')
+ samples = list("36"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C2.ogg',
+ "48"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C3.ogg',
+ "60"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/brass/crisis_trombone/C5.ogg')
/datum/instrument/brass/crisis_trumpet
name = "Crisis Trumpet"
id = "crtrumpet"
- samples = list("60"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/c5.ogg')
\ No newline at end of file
+ samples = list("60"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/brass/crisis_trumpet/C5.ogg')
diff --git a/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm b/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm
index babf33f8bfa..3a64a47212d 100644
--- a/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm
+++ b/code/modules/synthesized_instruments/instrument_data/chromatic_percussion.dm
@@ -24,10 +24,10 @@
/datum/instrument/chromatic/fluid_celeste
name = "FluidR3 Celeste"
id = "r3celeste"
- samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c2.ogg',
- "48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c3.ogg',
- "60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c5.ogg',
- "84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c6.ogg',
- "96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c7.ogg',
- "108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/c8.ogg')
\ No newline at end of file
+ samples = list("36"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C2.ogg',
+ "48"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C3.ogg',
+ "60"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C5.ogg',
+ "84"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C6.ogg',
+ "96"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C7.ogg',
+ "108"='code/modules/synthesized_instruments/samples/chromatic/fluid_celeste/C8.ogg')
diff --git a/code/modules/synthesized_instruments/instrument_data/guitar.dm b/code/modules/synthesized_instruments/instrument_data/guitar.dm
index 59e625f14e9..86f5856c4e0 100644
--- a/code/modules/synthesized_instruments/instrument_data/guitar.dm
+++ b/code/modules/synthesized_instruments/instrument_data/guitar.dm
@@ -24,16 +24,16 @@
/datum/instrument/guitar/clean_crisis
name = "Crisis Clean Guitar"
id = "ccleangt"
- samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c2.ogg',
- "48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c3.ogg',
- "60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/c5.ogg')
+ samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C2.ogg',
+ "48"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C3.ogg',
+ "60"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/guitar/crisis_clean/C5.ogg')
/datum/instrument/guitar/muted_crisis
name = "Crisis Muted Guitar"
id = "cmutedgt"
- samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c2.ogg',
- "48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c3.ogg',
- "60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/c5.ogg')
\ No newline at end of file
+ samples = list("36"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C2.ogg',
+ "48"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C3.ogg',
+ "60"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/guitar/crisis_muted/C5.ogg')
diff --git a/code/modules/synthesized_instruments/instrument_data/piano.dm b/code/modules/synthesized_instruments/instrument_data/piano.dm
index ea6083e6dc2..f38e24b6838 100644
--- a/code/modules/synthesized_instruments/instrument_data/piano.dm
+++ b/code/modules/synthesized_instruments/instrument_data/piano.dm
@@ -18,13 +18,13 @@
/datum/instrument/piano/fluid_harpsichord
name = "FluidR3 Harpsichord"
id = "r3harpsi"
- samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c2.ogg',
- "48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c3.ogg',
- "60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c4.ogg',
- "72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c5.ogg',
- "84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c6.ogg',
- "96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c7.ogg',
- "108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/c8.ogg')
+ samples = list("36"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C2.ogg',
+ "48"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C3.ogg',
+ "60"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C4.ogg',
+ "72"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C5.ogg',
+ "84"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C6.ogg',
+ "96"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C7.ogg',
+ "108"='code/modules/synthesized_instruments/samples/piano/fluid_harpsi/C8.ogg')
/datum/instrument/piano/crisis_harpsichord
@@ -57,4 +57,4 @@
"72"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c5.ogg',
"84"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c6.ogg',
"96"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c7.ogg',
- "108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg')
\ No newline at end of file
+ "108"='code/modules/synthesized_instruments/samples/piano/crisis_bright_piano/c8.ogg')
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index 2186233df7a..b7ea5590b86 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -254,7 +254,7 @@
return null
/obj/structure/table/proc/remove_reinforced(obj/item/screwdriver/S, mob/user)
- reinforced = common_material_remove(user, reinforced, 40, "reinforcements", "screws", 'sound/items/screwdriver.ogg')
+ reinforced = common_material_remove(user, reinforced, 40, "reinforcements", "screws", 'sound/items/Screwdriver.ogg')
breakable = TRUE
/obj/structure/table/proc/remove_material(obj/item/wrench/W, mob/user)
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 11cbc36f4dc..6d007ce3e6f 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -78,7 +78,7 @@
to_chat(user, "You screw in the telepad's tracking beacon.")
stage = 0
if(W.iswelder() && stage == 1)
- playsound(src, 'sound/items/welder.ogg', 50, 1)
+ playsound(src, 'sound/items/Welder.ogg', 50, 1)
to_chat(user, "You disassemble the telepad.")
new /obj/item/stack/material/steel(get_turf(src))
new /obj/item/stack/material/glass(get_turf(src))
diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm
index bc8643a3720..5a500054593 100644
--- a/code/modules/tgui_panel/external.dm
+++ b/code/modules/tgui_panel/external.dm
@@ -17,7 +17,7 @@
nuke_chat()
// Failed to fix, using tgalert as fallback
- action = input(src, "Did that work?", "", "Yes", "No, switch to old ui")
+ action = input(src, "Did that work?", "", "Yes") in list("Yes", "No, switch to old ui")
if (action == "No, switch to old ui")
winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
winset(src, "browseroutput", "is-disabled=1;is-visible=0")
diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm
index 6e9131469d1..0c8cc3c7a07 100644
--- a/code/unit_tests/map_tests.dm
+++ b/code/unit_tests/map_tests.dm
@@ -188,6 +188,7 @@
for(var/obj/machinery/door/airlock/A in world)
var/turf/T = get_turf(A)
checks++
+ TEST_ASSERT_NOTNULL(T, "A turf does not exist under the door at [A.x],[A.y],[A.z]")
if(istype(T, /turf/space) || istype(T, /turf/unsimulated/floor/asteroid) || isopenturf(T) || T.density)
failed_checks++
TEST_FAIL("Airlock [A] with bad turf at ([A.x],[A.y],[A.z]) in [T.loc].")
diff --git a/html/changelogs/fluffyghost-opendreamcilint.yml b/html/changelogs/fluffyghost-opendreamcilint.yml
new file mode 100644
index 00000000000..8f1fde65fdc
--- /dev/null
+++ b/html/changelogs/fluffyghost-opendreamcilint.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Fluffyghost
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - backend: "Added OpenDream as a linter in the CI, with all the pragmas active, to better help spot errors and bad coding styles."
+ - backend: "Adjusted the CI to accomodate for OpenDream linting."
+ - refactor: "Refactored all OpenDream found bad.."
diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm
index 2a090907a45..7d30ab1f7fd 100644
--- a/maps/aurora/code/aurora.dm
+++ b/maps/aurora/code/aurora.dm
@@ -7,7 +7,7 @@
it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen."
path = "aurora"
- lobby_icons = list('icons/misc/titlescreens/aurora/nss_aurora.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi', 'icons/misc/titlescreens/aurora/Vaurca.dmi')
+ lobby_icons = list('icons/misc/titlescreens/aurora/nss_aurora.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi', 'icons/misc/titlescreens/aurora/vaurca.dmi')
lobby_transitions = 10 SECONDS
station_levels = list(2, 3, 4, 5, 6, 7)
diff --git a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm
index 15ad458b530..28af42b469b 100644
--- a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm
+++ b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm
@@ -64,7 +64,7 @@
name = "Izharshan Captain"
suit = /obj/item/clothing/suit/storage/toggle/asymmetriccoat/izharshan
- gloves = /obj/item/clothing/gloves/orange/unathi.
+ gloves = /obj/item/clothing/gloves/orange/unathi
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/energy/pistol/hegemony = 1)
head = /obj/item/clothing/head/bandana/pirate
@@ -73,4 +73,4 @@
/obj/item/storage/box/survival = 1,
/obj/item/clothing/suit/space/void/unathi_pirate/captain = 1, //the best way to make sure only the captain takes his suit
/obj/item/clothing/head/helmet/space/void/unathi_pirate/captain = 1
- )
\ No newline at end of file
+ )
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index 440d329ed75..fd52fec1147 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -3,7 +3,7 @@
full_name = "SCCV Horizon"
path = "sccv_horizon"
- lobby_icons = list('icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi', 'icons/misc/titlescreens/aurora/Vaurca.dmi')
+ lobby_icons = list('icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi', 'icons/misc/titlescreens/aurora/vaurca.dmi')
lobby_transitions = 10 SECONDS
station_levels = list(1, 2, 3)
diff --git a/tools/TagMatcher/checkTagMatches.bat b/tools/TagMatcher/checkTagMatches.bat
deleted file mode 100644
index 6ca87b462f0..00000000000
--- a/tools/TagMatcher/checkTagMatches.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-python ../python_version_check.py
-if ERRORLEVEL 1 (
- pause
- exit
-)
-call python tag-matcher.py ../..
-pause
diff --git a/tools/TagMatcher/tag-matcher.py b/tools/TagMatcher/tag-matcher.py
deleted file mode 100644
index bdd1f5d36b1..00000000000
--- a/tools/TagMatcher/tag-matcher.py
+++ /dev/null
@@ -1,108 +0,0 @@
-'''
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-'''
-import argparse, re, sys
-from os import path, walk
-import io
-
-opt = argparse.ArgumentParser()
-opt.add_argument('dir', help='The directory to scan for *.dm files with non-matching spans')
-args = opt.parse_args()
-
-if(not path.isdir(args.dir)):
- print('Not a directory')
- sys.exit(1)
-
-# These tuples are expected to be ordered as:
-# A unique human readable name (henceforth referred to as tuple name), a regex pattern matching an opening tag, a regex pattern matching a closing tag
-tag_tuples = [('', re.compile('', re.IGNORECASE), re.compile('', re.IGNORECASE)),
- ('', re.compile('', re.IGNORECASE), re.compile('', re.IGNORECASE)),
- ('', re.compile('', re.IGNORECASE), re.compile('', re.IGNORECASE)),
- ('', re.compile('', re.IGNORECASE), re.compile('', re.IGNORECASE)),
- ('', re.compile('', re.IGNORECASE), re.compile('', re.IGNORECASE))]
-
-# The keys of this dictionary will be the file path of each parsed *.dm file
-# The values of this dictionary will be in the format provided by populate_match_list().
-matches = { }
-
-# Support def for setting up a dictionary, populating it with all defined tuple names as key with each being assigned the value 0.
-# One such dictionary is created for each parsed file.
-def populate_match_list():
- match_list = { }
- for tag_tuple in tag_tuples:
- match_list[tag_tuple[0]] = 0
- return match_list
-
-# This def shall be provided by a dictionary in the format given by populate_match_list() and a line of text.
-# It loops over all defined tag tuples, adding the number of open tags found and subtracting the number of close tag found to the corresponding tuple name in the match list.
-# This def is currently run with the same match_list for a given file and for all lines of that file.
-def get_tag_matches(match_list, line):
- for tag_tuple in tag_tuples:
- match_list[tag_tuple[0]] += len(tag_tuple[1].findall(line))
- match_list[tag_tuple[0]] -= len(tag_tuple[2].findall(line))
- return
-
-# Support def that simply checks if a given dictionary in the format given by populate_match_list() contains any value that is non-zero.
-# That is, a tag which had a non-equal amount of open/closing tags.
-def has_mismatch(match_list):
- for tag, match_number in match_list.items():
- if(match_number != 0):
- return 1
- return 0
-
-# This section parses all *.dm files in the given directory, recursively.
-for root, subdirs, files in walk(args.dir):
- for filename in files:
- if filename.endswith('.dm'):
- file_path = path.join(root, filename)
- with io.open(file_path, 'r') as f:
- # For each file, generate the match dictionary.
- matches[file_path] = populate_match_list()
- for x in f:
- try:
- # Then for each line in the file, conduct the tuple open/close matching.
- get_tag_matches(matches[file_path], x)
- except UnicodeDecodeError:
- print("There is a non UTF-8 format character in file {}. Line:\n\r{}".format(f, x))
- exit(0)
-
-
-# Pretty printing section.
-# Loops over all matches and checks if there is a mismatch of tags.
-# If so, then and only then is the corresponding file path printed along with the number of unmatched open/close tags.
-total_mismatch = 0
-for file, match_list in matches.items():
- if(has_mismatch(match_list)):
- print(file)
- for tag, match_number in match_list.items():
- # A positive number means an excess of opening tag, a negative number means an excess of closing tags.
- if(match_number > 0):
- total_mismatch += match_number
- print('\t{0} - Excess of {1} opening tag(s)'.format(tag, match_number))
- elif (match_number < 0):
- total_mismatch -= match_number
- print('\t{0} - Excess of {1} closing tag(s)'.format(tag, -match_number))
-
-# Simply prints the total number of mismatches found and if so returns 1 to, for example, fail Travis builds.
-if(total_mismatch == 0):
- print('No mismatches found.')
-else:
- print('')
- print('Total number of mismatches: {0}'.format(total_mismatch))
- sys.exit(1)
diff --git a/tools/ci/run_od.sh b/tools/ci/run_od.sh
new file mode 100644
index 00000000000..72f8dc5e353
--- /dev/null
+++ b/tools/ci/run_od.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -eo pipefail
+dotnet ../OpenDream/DMCompiler/bin/Release/net7.0/DMCompiler.dll --suppress-unimplemented aurorastation.dme
diff --git a/tools/ci/setup_od.sh b/tools/ci/setup_od.sh
new file mode 100644
index 00000000000..e5440a1bf8e
--- /dev/null
+++ b/tools/ci/setup_od.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eo pipefail
+
+git clone https://github.com/OpenDreamProject/OpenDream.git ../OpenDream
+git -C ../OpenDream submodule update --init --recursive
+dotnet restore ../OpenDream
+dotnet build ../OpenDream/OpenDream.sln -c Release --property WarningLevel=1