Written on the back:[P.scribble]" : ]"\ + + "[P.scribble ? "
Written on the back:
[P.scribble]" : null]"\ + "", "window=[name]") else if(!isnull(pages[page])) if(!(istype(usr, /mob/living/carbon/human) || isobserver(usr) || istype(usr, /mob/living/silicon))) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 659a44491e..7c6d024cb0 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1153,7 +1153,7 @@ if(LAZYLEN(species.descriptors)) descriptors = list() for(var/desctype in species.descriptors) - var/datum/mob_descriptor.descriptor = species.descriptors[desctype] + var/datum/mob_descriptor/descriptor = species.descriptors[desctype] descriptors[desctype] = descriptor.default_value spawn(0) diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm index 9d41f8b59b..d374562230 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm @@ -104,7 +104,7 @@ if("corrupted") // Load them up with ion laws. var/datum/ai_laws/laws = new() // Start with an empty lawset. - for(1 to rand(1, 3)) + for(var/i in 1 to rand(1, 3)) laws.add_ion_law(generate_ion_law(exclude_crew_names = TRUE)) return laws diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index ff51b0b202..ac314b7620 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -215,7 +215,7 @@ return FALSE var/turf/below = GetBelow(src) - if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up in below)) + if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up) in below) return FALSE /mob/living/can_fall() diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 32242e9669..83d7118178 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -2,8 +2,8 @@ name = "paper" icon_state = "paper_stack" item_state = "paper" - var copied = 0 - var iscopy = 0 + var/copied = 0 + var/iscopy = 0 /obj/item/weapon/paper/carbon/update_icon() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 87dbadf800..13255f9c21 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -546,7 +546,7 @@ stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') - var/{x; y;} + var/x, y if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) x = rand(-2, 0) y = rand(-1, 2) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 2e3bfb2f79..5a15777b72 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -134,7 +134,7 @@ user << browse(dat + "[P.name] " \
+ "" \
+ " Written on the back:
[P.scribble]" : ]"\ + + "[P.scribble ? "
[P.scribble]" : null]"\ + "", "window=[name]") else if(!isnull(pages[page])) if(!(istype(usr, /mob/living/carbon/human) || isobserver(usr) || istype(usr, /mob/living/silicon))) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 659a44491e..7c6d024cb0 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1153,7 +1153,7 @@ if(LAZYLEN(species.descriptors)) descriptors = list() for(var/desctype in species.descriptors) - var/datum/mob_descriptor.descriptor = species.descriptors[desctype] + var/datum/mob_descriptor/descriptor = species.descriptors[desctype] descriptors[desctype] = descriptor.default_value spawn(0) diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm index 9d41f8b59b..d374562230 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone.dm @@ -104,7 +104,7 @@ if("corrupted") // Load them up with ion laws. var/datum/ai_laws/laws = new() // Start with an empty lawset. - for(1 to rand(1, 3)) + for(var/i in 1 to rand(1, 3)) laws.add_ion_law(generate_ion_law(exclude_crew_names = TRUE)) return laws diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index ff51b0b202..ac314b7620 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -215,7 +215,7 @@ return FALSE var/turf/below = GetBelow(src) - if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up in below)) + if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up) in below) return FALSE /mob/living/can_fall() diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 32242e9669..83d7118178 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -2,8 +2,8 @@ name = "paper" icon_state = "paper_stack" item_state = "paper" - var copied = 0 - var iscopy = 0 + var/copied = 0 + var/iscopy = 0 /obj/item/weapon/paper/carbon/update_icon() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 87dbadf800..13255f9c21 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -546,7 +546,7 @@ stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') - var/{x; y;} + var/x, y if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) x = rand(-2, 0) y = rand(-1, 2) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 2e3bfb2f79..5a15777b72 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -134,7 +134,7 @@ user << browse(dat + "
Written on the back:[P.scribble]" : ]"\ + + "[P.scribble ? "
Written on the back:
[P.scribble]" : null]"\ + "", "window=[name]") /obj/item/weapon/paper_bundle/attack_self(mob/user as mob) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f0d14b9dca..6b54a41b21 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1184,7 +1184,7 @@ // defines a state machine, returns the new state obj/machinery/power/apc/proc/autoset(var/cur_state, var/on) switch(cur_state) - if(POWERCHAN_OFF); //autoset will never turn on a channel set to off + //if(POWERCHAN_OFF); //autoset will never turn on a channel set to off if(POWERCHAN_OFF_AUTO) if(on == 1) return POWERCHAN_ON_AUTO diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 5e791e4c94..1dc29c7fd7 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -56,7 +56,6 @@ var/global/list/rad_collectors = list() else to_chat(user, "The controls are locked!") return -..() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4d03051ca4..192df50bec 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -394,7 +394,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/obj/item/weapon/paper/PR = new/obj/item/weapon/paper PR.name = "list of researched technologies" PR.info = "[station_name()] Science Laboratories"
- PR.info += "
" if(text2num(href_list["print"]) == 2) PR.info += GetResearchListInfo() diff --git a/code/modules/scripting/Parser/Expressions.dm b/code/modules/scripting/Parser/Expressions.dm index f27a30d3ad..14fa1b297c 100644 --- a/code/modules/scripting/Parser/Expressions.dm +++ b/code/modules/scripting/Parser/Expressions.dm @@ -53,10 +53,9 @@ if(/token/word) return new/node/expression/value/variable(T.value) if(/token/accessor) - var - token/accessor/A=T - node/expression/value/variable/E//=new(A.member) - stack/S=new() + var/token/accessor/A=T + var/node/expression/value/variable/E//=new(A.member) + var/stack/S=new() while(istype(A.object, /token/accessor)) S.Push(A) A=A.object @@ -181,11 +180,10 @@ -
*/
ParseExpression(list/end=list(/token/end), list/ErrChars=list("{", "}"))
- var/stack
- opr=new
- val=new
+ var/stack/opr=new
+ var/stack/val=new
src.expecting=VALUE
- for()
+ while(TRUE)
if(EndOfExpression(end))
break
if(istype(curToken, /token/symbol) && ErrChars.Find(curToken.value))
@@ -278,7 +276,7 @@
NextToken() //skip open parenthesis, already found
var/loops = 0
- for()
+ while(TRUE)
loops++
if(loops>=1000)
CRASH("Something TERRIBLE has gone wrong in ParseFunctionExpression ;__;")
diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm
index 7d933c52ef..94e6f41afe 100644
--- a/code/modules/scripting/Parser/Keywords.dm
+++ b/code/modules/scripting/Parser/Keywords.dm
@@ -134,7 +134,7 @@ var/const/Represents a special statement in the code triggered by a keyword.
parser.NextToken()
if(!parser.CheckToken("(", /token/symbol))
return KW_FAIL
- for() //for now parameters can be separated by whitespace - they don't need a comma in between
+ while(TRUE) //for now parameters can be separated by whitespace - they don't need a comma in between
if(istype(parser.curToken, /token/symbol))
switch(parser.curToken.value)
if(",")
diff --git a/code/modules/scripting/Parser/Parser.dm b/code/modules/scripting/Parser/Parser.dm
index ad961c755f..fa7dd8789f 100644
--- a/code/modules/scripting/Parser/Parser.dm
+++ b/code/modules/scripting/Parser/Parser.dm
@@ -172,7 +172,7 @@
if(!CheckToken("(", /token/symbol)) //Check for and skip open parenthesis
return
var/loops = 0
- for()
+ while(TRUE)
loops++
if(loops>=6000)
CRASH("Something TERRIBLE has gone wrong in ParseFunctionStatement ;__;")
diff --git a/code/modules/scripting/Scanner/Scanner.dm b/code/modules/scripting/Scanner/Scanner.dm
index 0162119760..78c120a22e 100644
--- a/code/modules/scripting/Scanner/Scanner.dm
+++ b/code/modules/scripting/Scanner/Scanner.dm
@@ -153,8 +153,7 @@
start - The character used to start the string.
*/
ReadString(start)
- var
- buf
+ var/buf
for(, codepos <= length(code), codepos++)//codepos to length(code))
var/char=copytext(code, codepos, codepos+1)
switch(char)
@@ -189,9 +188,8 @@
Reads characters separated by an item in into a token.
*/
ReadWord()
- var
- char=copytext(code, codepos, codepos+1)
- buf
+ var/char=copytext(code, codepos, codepos+1)
+ var/buf
while(!delim.Find(char) && codepos<=length(code))
buf+=char
char=copytext(code, ++codepos, codepos+1)
@@ -206,9 +204,8 @@
Reads a symbol into a token.
*/
ReadSymbol()
- var
- char=copytext(code, codepos, codepos+1)
- buf
+ var/char=copytext(code, codepos, codepos+1)
+ var/buf
while(options.symbols.Find(buf+char))
buf+=char
@@ -223,10 +220,9 @@
Reads a number into a token.
*/
ReadNumber()
- var
- char=copytext(code, codepos, codepos+1)
- buf
- dec=0
+ var/char=copytext(code, codepos, codepos+1)
+ var/buf
+ var/dec=0
while(options.IsDigit(char) || (char=="." && !dec))
if(char==".") dec=1
@@ -246,14 +242,13 @@
*/
ReadComment()
- var
- char=copytext(code, codepos, codepos+1)
- nextchar=copytext(code, codepos+1, codepos+2)
- charstring = char+nextchar
- comm = 1
- // 1: single-line comment
- // 2: multi-line comment
- expectedend = 0
+ var/char=copytext(code, codepos, codepos+1)
+ var/nextchar=copytext(code, codepos+1, codepos+2)
+ var/charstring = char+nextchar
+ var/comm = 1
+ // 1: single-line comment
+ // 2: multi-line comment
+ var/expectedend = 0
if(charstring == "//" || charstring == "/*")
if(charstring == "/*")
[P.scribble]" : null]"\ + "", "window=[name]") /obj/item/weapon/paper_bundle/attack_self(mob/user as mob) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f0d14b9dca..6b54a41b21 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1184,7 +1184,7 @@ // defines a state machine, returns the new state obj/machinery/power/apc/proc/autoset(var/cur_state, var/on) switch(cur_state) - if(POWERCHAN_OFF); //autoset will never turn on a channel set to off + //if(POWERCHAN_OFF); //autoset will never turn on a channel set to off if(POWERCHAN_OFF_AUTO) if(on == 1) return POWERCHAN_ON_AUTO diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 5e791e4c94..1dc29c7fd7 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -56,7 +56,6 @@ var/global/list/rad_collectors = list() else to_chat(user, "The controls are locked!") return -..() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4d03051ca4..192df50bec 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -394,7 +394,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/obj/item/weapon/paper/PR = new/obj/item/weapon/paper PR.name = "list of researched technologies" PR.info = "
[ (text2num(href_list["print"]) == 2) ? "Detailed" : ] Research Progress Report
" + PR.info += "[ (text2num(href_list["print"]) == 2) ? "Detailed" : null] Research Progress Report
" PR.info += "report prepared at [stationtime2text()] station time" if(text2num(href_list["print"]) == 2) PR.info += GetResearchListInfo() diff --git a/code/modules/scripting/Parser/Expressions.dm b/code/modules/scripting/Parser/Expressions.dm index f27a30d3ad..14fa1b297c 100644 --- a/code/modules/scripting/Parser/Expressions.dm +++ b/code/modules/scripting/Parser/Expressions.dm @@ -53,10 +53,9 @@ if(/token/word) return new/node/expression/value/variable(T.value) if(/token/accessor) - var - token/accessor/A=T - node/expression/value/variable/E//=new(A.member) - stack/S=new() + var/token/accessor/A=T + var/node/expression/value/variable/E//=new(A.member) + var/stack/S=new() while(istype(A.object, /token/accessor)) S.Push(A) A=A.object @@ -181,11 +180,10 @@ -