cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Linter diagnostics + bans non-var relative pathing

Browse Source
This commit is contained in:
Chompstation Bot
2021-06-22 22:17:02 +00:00
parent 968067d0e7
commit fb343cec6c
351 changed files with 20094 additions and 11284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/designs/misc.dm
View File

@@ -12,7 +12,7 @@
build_path = /obj/item/device/communicator
sort_string = "TAAAA"
datum/design/item/general/laserpointer
/datum/design/item/general/laserpointer
name = "laser pointer"
desc = "Don't shine it in your eyes!"
id = "laser_pointer"

10
code/modules/research/designs/uncommented.dm
View File

@@ -22,7 +22,7 @@
materials = list("glass" = 2000, "sacid" = 20)
build_path = "/obj/item/weapon/circuitboard/rust_core_control"
datum/design/rust_fuel_control
/datum/design/rust_fuel_control
name = "Circuit Design (RUST fuel controller)"
desc = "Allows for the construction of circuit boards used to build a fuel injector control console for the RUST fusion engine."
id = "rust_fuel_control"
@@ -31,7 +31,7 @@ datum/design/rust_fuel_control
materials = list("glass" = 2000, "sacid" = 20)
build_path = "/obj/item/weapon/circuitboard/rust_fuel_control"
datum/design/rust_fuel_port
/datum/design/rust_fuel_port
name = "Internal circuitry (RUST fuel port)"
desc = "Allows for the construction of circuit boards used to build a fuel injection port for the RUST fusion engine."
id = "rust_fuel_port"
@@ -40,7 +40,7 @@ datum/design/rust_fuel_port
materials = list("glass" = 2000, "sacid" = 20, "uranium" = 3000)
build_path = "/obj/item/weapon/module/rust_fuel_port"
datum/design/rust_fuel_compressor
/datum/design/rust_fuel_compressor
name = "Circuit Design (RUST fuel compressor)"
desc = "Allows for the construction of circuit boards used to build a fuel compressor of the RUST fusion engine."
id = "rust_fuel_compressor"
@@ -49,7 +49,7 @@ datum/design/rust_fuel_compressor
materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "diamond" = 1000)
build_path = "/obj/item/weapon/module/rust_fuel_compressor"
datum/design/rust_core
/datum/design/rust_core
name = "Internal circuitry (RUST tokamak core)"
desc = "The circuit board that for a RUST-pattern tokamak fusion core."
id = "pacman"
@@ -58,7 +58,7 @@ datum/design/rust_core
materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "diamond" = 2000)
build_path = "/obj/item/weapon/circuitboard/rust_core"
datum/design/rust_injector
/datum/design/rust_injector
name = "Internal circuitry (RUST tokamak core)"
desc = "The circuit board that for a RUST-pattern particle accelerator."
id = "pacman"

18
code/modules/research/message_server.dm
View File

@@ -365,14 +365,22 @@ var/obj/machinery/blackbox_recorder/blackbox
query_insert.Execute()
qdel(query_insert) //CHOMPEdit TGSQL
<<<<<<< HEAD
// Sanitize inputs to avoid SQL injection attacks //CHOMPEdit NOTE: This is not secure. Basic filters like this are pretty easy to bypass. Use the format for arguments used in the above.
proc/sql_sanitize_text(var/text)
||||||| parent of 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
// Sanitize inputs to avoid SQL injection attacks
proc/sql_sanitize_text(var/text)
=======
// Sanitize inputs to avoid SQL injection attacks
/proc/sql_sanitize_text(var/text)
>>>>>>> 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
text = replacetext(text, "'", "''")
text = replacetext(text, ";", "")
text = replacetext(text, "&", "")
return text
proc/feedback_set(var/variable,var/value)
/proc/feedback_set(var/variable,var/value)
if(!blackbox) return
variable = sql_sanitize_text(variable)
@@ -383,7 +391,7 @@ proc/feedback_set(var/variable,var/value)
FV.set_value(value)
proc/feedback_inc(var/variable,var/value)
/proc/feedback_inc(var/variable,var/value)
if(!blackbox) return
variable = sql_sanitize_text(variable)
@@ -394,7 +402,7 @@ proc/feedback_inc(var/variable,var/value)
FV.inc(value)
proc/feedback_dec(var/variable,var/value)
/proc/feedback_dec(var/variable,var/value)
if(!blackbox) return
variable = sql_sanitize_text(variable)
@@ -405,7 +413,7 @@ proc/feedback_dec(var/variable,var/value)
FV.dec(value)
proc/feedback_set_details(var/variable,var/details)
/proc/feedback_set_details(var/variable,var/details)
if(!blackbox) return
variable = sql_sanitize_text(variable)
@@ -417,7 +425,7 @@ proc/feedback_set_details(var/variable,var/details)
FV.set_details(details)
proc/feedback_add_details(var/variable,var/details)
/proc/feedback_add_details(var/variable,var/details)
if(!blackbox) return
variable = sql_sanitize_text(variable)