From 3161a4f8ecdd5a4043b5601c277d000ae81cf6d2 Mon Sep 17 00:00:00 2001 From: Zjm7891 Date: Fri, 11 Jul 2008 14:20:33 +0000 Subject: [PATCH] Applied Stephen001's cleanup-reverse-engineer.patch --- Code/Machinery/Atmoalter/_atmoalter.dm | 2 +- Code/Machinery/Computer/hologram.dm | 2 +- Code/Machinery/Power/smes.dm | 2 +- Code/Machinery/Power/solar.dm | 3 +- Code/Machinery/Power/solar_control.dm | 1 - Code/Machinery/Power/terminal.dm | 2 +- Code/Machinery/Power/turbine.dm | 2 +- Code/Machinery/freezer.dm | 2 - Code/Machinery/pod.dm | 1 - Code/Machinery/recon.dm | 2 - Code/Machinery/shuttle.dm | 2 +- Code/Machinery/turrets.dm | 4 - Code/Test.dm | 2 - Code/aaaDefines.dm | 1 - Code/airtunnel.dm | 11 -- Code/areas.dm | 2 - Code/blob.dm | 2 - Code/cell_process.dm | 31 ---- Code/cellautomata.dm | 104 ------------- Code/chemical.dm | 11 -- Code/colour2html.dm | 1 - Code/computer.dm | 3 - Code/demo.dm | 91 ------------ Code/dna.dm | 16 -- Code/engine.dm | 7 - Code/instructions.dm | 6 - Code/items.dm | 135 ----------------- Code/mob.dm | 195 ------------------------- Code/power.dm | 1 - Code/shuttle.dm | 7 - Code/ss13_algorithm2.dm | 16 -- Code/vote.dm | 2 +- Code/weap_sat.dm | 12 -- Code/weapons.dm | 32 ---- 34 files changed, 8 insertions(+), 705 deletions(-) diff --git a/Code/Machinery/Atmoalter/_atmoalter.dm b/Code/Machinery/Atmoalter/_atmoalter.dm index dd20038..67042d6 100644 --- a/Code/Machinery/Atmoalter/_atmoalter.dm +++ b/Code/Machinery/Atmoalter/_atmoalter.dm @@ -20,4 +20,4 @@ obj/machinery/atmoalter obj/item/weapon/tank/holding // the tank item being held (or null) - max_valve = 1e6 // the maximum setting of both valves \ No newline at end of file + max_valve = 1e6 // the maximum setting of both valves diff --git a/Code/Machinery/Computer/hologram.dm b/Code/Machinery/Computer/hologram.dm index a949d6a..523baf1 100644 --- a/Code/Machinery/Computer/hologram.dm +++ b/Code/Machinery/Computer/hologram.dm @@ -156,4 +156,4 @@ obj/machinery/hologram_proj /obj/projection name = "Projection" - anchored = 1.0 \ No newline at end of file + anchored = 1.0 diff --git a/Code/Machinery/Power/smes.dm b/Code/Machinery/Power/smes.dm index a9a4a90..e49c51e 100644 --- a/Code/Machinery/Power/smes.dm +++ b/Code/Machinery/Power/smes.dm @@ -341,4 +341,4 @@ usr.client_mob() << browse(null, "window=smes") usr.machine = null - return \ No newline at end of file + return diff --git a/Code/Machinery/Power/solar.dm b/Code/Machinery/Power/solar.dm index fd63858..51521b2 100644 --- a/Code/Machinery/Power/solar.dm +++ b/Code/Machinery/Power/solar.dm @@ -115,7 +115,6 @@ obj/machinery/power/solar ex_act(severity) switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) @@ -132,4 +131,4 @@ obj/machinery/power/solar blob_act() if (prob(50)) broken() - src.density = 0 \ No newline at end of file + src.density = 0 diff --git a/Code/Machinery/Power/solar_control.dm b/Code/Machinery/Power/solar_control.dm index 5f95d59..a31434c 100644 --- a/Code/Machinery/Power/solar_control.dm +++ b/Code/Machinery/Power/solar_control.dm @@ -275,7 +275,6 @@ obj/machinery/power/solar_control switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) diff --git a/Code/Machinery/Power/terminal.dm b/Code/Machinery/Power/terminal.dm index 9c10bcb..60d4c8c 100644 --- a/Code/Machinery/Power/terminal.dm +++ b/Code/Machinery/Power/terminal.dm @@ -42,4 +42,4 @@ obj/machinery/power/terminal icon_state = "term-f" else invisibility = 0 - icon_state = "term" \ No newline at end of file + icon_state = "term" diff --git a/Code/Machinery/Power/turbine.dm b/Code/Machinery/Power/turbine.dm index 13bb02e..8dbe3ec 100644 --- a/Code/Machinery/Power/turbine.dm +++ b/Code/Machinery/Power/turbine.dm @@ -245,4 +245,4 @@ obj/machinery/power/turbine usr.client_mob() << browse(null, "window=turbine") usr.machine = null - return \ No newline at end of file + return diff --git a/Code/Machinery/freezer.dm b/Code/Machinery/freezer.dm index d842f4e..762a0a2 100644 --- a/Code/Machinery/freezer.dm +++ b/Code/Machinery/freezer.dm @@ -119,7 +119,6 @@ obj/machinery/freezer for(var/obj/item/weapon/flasks/F in src) d1 += text("Flask []: [] / [] / []
", src, counter, counter, F.oxygen, F.plasma, F.coolant) counter++ - //Foreach goto(78) d1 += "Key: Oxygen / Plasma / Coolant
" else d1 = "No flasks!" @@ -148,7 +147,6 @@ obj/machinery/freezer for(var/obj/item/weapon/flasks/F in src) d1 += text("[] []: []
", src, counter, stars("Flask"), counter, stars(text("[] / [] / []", F.oxygen, F.plasma, F.coolant))) counter++ - //Foreach goto(380) d1 += "Key: Oxygen / Plasma / Coolant
" else d1 = "No flasks!" diff --git a/Code/Machinery/pod.dm b/Code/Machinery/pod.dm index 3c75223..60302ef 100644 --- a/Code/Machinery/pod.dm +++ b/Code/Machinery/pod.dm @@ -168,7 +168,6 @@ obj/machinery/pod for(var/mob/O in viewers(src, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] unloads [] from []!", usr, A, src) - //Foreach goto(54) if (ismob(A)) var/mob/M = A if (M.client) diff --git a/Code/Machinery/recon.dm b/Code/Machinery/recon.dm index 73c5d9d..2b796a8 100644 --- a/Code/Machinery/recon.dm +++ b/Code/Machinery/recon.dm @@ -137,7 +137,6 @@ obj/machinery/recon for(var/mob/O in viewers(src, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] loads [] into []!", H, H.pulling, src) - //Foreach goto(204) H.pulling = null @@ -156,7 +155,6 @@ obj/machinery/recon for(var/mob/O in view(src, null)) if ((!( O.blinded ))) O.client_mob() << text("\blue [] unloads [] from []!", usr, A, src) - //Foreach goto(53) if (ismob(A)) var/mob/M = A if (M.client) diff --git a/Code/Machinery/shuttle.dm b/Code/Machinery/shuttle.dm index 0d53d12..ca5dc01 100644 --- a/Code/Machinery/shuttle.dm +++ b/Code/Machinery/shuttle.dm @@ -38,4 +38,4 @@ obj/machinery/shuttle router name = "router" - icon_state = "router" \ No newline at end of file + icon_state = "router" diff --git a/Code/Machinery/turrets.dm b/Code/Machinery/turrets.dm index 21ccc62..388918b 100644 --- a/Code/Machinery/turrets.dm +++ b/Code/Machinery/turrets.dm @@ -15,20 +15,16 @@ if (istype(O, /mob)) if (!istype(O, /mob/ai)) if (!(O in turretTargets)) - //O << "adding you to target list" turretTargets += O //else - //O << "You're already in our target list!" return 1 /area/turret_protected/Exited(atom/movable/O) if (istype(O, /mob)) if (!istype(O, /mob/ai)) if (O in turretTargets) - //O << "removing you from target list" turretTargets -= O //else - //O << "You aren't in our target list!" if (turretTargets.len == 0) popDownTurrets() diff --git a/Code/Test.dm b/Code/Test.dm index ad6b3b6..d2f16a3 100644 --- a/Code/Test.dm +++ b/Code/Test.dm @@ -8,11 +8,9 @@ call(tester, test)() if (!( tester.success )) else - //Foreach continue //goto(59) if (!( tester.success )) world << "Test failed." return - //Foreach goto(26) world << "All tests passed." return diff --git a/Code/aaaDefines.dm b/Code/aaaDefines.dm index 616c863..989c705 100644 --- a/Code/aaaDefines.dm +++ b/Code/aaaDefines.dm @@ -33,7 +33,6 @@ p1.b_stat = 0 p2.status = 1 p3.gas.temperature = btemp + T0C - //SN src = null if(1) // prox var/obj/item/weapon/assembly/m_i_ptank/R = new /obj/item/weapon/assembly/m_i_ptank( src.loc ) diff --git a/Code/airtunnel.dm b/Code/airtunnel.dm index d47d088..aa5fa61 100644 --- a/Code/airtunnel.dm +++ b/Code/airtunnel.dm @@ -107,7 +107,6 @@ A.master = src A.create() src.connectors += A - //Foreach goto(21) return /datum/air_tunnel/proc/siphons() @@ -116,27 +115,21 @@ if(0.0) for(var/obj/machinery/atmoalter/siphs/S in locate(/area/airtunnel1)) S.t_status = 3 - //Foreach goto(42) if(1.0) for(var/obj/machinery/atmoalter/siphs/fullairsiphon/S in locate(/area/airtunnel1)) S.t_status = 2 S.t_per = 1000000.0 - //Foreach goto(86) for(var/obj/machinery/atmoalter/siphs/scrubbers/S in locate(/area/airtunnel1)) S.t_status = 3 - //Foreach goto(136) if(2.0) for(var/obj/machinery/atmoalter/siphs/S in locate(/area/airtunnel1)) S.t_status = 4 - //Foreach goto(180) if(3.0) for(var/obj/machinery/atmoalter/siphs/fullairsiphon/S in locate(/area/airtunnel1)) S.t_status = 1 S.t_per = 1000000.0 - //Foreach goto(224) for(var/obj/machinery/atmoalter/siphs/scrubbers/S in locate(/area/airtunnel1)) S.t_status = 3 - //Foreach goto(274) else return @@ -159,7 +152,6 @@ return if (!( A.move_left() )) ok = 0 - //Foreach goto(56) if (!( ok )) src.operating = 0 else @@ -170,7 +162,6 @@ A.current.deployed = 1 else src.operating = 0 - //Foreach goto(150) sleep(20) return @@ -192,13 +183,11 @@ A.current = A.current.previous else ok = 0 - //Foreach goto(56) if (!( ok )) src.operating = 0 else for(var/obj/move/airtunnel/connector/A in src.connectors) if (!( A.current.move_right() )) src.operating = 0 - //Foreach goto(188) sleep(20) return diff --git a/Code/areas.dm b/Code/areas.dm index e16bab0..fa3ec0b 100644 --- a/Code/areas.dm +++ b/Code/areas.dm @@ -231,7 +231,6 @@ for(var/obj/move/O in src) S.parts += O O.master = S - //Foreach goto(42) return /area/proc/firealert() @@ -245,7 +244,6 @@ spawn( 0 ) D.closefire() return - //Foreach goto(74) return diff --git a/Code/blob.dm b/Code/blob.dm index f63c5db..2413d14 100644 --- a/Code/blob.dm +++ b/Code/blob.dm @@ -137,7 +137,6 @@ /obj/blob/attackby(var/obj/item/weapon/W, var/mob/user) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The blob has been attacked with [][] ", W, (user ? text(" by [].", user) : ".")), 1) - //Foreach goto(20) var/damage = W.force / 4.0 @@ -190,7 +189,6 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) P.name = "paper- 'Cent. Com. Biohazard Alert.'" P.info = dat - //Foreach goto(1830) world << "Cent. Com. Update: Biohazard Alert." world << "\red Summary downloaded and printed out at all communications consoles." for(var/mob/ai/aiPlayer in world) diff --git a/Code/cell_process.dm b/Code/cell_process.dm index 62c2bc1..3bad485 100644 --- a/Code/cell_process.dm +++ b/Code/cell_process.dm @@ -56,11 +56,9 @@ //*****RM as 4.1beta A.loc = T - //Foreach goto(25) else for(var/atom/movable/A as mob|obj in src.loc) A.loc = T - //Foreach goto(73) return /obj/move/proc/unburn() @@ -86,7 +84,6 @@ - //Foreach goto(36) for(var/obj/window/D in src.loc) if(!( D.density )) @@ -96,7 +93,6 @@ L.len = null return L - //Foreach goto(115) return L /obj/move/proc/FindTurfs() @@ -128,7 +124,6 @@ L -= T goto Label_181 Label_181: - //Foreach goto(81) for(var/obj/window/D in T) if(!( D.density )) @@ -143,7 +138,6 @@ Label_294: - //Foreach goto(199) //***** Label_299: @@ -155,7 +149,6 @@ else if ((isturf(T) && !( T.updatecell ))) L -= T - //Foreach goto(26) return L @@ -202,7 +195,6 @@ burn = 1 if ((config.air_pressure_flow) && istype(T, /turf/space)) space = 1 - //Foreach continue //goto(158) if (space && ((!config.air_pressure_flow) || (!burn))) src.oxygen = 0 src.poison = 0 @@ -248,7 +240,6 @@ src.firelevel = 0 for(var/atom/movable/A in src) A.burn(src.firelevel) - //Foreach goto(561) else src.firelevel = 0 if (src.icon_state == "burning") @@ -285,7 +276,6 @@ burn = 1 if ((config.air_pressure_flow) && istype(T, /turf/space)) space = 1 - //Foreach continue //goto(744) if (space && ((!config.air_pressure_flow) || (!burn))) src.oxygen = 0 src.poison = 0 @@ -333,7 +323,6 @@ src.firelevel = 0 for(var/atom/movable/A as mob|obj in src) A.burn(src.firelevel) - //Foreach goto(1153) else if (src.icon_state == "burning") src.firelevel = 0 @@ -395,7 +384,6 @@ spawn( 0 ) step(AM, src.airdir) return - //Foreach goto(1559) if (space && ((!config.air_pressure_flow) || (!burn))) src.oxygen = 0 @@ -476,7 +464,6 @@ spawn( 0 ) step(AM, src.airdir) return - //Foreach goto(2130) if (space && ((!config.air_pressure_flow) || (!burn))) @@ -605,7 +592,6 @@ L -= EAST Label_96 - //Foreach goto(34) for(var/obj/window/D in src) if(!( D.density )) goto Label_178 //continue @@ -614,7 +600,6 @@ L.len = null return L Label_178 - //Foreach goto(111) return L @@ -674,7 +659,6 @@ L -= T Label_201: - //Foreach goto(101) for(var/obj/window/D in T) if(!( D.density )) @@ -689,12 +673,10 @@ Label_312: - //Foreach goto(219) //***** Label_317: - //Foreach goto(40) for(var/turf/T in L) if (locate(/obj/move, T)) @@ -702,7 +684,6 @@ var/obj/move/O = locate(/obj/move, T) if (O.updatecell) L += O - //Foreach goto(333) return L /turf/New() @@ -846,7 +827,6 @@ setairlink(dir, null) setcondlink(dir, 1) Label_201: - //Foreach goto(101) for(var/obj/window/D in T) if(!( D.density )) @@ -865,12 +845,10 @@ Label_312: - //Foreach goto(219) //***** Label_317: - //Foreach goto(40) @@ -898,7 +876,6 @@ L -= T if (O.updatecell) L += O - //Foreach goto(333) */ return L @@ -989,7 +966,6 @@ turf/proc/tot_old_gas() totemp += T.otemp if (T.firelevel >= config.min_gas_for_fire) burn = 1 - //Foreach continue //goto(113) */ @@ -1101,7 +1077,6 @@ turf/proc/tot_old_gas() src.firelevel = 0 for(var/atom/movable/A in src) A.burn(src.firelevel) - //Foreach goto(522) else src.firelevel = 0 if (src.icon_state == "burning") @@ -1142,7 +1117,6 @@ turf/proc/tot_old_gas() totemp += T.ttemp if (T.firelevel >= config.min_gas_for_fire) burn = 1 - //Foreach continue //goto(705) */ if(airN) @@ -1254,7 +1228,6 @@ turf/proc/tot_old_gas() src.firelevel = 0 for(var/atom/movable/A as mob|obj in src) A.burn(src.firelevel) - //Foreach goto(1114) else if (src.icon_state == "burning") src.firelevel = 0 @@ -1307,7 +1280,6 @@ turf/proc/tot_old_gas() src.airforce = adiff src.airdir = get_dir(src, T) airtemp = src.otemp - //Foreach continue //goto(1317) */ if(airN) @@ -1414,7 +1386,6 @@ turf/proc/tot_old_gas() spawn( 0 ) step(AM, src.airdir) return - //Foreach goto(1518) if (space && ((!config.air_pressure_flow) || (!burn))) src.oxygen = 0 @@ -1486,7 +1457,6 @@ turf/proc/tot_old_gas() src.airforce = adiff src.airdir = get_dir(src, T) airtemp = src.ttemp - //Foreach continue //goto(1872) */ @@ -1594,7 +1564,6 @@ turf/proc/tot_old_gas() spawn( 0 ) step(AM, src.airdir) return - //Foreach goto(2073) if (space && ((!config.air_pressure_flow) || (!burn))) src.oxygen = 0 src.poison = 0 diff --git a/Code/cellautomata.dm b/Code/cellautomata.dm index a80004c..18a6817 100644 --- a/Code/cellautomata.dm +++ b/Code/cellautomata.dm @@ -81,7 +81,6 @@ H.shoes = new /obj/item/weapon/clothing/shoes/orange( H ) H.w_uniform.layer = 20 H.shoes.layer = 20 - //Foreach goto(507) return /obj/team/proc/show_screen(mob/user as mob) @@ -93,7 +92,6 @@ dat += "Members:\n" for(var/mob/M in src.members) dat += text("\t[] ([])\n", M.rname, M.key) - //Foreach goto(79) dat += text("Base: \t[]\nColor: \t[]\n\nRefresh", src, src.base, src, src.color, src) dat += "" user.client_mob() << browse(dat, "window=ctf_team") @@ -118,7 +116,6 @@ src.base = t if (usr.CanAdmin()) if (href_list["disband"]) - //SN src = null del(src) return if (href_list["max_players"]) @@ -129,11 +126,9 @@ for(var/mob/human/H in world) if (H.client || H.currentDrone!=null) L += H - //Foreach goto(331) for(var/obj/team/T in world) L -= T.members L -= T.captain - //Foreach goto(370) var/mob/m = input(usr, "Please select a new captain", null, null) as null|anything in L if (ismob(m)) src.members -= src.captain @@ -147,7 +142,6 @@ for(var/mob/human/H in world) if ((H.CanAdmin() || H == src.captain)) src.master.show_screen(H) - //Foreach goto(510) return /obj/ctf_assist/New() @@ -160,7 +154,6 @@ for(var/obj/begin/B in world) if (!( locate(/obj/grille, B.loc) )) new /obj/grille( B.loc ) - //Foreach goto(50) for(var/mob/human/M in world) M.loc = locate(/area/start) if (M.start) @@ -169,9 +162,7 @@ for(var/obj/item/weapon/I in M) //M = null del(M) - //Foreach goto(165) M.start = 0 - //Foreach goto(106) world << "All players have been pushed back!" return @@ -190,7 +181,6 @@ src.pickers_left += T.captain else src.pickers_left += T - //Foreach goto(78) if (src.pickers_left.len < 1) world << "We are done picking! (All teams are full!)" src.picker = 0 @@ -219,7 +209,6 @@ dat += text("Players (per Team): []
\n\"Please Pick a Player
", src.play_team) for(var/mob/human/H in src.players_left) dat += text("[] ([])
", src, H, H.rname, H.key) - //Foreach goto(39) user.client_mob() << browse(dat, "window=ctf_pick") return @@ -228,7 +217,6 @@ for(var/obj/team/T in src) if (T.captain == captain) return T - //Foreach goto(15) return /obj/ctf_assist/proc/check_win(O as obj) @@ -244,7 +232,6 @@ if (src.wintype == "collect") if (F.loc != O) winning = 0 - //Foreach goto(45) if (!( winning )) return var/obj/team/winner = null @@ -252,7 +239,6 @@ if (text("flag_[]", T.color) == text("[]", F.icon_state)) winner = T else - //Foreach continue //goto(157) if (winner) world << "

The game has been won!!!

" world << text("Team: [] Team led by [] in []", uppertext(winner.color), winner.captain, winner.base) @@ -260,7 +246,6 @@ for(var/mob/human/H in winner.members) if (H.client || H.currentDrone!=null) world << text("\t [] ([])", H.rname, H.key) - //Foreach goto(266) return /obj/ctf_assist/proc/show_screen(mob/user as mob) @@ -278,7 +263,6 @@ dat += text("\t[] Team\n", src, O, O.color) else dat += text("\tNo Captain\n", src, O) - //Foreach goto(43) dat += text("\[Add Team\]\nCaptains Select Members\n\nStart the Game (and Set up Map)\n\nWin Options: []\nCollection - All flags same color on clipboard\nConversion - All flags same color\nNone\n\nOther Options:\nAuto-Dress (Teams): []\nRemove Engine Ejection: []\nPaint Cans: []\nImmobile flags (Territory): []\nAdd Neutral Flags to Unused Bases: []\n\nRefresh", src, src, src, src.wintype, src, src, src, src, (src.autodress ? "Yes" : "No"), src, (src.ejectengine ? "Yes" : "No"), src, (src.paint_cans ? "Yes" : "No"), src, (src.immobile ? "Yes" : "No"), src, (src.neutral_replace ? "Yes" : "No"), src) dat += "" user.client_mob() << browse(dat, "window=ctf_assist") @@ -338,7 +322,6 @@ src.picking = 1 for(var/mob/human/H in world) src.players_left += H - //Foreach goto(578) for(var/obj/team/T in src) if (T.members.len < src.play_team) if (T.captain) @@ -346,7 +329,6 @@ else src.pickers_left += T src.players_left -= T.members - //Foreach goto(618) if ((!( src.players_left.len ) || !( src.pickers_left.len ))) src.picking = 0 src.players_left.len = 0 @@ -378,7 +360,6 @@ H.occupation1 = pick("Staff Assistant", "Research Assistant", "Technical Assistant", "Medical Assistant") use_me.get_dna_ready(H) H.update_face() - //Foreach goto(923) world << "STARTING!!!" for(var/obj/landmark/alterations/A in world) switch(A.name) @@ -409,16 +390,13 @@ for(var/obj/closet/wardrobe/W in world) //W = null del(W) - //Foreach goto(1238) for(var/obj/item/weapon/clothing/under/T in world) //T = null del(T) - //Foreach goto(1281) if (src.ejectengine) for(var/obj/machinery/computer/engine/T in world) //T = null del(T) - //Foreach goto(1333) for(var/obj/landmark/alterations/A in world) switch(A.name) if("Prisoners Wardrobe") @@ -432,14 +410,11 @@ H.w_uniform.layer = 20 H.shoes = new /obj/item/weapon/clothing/shoes/orange( H ) H.shoes.layer = 20 - //Foreach goto(1453) for(var/obj/team/T in src) T.process() - //Foreach goto(1545) if (src.paint_cans) for(var/obj/secloset/highsec/S in world) new /obj/item/weapon/paint( S ) - //Foreach goto(1595) if (src.neutral_replace) while(src.avail_bases.len > 0) var/t = pick(src.avail_bases) @@ -454,10 +429,7 @@ for(var/obj/begin/B in world) if (locate(/obj/grille, B.loc)) for(var/obj/grille/G in B.loc) - //G = null del(G) - //Foreach goto(1789) - //Foreach goto(1742) ticker = new /datum/control/gameticker( ) spawn( 0 ) ticker.process() @@ -467,7 +439,6 @@ for(var/mob/human/H in world) if (H.CanAdmin()) src.show_screen(H) - //Foreach goto(1881) return /obj/landmark/New() @@ -574,7 +545,6 @@ var/dat = "Boot Player:
" for(var/mob/M in world) dat += text("N:[] R:[] (K:[]) (IP:[])
", src, M, M.name, M.rname, (M.client ? M.client : M.lastKnownCKey? "Formerly [M.lastKnownCKey]" : "No Client"), M.lastKnownIP) - //Foreach goto(103) usr << browse(dat, "window=boot") if (href_list["boot2"]) if (src.a_level >= 4) @@ -591,11 +561,9 @@ var/dat = "Ban Player:
" for(var/mob/M in world) dat += text("N: [] R: [] (K: []) (IP: [])
", src, M, M.name, M.rname, (M.client ? M.client : M.lastKnownCKey? "Formerly [M.lastKnownCKey]" : "No Client"), M.lastKnownIP) - //Foreach goto(362) dat += "
Unban Player:
" for(var/t in banned) dat += text("K: []
", src, ckey(t), t) - //Foreach goto(424) usr << browse(dat, "window=ban") if (href_list["ban2"]) if (src.a_level >= 4) @@ -619,7 +587,6 @@ var/dat = "Mute/Unmute Player:
" for(var/mob/M in world) dat += text("N:[] R:[] (K:[]) (IP: []) \[[]\]
", src, M, M.name, M.rname, (M.client ? M.client : M.lastKnownCKey? "Formerly [M.lastKnownCKey]" : "No Client"), M.lastKnownIP, (M.muted ? "Muted" : "Voiced")) - //Foreach goto(757) usr << browse(dat, "window=mute") if (href_list["mute2"]) if (src.a_level >= 4) @@ -690,7 +657,6 @@ var/dat = "
Banned Keys:
" for(var/t in banned) dat += text("[]
", ckey(t)) - //Foreach goto(1424) if ((src.rank in list( "Moderator", "Supervisor", "Administrator", "Major Administrator", "Primary Administrator" ))) dat += text("
Goto Ban Control Screen", src) usr << browse(dat, "window=ban_k") @@ -699,13 +665,11 @@ for(var/mob/M in world) if(M.cliented()) dat += text("[]
", M.client.ckey) - //Foreach goto(1525) usr << browse(dat, "window=keys") if (href_list["l_players"]) var/dat = "Name/Real Name/Key/IP:
" for(var/mob/M in world) dat += text("N: [] R: [] (K: []) (IP: [])
", M.name, M.rname, (M.client ? M.client : (M.lastKnownCKey? "Formerly [M.lastKnownCKey]" : "No Client")), M.lastKnownIP) - //Foreach goto(1602) usr << browse(dat, "window=players") if (href_list["g_send"]) var/t = input("Global message to send:", "Admin Announce", null, null) as message @@ -716,7 +680,6 @@ var/dat = "Who are you sending a message to?
" for(var/mob/M in world) dat += "N:[M.name] R:[M.rname] (K:[(M.client ? M.client : "Formerly [M.lastKnownCKey]")])
" - //Foreach goto(1737) usr << browse(dat, "window=p_send") /* @@ -755,7 +718,6 @@ var/dat = "Registered DNA sequences:
" for(var/M in reg_dna) dat += text("\t [] = []
", M, reg_dna[text("[]", M)]) - //Foreach goto(2171) usr << browse(dat, "window=dna") if (href_list["t_ooc"]) if (src.a_level >= 2) @@ -880,39 +842,27 @@ switch(href_list["secrets2"]) if("sec_clothes") for(var/obj/item/weapon/clothing/under/O in world) - //O = null del(O) - //Foreach goto(2781) ok = 1 if("sec_all_clothes") for(var/obj/item/weapon/clothing/O in world) - //O = null del(O) - //Foreach goto(2833) ok = 1 if("sec_classic1") for(var/obj/item/weapon/clothing/suit/firesuit/O in world) - //O = null del(O) - //Foreach goto(2885) for(var/obj/grille/O in world) - //O = null del(O) - //Foreach goto(2928) for(var/obj/machinery/pod/O in world) for(var/mob/M in src) M.loc = src.loc if (M.client) M.client.perspective = MOB_PERSPECTIVE M.client.eye = M - //Foreach goto(3001) - //O = null del(O) - //Foreach goto(2971) ok = 1 if("clear_bombs") for(var/obj/item/weapon/assembly/r_i_ptank/O in world) - //O = null del(O) for(var/obj/item/weapon/assembly/m_i_ptank/O in world) del(O) @@ -923,23 +873,19 @@ var/dat = "Don't be insane about this list Get the facts. They also could have disarmed one.
" for(var/l in bombers) dat += text("[] 'made' a bomb.
", l) - //Foreach goto(3149) usr << browse(dat, "window=bombers") if("toxic") for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world) O.t_status = 3 - //Foreach goto(3194) for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world) O.t_status = 1 O.t_per = 1000000.0 - //Foreach goto(3234) for(var/obj/machinery/atmoalter/canister/O in world) if (!( istype(O, /obj/machinery/atmoalter/canister/oxygencanister) )) O.t_status = 1 O.t_per = 1000000.0 else O.t_status = 3 - //Foreach goto(3282) if("check_antagonist") if (ticker) if (ticker.killer) @@ -955,7 +901,6 @@ if(config.logadmin) world.log << text("ADMIN: [] used secret []", usr.key, href_list["secrets2"]) for(var/mob/human/H in world) H.monkeyize() - //Foreach goto(3504) ok = 1 if("power") if(config.logadmin) world.log << text("ADMIN: [] used secret []", usr.key, href_list["secrets2"]) @@ -1132,7 +1077,6 @@ var/m_key = copytext(t, 1, t1) var/a_lev = text("[]", copytext(t, t1 + 3, length(t) + 1)) admins[text("[]", m_key)] = text("[]", a_lev) - //Foreach goto(64) admins["exadv1"] = "Primary Administrator" config = new /datum/config() @@ -1269,11 +1213,9 @@ for(var/obj/machinery/nuclearbomb/N in world) if (N.r_code == "ADMIN") N.r_code = nuke_code - //Foreach goto(260) for(var/mob/human/H in world) if ((H.ckey in list( "exadv1", "epox", "soraku" ))) H.memory += text("Secret Base Nuke Code: []
", nuke_code) - //Foreach goto(312) sleep(50) plmaster = new /obj/overlay( ) @@ -1380,7 +1322,6 @@ return for(var/mob/M in viewers(usr, null)) M.show_message(text("[] points to []", usr, src), 1) - //Foreach goto(102) return /turf/proc/updatecell() @@ -1531,7 +1472,6 @@ world << text("[] was []", H.key, H.rname) else world << text("[] was [] (Dead)", H.key, H.rname) - //Foreach goto(64) src.timing = 0 sleep(300) if(config.loggame) world.log << "GAME: Syndicate success" @@ -1568,7 +1508,6 @@ if (T.z == shuttle_z) for(var/atom/movable/AM in T) AM.z = 1 - //Foreach goto(79) var/turf/U = locate(T.x, T.y, shuttle_z) U.oxygen = T.oxygen U.oldoxy = T.oldoxy @@ -1583,7 +1522,6 @@ U.buildlinks() //T = null del(T) - //Foreach goto(45) src.timeleft = 1800 src.shuttle_location = 1 @@ -1652,7 +1590,6 @@ else if ((T in A)) traitorwin = 0 - //Foreach goto(79) if("assassinate") if ((src.target && src.target.stat != 2)) traitorwin = 0 @@ -1662,10 +1599,8 @@ L += src.killer.contents for(var/obj/item/weapon/storage/S in src.killer.contents) L += S.return_inv() - //Foreach goto(228) for(var/obj/item/weapon/gift/G in src.killer.contents) L += G.gift - //Foreach goto(271) traitorwin = 0 switch(src.theft_obj) if("lasergun") @@ -1692,14 +1627,12 @@ for(var/obj/item/weapon/flashbang/O in L) traitorwin = 1 - //Foreach goto(500) item = "a flashbang" if("captaincard") for(var/obj/item/weapon/card/id/O in L) if ((O.access_level == 5 && O.air_access == 5 && O.engine_access == 5 && O.lab_access == 5 && O.assignment == "Captain")) traitorwin = 1 else - //Foreach continue //goto(553) item = "a captain's card with universal level 5 access" if("sleepingpills") for(var/obj/item/weapon/pill_canister/O in L) @@ -1707,15 +1640,12 @@ if (P.amount == 30) traitorwin = 1 else - //Foreach continue //goto(689) - //Foreach goto(658) item = "a bottle of 30 sleeping pills" if("pl_flask") for(var/obj/item/weapon/flasks/O in L) if (O.plasma == 500) traitorwin = 1 else - //Foreach continue //goto(758) item = "a plasma flask for cryogenics (500 units of plasma)" else else @@ -1760,7 +1690,6 @@ if (istype(T, /turf)) if ((T in A)) monkeywin = 0 - //Foreach goto(999) if (monkeywin) monkeywin = 0 for(var/mob/monkey/M in world) @@ -1769,19 +1698,16 @@ if (istype(T, /turf)) if ((T in A)) monkeywin = 1 - //Foreach goto(1096) if (monkeywin) world << "The monkies have won!" for(var/mob/monkey/M in world) if (M.cliented()) world << text("[] was a monkey.", M.key) - //Foreach goto(1194) else world << "The Research Staff has stopped he monkey invasion!" for(var/mob/human/M in world) if (M.cliented()) world << text("[] was [].", M.key, M) - //Foreach goto(1254) if("nuclear") if (src.objective != "Success") var/disk_on_shuttle = 0 @@ -1790,7 +1716,6 @@ var/turf/T = get_turf(N) if ((T in A)) disk_on_shuttle = 1 - //Foreach goto(1327) if (disk_on_shuttle) world << "The Research Staff has stopped the Syndicate Operatives!" for(var/mob/human/H in world) @@ -1799,7 +1724,6 @@ world << text("[] was []", H.key, H.rname) else world << text("[] was [] (Dead)", H.key, H.rname) - //Foreach goto(1414) else world << "Neutral Victory" world << "The Syndicate recovered the abandoned auth. disk but detonation of SS13 was averted. Next time, don't lose the disk!" @@ -1813,7 +1737,6 @@ shuttle += M if (M.virus > 0) humanwin = 0 - //Foreach goto(1540) var/dead = list( ) var/alive = list( ) var/escapees = list( ) @@ -1835,20 +1758,16 @@ alive += text("[] was left infected. \red (Has Stage [] Infection)", M.rname, round(M.virus)) else alive += text("[] was left to be infected on Space Station 13.", M.rname) - //Foreach goto(1653) if (humanwin) world << "The Research Staff have won!" else world << "The Virus has won!" for(var/I in escapees) world << text("[]", I) - //Foreach goto(1851) for(var/I in alive) world << text("[]", I) - //Foreach goto(1883) for(var/I in dead) world << text("[]", I) - //Foreach goto(1915) if("meteor") var/list/L = list( ) for(var/mob/M in world) @@ -1862,7 +1781,6 @@ L[text("[]", M.rname)] = "pod" else L[text("[]", M.rname)] = "alive" - //Foreach goto(1955) if (L.len) world << "\blue The following survived the meteor attack!" for(var/I in L) @@ -1875,7 +1793,6 @@ if("alive") world << text("\t [] at least is alive.", I) else - //Foreach goto(2092) else world << "\blue No one survived the meteor attack!" if("megamonkey") @@ -1991,7 +1908,6 @@ L[text("[]", M.rname)] = "pod" else L[text("[]", M.rname)] = "alive" - //Foreach goto(2200) if (L.len) world << "\blue The game has ended!" for(var/I in L) @@ -2004,7 +1920,6 @@ if("alive") world << text("\t [] decided to stay on the station.", I) else - //Foreach goto(2337) else world << "\blue No one lived!" for (var/mob/ai/aiPlayer in world) @@ -2018,7 +1933,6 @@ if (T.z == 1) for(var/atom/movable/AM as mob|obj in T) AM.z = shuttle_z - //Foreach goto(2483) var/turf/U = locate(T.x, T.y, shuttle_z) U.oxygen = T.oxygen U.oldoxy = T.oldoxy @@ -2033,7 +1947,6 @@ U.buildlinks() //T = null del(T) - //Foreach goto(2449) sleep(300) if(config.loggame) world.log << "GAME: Rebooting due to end of game" world.Reboot() @@ -2094,7 +2007,6 @@ for(var/mob/human/M in world) if ((M.cliented() && M.start)) mobs += M - //Foreach goto(260) var/obj/O = locate("landmark*CTF-rogue") var/amount = 1 if (mobs.len >= 4) @@ -2166,11 +2078,9 @@ DivideOccupations() for(var/obj/manifest/M in world) M.manifest() - //Foreach goto(837) for(var/mob/human/H in world) if (H.start) reg_dna[text("[]", H.primary.uni_identity)] = H.name - //Foreach goto(878) data_core.manifest() numDronesInExistance = 0 @@ -2185,7 +2095,6 @@ for(var/mob/M in world) if ((M.cliented() && M.start)) mobs += M - //Foreach goto(983) if (!( mobs.len )) sleep(300) goto Label_970 @@ -2232,7 +2141,6 @@ for(var/datum/data/record/R in data_core.general) if (R.fields["name"] == src.target.name) t1 = text("the []", R.fields["rank"]) - //Foreach goto(1193) if (istype(src.killer, /mob/ai)) var/mob/ai/aiKiller = src.killer @@ -2308,7 +2216,6 @@ for(var/datum/data/record/R in data_core.general) if (R.fields["name"] == src.target.name) t1 = text(" the []", R.fields["rank"]) - //Foreach goto(1612) if (prob(70)) dat += text("\red Perceived target: [] - Position: [] ([]% certainty)
", src.target.rname, t1, rand(30, 100)) else @@ -2330,7 +2237,6 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) P.name = "paper- 'Cent. Com. Comm. Intercept Summary'" P.info = dat - //Foreach goto(1830) world << "Cent. Com. Update Enemy communication intercept. Security Level Elevated" world << "\red Summary downloaded and printed out at all communications consoles." return @@ -2352,7 +2258,6 @@ for(var/mob/human/M in world) if ((M.cliented() && M.start)) mobs += M - //Foreach goto(1974) if (mobs.len >= 3) var/amount = round((mobs.len - 1) / 3) + 1 amount = min(4, amount) @@ -2408,7 +2313,6 @@ for(var/datum/data/record/R in data_core.general) if (R.fields["name"] == src.target.name) t1 = text(" the []", R.fields["rank"]) - //Foreach goto(1612) if (prob(70)) dat += text("\red Perceived target: [] - Position: [] ([]% certainty)
", src.target.rname, t1, rand(30, 100)) else @@ -2429,7 +2333,6 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) P.name = "paper- 'Cent. Com. Comm. Intercept Summary'" P.info = dat - //Foreach goto(1830) world << "Cent. Com. Update Enemy communication intercept. Security Level Elevated" world << "\red Summary downloaded and printed out at all communications consoles."*/ @@ -2487,7 +2390,6 @@ for(var/mob/human/M in world) if ((M.cliented() && M.start)) mobs += M - //Foreach goto(2295) if (mobs.len > 3) var/amount = round(mobs.len / 3) amount = min(3, amount) @@ -2504,7 +2406,6 @@ for(var/obj/start/S in world) //S = null del(S) - //Foreach goto(2445) return @@ -2526,7 +2427,6 @@ spawn( 0 ) M.UpdateClothing() return - //Foreach goto(28) sleep(10) time = (++time %10) @@ -2547,17 +2447,14 @@ // world.log << "*** EoT ***" // Air() - //Foreach goto(73) sleep(3) for(var/mob/M in world) spawn( 0 ) M.Life() return - //Foreach goto(126) sleep(3) for(var/obj/move/S in world) S.process() - //Foreach goto(167) sleep(2) //if(Debug) @@ -2578,7 +2475,6 @@ // world.log << "*** EoP ***" // Air() - //Foreach goto(213) src.var_swap = !( src.var_swap ) if (src.processing) sleep(2) diff --git a/Code/chemical.dm b/Code/chemical.dm index 0576250..7c24ef2 100644 --- a/Code/chemical.dm +++ b/Code/chemical.dm @@ -92,7 +92,6 @@ var/datum/chemical/C = src.chemicals[item] if (istype(C, /datum/chemical)) amount += C.return_property("volume") - //Foreach goto(24) return amount return @@ -107,7 +106,6 @@ if (istype(C, /datum/chemical)) S.chemicals[item] = C src.chemicals[item] = null - //Foreach goto(60) return S else if (tot_volume <= 0) @@ -125,7 +123,6 @@ del(C) N.moles += amt * N.density / N.molarmass S.chemicals[text("[]", N.name)] = N - //Foreach goto(161) return S return @@ -150,7 +147,6 @@ N.moles += C.moles //C = null del(C) - //Foreach goto(106) else var/obj/substance/chemical/U = S.split(amount) for(var/item in U.chemicals) @@ -164,7 +160,6 @@ N.moles += C.moles //C = null del(C) - //Foreach goto(251) //U = null del(U) var/datum/chemical/C = null @@ -172,7 +167,6 @@ C = src.chemicals[text("[]", t)] if (istype(C, /datum/chemical)) C.react(src) - //Foreach goto(403) return amount return @@ -185,7 +179,6 @@ var/datum/chemical/C = S.chemicals[item] if (istype(C, /datum/chemical)) C.injected(M) - //Foreach goto(44) //S = null del(S) return @@ -199,7 +192,6 @@ var/datum/chemical/C = S.chemicals[item] if (istype(C, /datum/chemical)) C.injected(M, "eye") - //Foreach goto(44) //S = null del(S) return @@ -209,7 +201,6 @@ for(var/item in src.chemicals) //src.chemicals[item] = null del(src.chemicals[item]) - //Foreach goto(17) ..() return @@ -691,7 +682,6 @@ heat is conserved between exchanges W.moles += src.moles src.moles = 0 if (src.moles <= 0) - //SN src = null del(src) return return @@ -732,7 +722,6 @@ heat is conserved between exchanges M.plasma += 1 //T = null del(T) - //Foreach goto(133) return /datum/chemical/s_tox/injected(var/mob/M as mob, zone) diff --git a/Code/colour2html.dm b/Code/colour2html.dm index 9b67178..78ed1c1 100644 --- a/Code/colour2html.dm +++ b/Code/colour2html.dm @@ -4,7 +4,6 @@ for(T in html_colours) if (ckey(T) == ckey(colour)) else - //Foreach continue //goto(12) if (!( T )) world.log << text("Warning! Could not find matching colour entry for '[]'.", colour) return "#FFFFFF" diff --git a/Code/computer.dm b/Code/computer.dm index 39148d5..69ba69c 100644 --- a/Code/computer.dm +++ b/Code/computer.dm @@ -67,7 +67,6 @@ for(var/obj/machinery/camera/C in world) if (C.network == src.network) L[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C - //Foreach goto(31) L = sortList(L) L["Cancel"] = "Cancel" @@ -146,7 +145,6 @@ src.general += G src.medical += M src.security += S - //Foreach goto(15) return /turf/space/attack_paw(mob/user as mob) @@ -180,7 +178,6 @@ T.add_fingerprint(user) if (T.amount < 1) user.u_equip(T) - //SN src = null del(T) return return diff --git a/Code/demo.dm b/Code/demo.dm index f8492b0..631914a 100644 --- a/Code/demo.dm +++ b/Code/demo.dm @@ -117,7 +117,6 @@ for(var/mob/O in viewers(M, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\red [] has been knocked unconscious!", M) - //Foreach goto(169) M.client_mob() << text("\red This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)", time * 100 / 120) return @@ -140,7 +139,6 @@ if(src.gas) if ( (fi_amount * src.gas.tot_gas()) > (src.maximum * 3.75E7) ) src.gas.turf_add(get_turf(src.loc), src.gas.tot_gas()) - //SN src = null del(src) return return @@ -191,7 +189,6 @@ return 0.5 else return 0 - //G = null del(G) return @@ -251,10 +248,8 @@ zone = 2 for(var/atom/A in U) A.ex_act(zone) - //Foreach goto(342) U.ex_act(zone) U.buildlinks() - //Foreach goto(170) defer_powernet_rebuild = 0 makepowernets() @@ -271,16 +266,13 @@ zone = 3 for(var/atom/A in U) A.ex_act(zone) - //Foreach goto(598) U.ex_act(zone) U.buildlinks() - //Foreach goto(498) defer_powernet_rebuild = 0 makepowernets() //src.master = null del(src.master) - //SN src = null del(src) return @@ -293,7 +285,6 @@ for(var/mob/M in range(T)) flick("flash", M.flash) - //Foreach goto(732) var/m_range = 2 var/extended_range = round(strength / 387) if (extended_range < 2) @@ -305,7 +296,6 @@ if (C.gas.plasma >= 35000) C.destroyed = 1 m_range++ - //Foreach goto(776) var/min = extended_range var/med = extended_range * 2 var/max = extended_range * 3 @@ -351,18 +341,15 @@ */ for(var/atom/A in U) A.ex_act(zone) - //Foreach goto(1217) U.ex_act(zone) U.buildlinks() //U.mark(zone) - //Foreach goto(961) //src.master = null defer_powernet_rebuild = 0 makepowernets() del(src.master) - //SN src = null del(src) return @@ -513,7 +500,6 @@ T.firelevel = T.poison + 5 ..() if (src.z != 1) - //SN src = null del(src) return spawn( 3 ) @@ -542,7 +528,6 @@ T.firelevel = T.poison + 5 ..() if (src.z != 1) - //SN src = null del(src) return spawn( 3 ) @@ -562,7 +547,6 @@ if (--src.hits <= 0) - //SN src = null //******RM if(prob(15) && !istype(A, /obj/grille)) @@ -578,7 +562,6 @@ /obj/meteor/ex_act(severity) if (severity < 4) - //SN src = null del(src) return return @@ -629,7 +612,6 @@ for(var/mob/O in viewers(user, 3)) if (O.hasClient() && !( O.blinded )) O.client_mob() << text("\blue The locker has been []locked by [].", (src.locked ? null : "un"), user) - //Foreach goto(185) src.icon_state = text("[]secloset0", (src.locked ? "1" : null)) if (!( src.allowed )) src.allowed = "Name:[I.registered]/Captain/Head of Personnel" @@ -761,8 +743,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(35) - //SN src = null del(src) return if(2.0) @@ -770,8 +750,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(108) - //SN src = null del(src) return if(3.0) @@ -779,8 +757,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(181) - //SN src = null del(src) return else @@ -799,7 +775,6 @@ if (O.icon_state == "flaming") for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(29) for(var/mob/M in src) M.loc = src.loc var/client/client = M.alwaysClient() @@ -807,9 +782,7 @@ if (client.eye == src) client.eye = client.mob client.perspective = MOB_PERSPECTIVE - //Foreach goto(71) src.icon_state = "secloset1" - //SN src = null del(src) return return @@ -846,7 +819,6 @@ if (!( src.locked )) for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(36) for(var/mob/M in src) M.loc = src.loc var/client/client = M.alwaysClient() @@ -889,7 +861,6 @@ if (!( src.locked )) for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(43) for(var/mob/M in src) M.loc = src.loc var/client/client = M.alwaysClient() @@ -905,13 +876,11 @@ for(var/obj/item/I in src.loc) if (!( I.anchored )) I.loc = src - //Foreach goto(176) for(var/mob/M in src.loc) if (M.client) M.client.eye = src M.client.perspective = EYE_PERSPECTIVE M.loc = src - //Foreach goto(226) src.icon_state = "secloset0" src.opened = 0 return @@ -943,7 +912,6 @@ for(var/atom/movable/A as mob|obj in src.connected.loc) if (!( A.anchored )) A.loc = src - //Foreach goto(28) //src.connected = null del(src.connected) else @@ -956,7 +924,6 @@ src.icon_state = "morgue0" for(var/atom/movable/A as mob|obj in src) A.loc = src.connected.loc - //Foreach goto(168) src.connected.icon_state = "morguet" else //src.connected = null @@ -994,7 +961,6 @@ src.icon_state = "morgue0" for(var/atom/movable/A as mob|obj in src) A.loc = src.connected.loc - //Foreach goto(106) src.connected.icon_state = "morguet" else //src.connected = null @@ -1020,11 +986,9 @@ for(var/atom/movable/A as mob|obj in src.loc) if (!( A.anchored )) A.loc = src.connected - //Foreach goto(26) src.connected.connected = null src.connected.update() add_fingerprint(user) - //SN src = null del(src) return return @@ -1038,7 +1002,6 @@ for(var/mob/B in viewers(user, 3)) if (B.hasClient() && !( B.blinded )) B.client_mob() << text("\red [] stuffs [] into []!", user, O, src) - //Foreach goto(99) return /obj/closet/alter_health() @@ -1260,8 +1223,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(35) - //SN src = null del(src) return if(2.0) @@ -1269,8 +1230,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(108) - //SN src = null del(src) return if(3.0) @@ -1278,8 +1237,6 @@ for(var/atom/movable/A as mob|obj in src) A.loc = src.loc ex_act(severity) - //Foreach goto(181) - //SN src = null del(src) return else @@ -1298,7 +1255,6 @@ if (O.icon_state == "flaming") for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(29) for(var/mob/M in src) M.loc = src.loc var/client/client = M.alwaysClient() @@ -1307,7 +1263,6 @@ client.eye = client.mob client.perspective = MOB_PERSPECTIVE src.icon_state = "emcloset1" - //SN src = null del(src) return return @@ -1325,7 +1280,6 @@ for(var/mob/M in viewers(user, null)) if (M.hasClient()) M.show_message(text("\red [] has been [] by [].", src, (src.welded ? "welded shut" : "unwelded"), user), 3, "\red You hear welding.", 2) - //Foreach goto(82) return /obj/closet/relaymove(mob/user as mob) @@ -1335,7 +1289,6 @@ if (!( src.welded )) for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(36) for(var/mob/M in src) M.loc = src.loc var/client/client = M.alwaysClient() @@ -1343,7 +1296,6 @@ if (client.eye == src) client.eye = client.mob client.perspective = MOB_PERSPECTIVE - //Foreach goto(78) src.icon_state = "emcloset1" src.opened = 1 else @@ -1373,7 +1325,6 @@ for(var/mob/M in viewers(user, null)) if (M.hasClient() && !( M.blinded )) M.client_mob() << text("\red [] stuffs [] into []!", user, O, src) - //Foreach goto(104) src.add_fingerprint(user) return @@ -1389,7 +1340,6 @@ if (!( src.welded )) for(var/obj/item/I in src) I.loc = src.loc - //Foreach goto(43) for(var/mob/M in src) if (!( M.buckled )) M.loc = src.loc @@ -1398,7 +1348,6 @@ if (client.eye == src) client.eye = client.mob client.perspective = MOB_PERSPECTIVE - //Foreach goto(85) src.icon_state = "emcloset1" src.opened = 1 else @@ -1412,7 +1361,6 @@ M.client.eye = src M.client.perspective = EYE_PERSPECTIVE M.loc = src - //Foreach goto(237) src.icon_state = src.original src.opened = 0 return @@ -1429,17 +1377,14 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) if (prob(5)) - //SN src = null del(src) return else @@ -1455,7 +1400,6 @@ if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/sheet/metal( src.loc ) - //SN src = null del(src) return @@ -1475,7 +1419,6 @@ W.master = E user.u_equip(W) W.layer = initial(W.layer) - //SN src = null del(src) return return @@ -1505,7 +1448,6 @@ src.part1.loc = src.loc src.part1.master = null src.part1 = null - //SN src = null del(src) return return @@ -1557,13 +1499,11 @@ sleep(1) M.burn(7.5E7) M.stunned = 600 - //Foreach goto(72) for(var/mob/M in hearers(src, null)) if (!( M.blinded )) M.client_mob() << "\red The electric chair went off!" else M.client_mob() << "\red You hear a deep sharp shock." - //Foreach goto(142) A.power_light = light A.updateicon() @@ -1575,20 +1515,16 @@ if (severity < 4) for(var/mob/M in src.loc) M.buckled = null - //Foreach goto(28) switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) if (prob(5)) - //SN src = null del(src) return else @@ -1599,7 +1535,6 @@ if (prob(50)) for(var/mob/M in src.loc) M.buckled = null - //Foreach goto(28) if(prob(50)) del(src) @@ -1616,7 +1551,6 @@ for(var/mob/M in src.loc) if (M.buckled == src) M.buckled = null - //Foreach goto(17) ..() return @@ -1648,12 +1582,10 @@ for(var/mob/O in viewers(user, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] buckles in!", user) - //Foreach goto(83) else for(var/mob/O in viewers(user, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] is buckled in by []!", M, user) - //Foreach goto(137) M.anchored = 1 M.buckled = src M.loc = src.loc @@ -1678,16 +1610,13 @@ for(var/mob/O in viewers(user, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] is unbuckled by [].", M, user) - //Foreach goto(64) else for(var/mob/O in viewers(user, null)) if (O.hasClient() && (!( O.blinded ))) O.client_mob() << text("\blue [] unbuckles.", M) - //Foreach goto(123) M.anchored = 0 M.buckled = null src.add_fingerprint(user) - //Foreach goto(17) return @@ -1712,12 +1641,10 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) @@ -1787,7 +1714,6 @@ else if (src.health <= -10.0) new /obj/item/weapon/rods( src.loc ) - //SN src = null del(src) return return @@ -1817,7 +1743,6 @@ if(!reinf) new /obj/item/weapon/shard( src.loc ) - //SN src = null src.density = 0 src.loc.buildlinks() @@ -1838,13 +1763,11 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) new /obj/item/weapon/shard( src.loc ) if(reinf) new /obj/item/weapon/rods( src.loc) - //SN src = null del(src) return if(3.0) @@ -1852,7 +1775,6 @@ new /obj/item/weapon/shard( src.loc ) if(reinf) new /obj/item/weapon/rods( src.loc) - //SN src = null del(src) return else @@ -1908,7 +1830,6 @@ if(reinf) new /obj/item/weapon/rods( src.loc) src.density = 0 src.loc.buildlinks() - //SN src = null del(src) return ..() @@ -1952,7 +1873,6 @@ else new /obj/item/weapon/shard( src.loc ) if(reinf) new /obj/item/weapon/rods( src.loc) - //SN src = null src.density = 0 src.loc.buildlinks() @@ -2058,7 +1978,6 @@ for(var/x in src.verbs) src.verbs -= x - //Foreach goto(17) return /turf/CheckPass(atom/O as mob|obj|turf|area) @@ -2073,7 +1992,6 @@ spawn( 0 ) src.Entered(AM) return - //Foreach goto(19) return /turf/Enter(atom/movable/O as mob|obj, atom/forget as mob|obj|turf|area) @@ -2085,20 +2003,17 @@ if (O) O.Bump(A, 1) return 0 - //Foreach goto(34) for(var/atom/A as mob|obj|turf|area in src) if ((A.flags & 512 && get_dir(A, O) & A.dir)) if ((!( A.CheckPass(O, src) ) && A != src && A != forget)) if (O) O.Bump(A, 1) return 0 - //Foreach goto(127) for(var/atom/A as mob|obj|turf|area in src) if ((!( A.CheckPass(O, src) ) && A != forget)) if (O) O.Bump(A, 1) return 0 - //Foreach goto(244) if (src != forget) if (!( src.CheckPass(O, src) )) if (O) @@ -2115,13 +2030,11 @@ if ((A && M)) A.HasEntered(M, 1) return - //Foreach goto(19) for(var/atom/A as mob|obj|turf|area in range(1)) spawn( 0 ) if ((A && M)) A.HasProximity(M, 1) return - //Foreach goto(86) return @@ -2190,7 +2103,6 @@ switch(severity) if(1.0) - //SN src = null var/turf/space/S = src.ReplaceWithSpace() S.buildlinks() @@ -2403,7 +2315,6 @@ switch(severity) if(1.0) - //SN src = null var/turf/space/S = src.ReplaceWithSpace() S.buildlinks() del(src) @@ -2620,7 +2531,6 @@ return if(2.0) if (prob(50)) - //SN src = null var/turf/space/S = src.ReplaceWithSpace() S.buildlinks() levelupdate() @@ -2714,7 +2624,6 @@ src.burnt = 1 src.intact = 0 levelupdate() - //SN src = null del(src) return else diff --git a/Code/dna.dm b/Code/dna.dm index e51d206..e8ab1c4 100644 --- a/Code/dna.dm +++ b/Code/dna.dm @@ -212,12 +212,10 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return else @@ -271,9 +269,7 @@ src.occupant = usr src.icon_state = "scanner_1" for(var/obj/O in src) - //O = null del(O) - //Foreach goto(124) src.add_fingerprint(usr) return @@ -300,9 +296,7 @@ src.icon_state = "scanner_1" for(var/obj/O in src) O.loc = src.loc - //Foreach goto(154) src.add_fingerprint(user) - //G = null del(G) return @@ -711,7 +705,6 @@ src.add_fingerprint(usr) src.updateDialog() - //Foreach goto(484) return /obj/machinery/restruct/allow_drop() @@ -744,9 +737,7 @@ if("5BDFE293BA5500F9FFFD500AAFFE") if (!( istype(src.occupant, /mob/human) )) for(var/obj/O in src.occupant) - //O = null del(O) - //Foreach goto(78) var/mob/human/O = new /mob/human( src ) var/mob/M = src.occupant O.start = 1 @@ -774,9 +765,7 @@ if("2B6696D2B127E5A4") if (!( istype(src.occupant, /mob/monkey) )) for(var/obj/O in src.occupant) - //O = null del(O) - //Foreach goto(337) var/mob/monkey/O = new /mob/monkey( src ) var/mob/M = src.occupant O.start = 1 @@ -915,9 +904,7 @@ src.occupant = usr src.icon_state = "restruct_1" for(var/obj/O in src) - //O = null del(O) - //Foreach goto(124) src.add_fingerprint(usr) return @@ -951,9 +938,7 @@ src.icon_state = "restruct_1" for(var/obj/O in src) O.loc = src.loc - //Foreach goto(154) src.add_fingerprint(user) - //G = null del(G) return @@ -963,7 +948,6 @@ return for(var/obj/O in src) O.loc = src.loc - //Foreach goto(30) if (src.occupant.client) src.occupant.client.eye = src.occupant.client.mob src.occupant.client.perspective = MOB_PERSPECTIVE diff --git a/Code/engine.dm b/Code/engine.dm index 1f7ab8d..9e88c66 100644 --- a/Code/engine.dm +++ b/Code/engine.dm @@ -36,14 +36,12 @@ switch(severity) if(1.0) - //SN src = null var/turf/space/S = src.ReplaceWithSpace() S.buildlinks() del(src) return if(2.0) if (prob(50)) - //SN src = null var/turf/space/S = src.ReplaceWithSpace() S.buildlinks() @@ -73,7 +71,6 @@ src.status = 1 for(var/obj/machinery/computer/engine/E in machines) E.icon_state = "engaging" - //Foreach goto(113) spawn( 0 ) src.countdown() return @@ -129,7 +126,6 @@ S.ttemp = T.ttemp S.otemp = T.otemp S.firelevel = T.firelevel - //Foreach goto(100) S.buildlinks() @@ -146,13 +142,11 @@ - //Foreach goto(60) defer_powernet_rebuild = 0 makepowernets() world << "\red Engine Ejected!" for(var/obj/machinery/computer/engine/CE in machines) CE.icon_state = "engaged" - //Foreach goto(392) return /datum/engine_eject/proc/stopcount() @@ -169,7 +163,6 @@ for(var/obj/machinery/computer/engine/CE in machines) CE.icon_state = null - //Foreach goto(84) return /datum/engine_eject/proc/countdown() diff --git a/Code/instructions.dm b/Code/instructions.dm index 512695c..3be9cd1 100644 --- a/Code/instructions.dm +++ b/Code/instructions.dm @@ -93,7 +93,6 @@ for(var/turf/T in A) if(T.isempty()) L += T - //Foreach goto(239) start_loc["SS13"] = pick(L) @@ -102,7 +101,6 @@ for(var/obj/sp_start/S in world) if (S.tag == text("spstart[]", M.ckey)) start_loc[text("[]", S.desc)] = S - //Foreach goto(295) var/option = input(M, "Where should you start?", "Start Selector", null) in start_loc if (usr==null) return @@ -115,16 +113,12 @@ M << "\blue Now teleporting to special location." if (S.special == 2) for(var/obj/O in M) - //O = null del(O) - //Foreach goto(492) M.loc = S.loc else if (S.special == 3) for(var/obj/O in M) - //O = null del(O) - //Foreach goto(560) var/obj/O = new /mob/monkey( S.loc ) M.client.mob = O O.loc = S.loc diff --git a/Code/items.dm b/Code/items.dm index 0e68bf9..e9b2a97 100644 --- a/Code/items.dm +++ b/Code/items.dm @@ -56,7 +56,6 @@ /obj/item/weapon/table_parts/attackby(obj/item/weapon/W, mob/user) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/sheet/metal( src.loc ) - //SN src = null del(src) /obj/item/weapon/table_parts/attack_self(mob/user) @@ -72,7 +71,6 @@ T.icon_state = state T.dir = text2dir(direct) T.add_fingerprint(user) - //SN src = null del(src) return return @@ -81,7 +79,6 @@ if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/sheet/metal( src.loc ) - //SN src = null del(src) return return @@ -91,7 +88,6 @@ var/obj/rack/R = new /obj/rack( user.loc ) R.add_fingerprint(user) - //SN src = null del(src) return return @@ -132,7 +128,6 @@ flick("paper_binb", src) for(var/atom/movable/A in src) A.burn(fi_amount) - //Foreach goto(23) if (fi_amount >= config.min_gas_for_fire) src.amount = 0 src.update() @@ -181,7 +176,6 @@ usr.UpdateClothing() break//// ////else - //Foreach goto(48) else if (src.amount >= 1) src.amount-- @@ -196,7 +190,6 @@ var/n = src.amount for(var/obj/item/weapon/paper/P in src) n++ - //Foreach goto(33) if (n <= 0) n = 0 usr.client_mob() << "There are no papers in the bin." @@ -400,17 +393,14 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) if (prob(5)) - //SN src = null del(src) return else @@ -458,7 +448,6 @@ for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been attacked with [][] ", M, src, (user ? text(" by [].", user) : ".")), 1) - //Foreach goto(20) var/power = src.force if ((M.health >= -10.0) && (M.stat < 2)) if (istype(M, /mob/human)) @@ -494,7 +483,6 @@ H.stat = 1 for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been knocked unconscious!", H), 1, "\red You hear someone fall.", 2) - //Foreach goto(514) H.show_message(text("\red This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)", time * 100 / 120)) affecting.take_damage(b_dam, f_dam) else @@ -508,13 +496,11 @@ H.weakened = 5 for(var/mob/O in viewers(H, null)) O.show_message(text("\red [] has been knocked down!", H), 1, "\red You hear someone fall.", 2) - //Foreach goto(738) else if (H.stunned < 2) H.stunned = 2 for(var/mob/O in viewers(H, null)) O.show_message(text("\red [] has been stunned!", H), 1) - //Foreach goto(808) H.stat = 1 affecting.take_damage(b_dam, f_dam) else @@ -528,13 +514,11 @@ H.weakened = 5 for(var/mob/O in viewers(H, null)) O.show_message(text("\red [] has been knocked down!", H), 1, "\red You hear someone fall.", 2) - //Foreach goto(1014) else if (H.stunned < 2) H.stunned = 2 for(var/mob/O in viewers(H, null)) O.show_message(text("\red [] has been stunned!", H), 1) - //Foreach goto(1084) H.stat = 1 affecting.take_damage(b_dam, f_dam) else @@ -554,7 +538,6 @@ /obj/item/weapon/bedsheet/ex_act(severity) if (severity <= 2) - //SN src = null del(src) return return @@ -575,7 +558,6 @@ src.icon = 'b_items.dmi' flick(text("[]", t), src) spawn( 14 ) - //SN src = null del(src) return return @@ -615,7 +597,6 @@ src.add_fingerprint(user) if (src.amount <= 0) new /obj/item/weapon/c_tube( src.loc ) - //SN src = null del(src) return else @@ -633,14 +614,12 @@ user.r_hand = src.gift src.gift.layer = 20 src.gift.add_fingerprint(user) - //SN src = null del(src) return return /obj/item/weapon/a_gift/ex_act() - //SN src = null del(src) return return @@ -648,7 +627,6 @@ /obj/item/weapon/a_gift/burn(fi_amount) if (fi_amount > config.min_gas_for_fire) - //SN src = null del(src) return return @@ -664,7 +642,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return if("flash") @@ -675,7 +652,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return if("l_gun") @@ -686,7 +662,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return if("t_gun") @@ -697,7 +672,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return if("shield") @@ -708,7 +682,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return if("sword") @@ -719,7 +692,6 @@ M.r_hand = W W.layer = 20 W.add_fingerprint(M) - //SN src = null del(src) return else @@ -847,7 +819,6 @@ if (M.ear_damage >= 5) M << "\red Your ears start to ring!" - //SN src = null for(var/obj/blob/B in view(8,T)) var/damage = round(30/(get_dist(B,T)+1)) @@ -900,7 +871,6 @@ M.sdisabilities |= 1 for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] blinds [] with the flash!", user, M)) - //Foreach goto(229) src.attack_self(user, 1) return @@ -976,7 +946,6 @@ else direct = "very weak" src.temp += text("[]-[]-[]
", W.code, dir2text(get_dir(sr, tr)), direct) - //Foreach goto(114) src.temp += "Extranneous Signals:
" for(var/obj/item/weapon/implant/tracking/W in world) //Label_332: @@ -1000,7 +969,6 @@ else direct = "weak" src.temp += text("[]-[]-[]
", W.id, dir2text(get_dir(sr, tr)), direct) - //Foreach goto(332) src.temp += text("You are at \[[],[],[]\] in orbital coordinates.

Refresh
", sr.x, sr.y, sr.z, src) else src.temp += "Processing Error: Unable to locate orbital position.
" @@ -1020,7 +988,6 @@ for(var/mob/M in viewers(1, src)) if (M.hasClient()) src.attack_self(M) - //Foreach goto(749) return /obj/item/weapon/syndicate_uplink/proc/explode() @@ -1036,13 +1003,10 @@ zone = 3 for(var/atom/A in U) A.ex_act(zone) - //Foreach goto(209) U.ex_act(zone) U.buildlinks() - //Foreach goto(109) //src.master = null del(src.master) - //SN src = null del(src) return return @@ -1118,7 +1082,6 @@ for(var/mob/M in viewers(1, src)) if (M.hasClient()) src.attack_self(M) - //Foreach goto(488) return /obj/item/weapon/sword/attack(mob/target, mob/user) @@ -1225,7 +1188,6 @@ src.bullets-- for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] fires a revolver at []!", user, target), 1, "\red You hear a gunshot", 2) - //Foreach goto(122) var/turf/T = user.loc var/turf/U = (istype(target, /atom/movable) ? target.loc : target) if ((!( U ) || !( T ))) @@ -1376,7 +1338,6 @@ M.stat = 1 for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall", 2) - //Foreach goto(181) M.show_message(text("\red This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)", time * 100 / 120)) return @@ -1461,7 +1422,6 @@ M.stat = 1 for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall", 2) - //Foreach goto(182) else if (prob(50)) if (M.paralysis < 60) @@ -1476,7 +1436,6 @@ for(var/mob/O in viewers(M, null)) if ((O.hasClient() && !( O.blinded ))) O.show_message(text("\red [] has been stunned with the taser gun by []!", M, user), 1, "\red You hear someone fall", 2) - //Foreach goto(309) src.charges-- update_icon() else // no charges in the gun, so they just wallop the target with it @@ -1551,7 +1510,6 @@ var/pills = 0 for(var/obj/item/weapon/m_pill/M in src) pills += M.amount - //Foreach goto(39) usr.client_mob() << text("\blue There are [] pills inside!", pills) else usr.client_mob() << "\blue It looks empty!" @@ -1590,7 +1548,6 @@ var/pills = 0 for(var/obj/item/weapon/m_pill/M in src) pills += M.amount - //Foreach goto(34) if (pills > 30) usr.client_mob() << "\blue There are too many pills inside!" return @@ -1600,7 +1557,6 @@ //W = null del(W) return - //Foreach goto(97) if (W) user.drop_item() W.loc = src @@ -1623,7 +1579,6 @@ src.amount-- if (src.amount <= 0) - //SN src = null del(src) return return @@ -1642,7 +1597,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -1654,7 +1608,6 @@ if ((user != M && istype(M, /mob/human))) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] is forcing [] to swallow the []", user, M, src), 1) - //Foreach goto(41) var/obj/equip_e/human/O = new /obj/equip_e/human( ) O.source = user O.target = M @@ -1765,7 +1718,6 @@ W.amount = 5 else W.amount += W.amount - //SN src = null del(src) return return @@ -1837,7 +1789,6 @@ for(var/mob/M in range(1, src.loc)) if (M.s_active == src.loc) M.eitherScreenRemove(src) - //Foreach goto(34) src.throwing = 0 if (src.loc == user) user.u_equip(src) @@ -1857,7 +1808,6 @@ for(var/mob/M in range(1, src.loc)) if (M.s_active == src.loc) M.eitherScreenRemove(src) - //Foreach goto(34) src.throwing = 0 if (src.loc == user) user.u_equip(src) @@ -1903,7 +1853,6 @@ for(var/mob/O in viewers(user, null)) O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1) - //Foreach goto(20) src.add_fingerprint(user) return @@ -1964,7 +1913,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -1982,7 +1930,6 @@ W.amount = 6 else W.amount += src.amount - //SN src = null del(src) return return @@ -2005,14 +1952,12 @@ G.icon_state = "grille" src.amount-- else - //Foreach continue //goto(30) else if (src.amount < 2) return src.amount -= 2 new /obj/grille( usr.loc ) if (src.amount < 1) - //SN src = null del(src) return src.add_fingerprint(user) @@ -2032,7 +1977,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -2051,7 +1995,6 @@ W.amount = 5 else W.amount += src.amount - //SN src = null del(src) return return @@ -2086,7 +2029,6 @@ if (counter > 2) counter = 1 t1 += "
" - //Foreach goto(186) t1 += "" user.client_mob() << browse(t1, "window=met_sheet") return @@ -2097,7 +2039,6 @@ return if (href_list["make"]) if (src.amount < 1) - //SN src = null del(src) return switch(href_list["make"]) @@ -2182,7 +2123,6 @@ W.levelupdate() W.buildlinks() if (src.amount <= 0) - //SN src = null del(src) return spawn( 0 ) @@ -2204,7 +2144,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -2223,7 +2162,6 @@ G.amount = 5 else G.amount += src.amount - //SN src = null del(src) return return @@ -2289,7 +2227,6 @@ else if (src.amount <= 0) user.u_equip(src) - //SN src = null del(src) return return @@ -2308,7 +2245,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -2327,7 +2263,6 @@ W.amount = 5 else W.amount += src.amount - //SN src = null del(src) return return @@ -2367,7 +2302,6 @@ else if (src.amount <= 0) user.u_equip(src) - //SN src = null del(src) return return @@ -2380,7 +2314,6 @@ dat += text("Remove Pen

", src) for(var/obj/item/weapon/paper/P in src) dat += text("[] Write Remove
", src, P, P.name, src, P, src, P) - //Foreach goto(42) user.client_mob() << browse(dat, "window=clipboard") return @@ -2462,7 +2395,6 @@ var/obj/item/weapon/paper/P for(P in src) break - //Foreach goto(50) if (P) if (user.hand) user.l_hand = P @@ -2517,7 +2449,6 @@ var/dat = "Clipboard
" for(var/obj/item/weapon/f_card/P in src) dat += text("[] Remove
", src, P, P.name, src, P) - //Foreach goto(23) user.client_mob() << browse(dat, "window=fcardholder") return @@ -2613,7 +2544,6 @@ i = 1 break //else - //Foreach goto(22) src.icon_state = text("fcardholder[]", (i ? "1" : "0")) return @@ -2646,7 +2576,6 @@ close += T else far += T - //Foreach goto(147) close += tar_loc var/t = null t = 1 @@ -2669,7 +2598,6 @@ var/list/possible = list( ) for(var/T in oview(1, tar_loc)) possible += T - //Foreach goto(366) possible += tar_loc var/t = null t = 1 @@ -2724,7 +2652,6 @@ if (user) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been stabbed with [] by [].", M, src, user), 1) - //Foreach goto(57) var/amount = src.chem.transfer_mob(M, src.chem.maximum) user.show_message(text("\red You inject [] units into the [].", amount, M)) src.desc = "It's a normal black ink pen." @@ -2748,7 +2675,6 @@ src.icon = 'b_items.dmi' flick(text("[]", t), src) spawn( 14 ) - //SN src = null del(src) return return @@ -2860,7 +2786,6 @@ if ((W.welding && W.weldfuel > 0)) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] burns [] with the welding tool!", user, src), 1, "\red You hear a small burning noise", 2) - //Foreach goto(323) spawn( 0 ) src.burn(1800000.0) return @@ -2868,7 +2793,6 @@ if (istype(P, /obj/item/weapon/igniter)) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] burns [] with the igniter!", user, src), 1, "\red You hear a small burning noise", 2) - //Foreach goto(406) spawn( 0 ) src.burn(1800000.0) return @@ -2876,13 +2800,10 @@ if (istype(P, /obj/item/weapon/wirecutters)) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] starts cutting []!", user, src), 1) - //Foreach goto(489) sleep(50) if (((src.loc == src || get_dist(src, user) <= 1) && (!( user.stat ) && !( user.restrained() )))) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] cuts [] to pieces!", user, src), 1) - //Foreach goto(580) - //SN src = null del(src) return src.add_fingerprint(user) @@ -2926,7 +2847,6 @@ var/L = params2list(src.fingerprints) for(var/i in L) dat += text("[]
", i) - //Foreach goto(41) return dat else return "There are no fingerprints on this card." @@ -2946,7 +2866,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -3067,7 +2986,6 @@ user.client_mob() << text("\blue Isolated [] fingerprints.", L.len) for(var/i in L) user.client_mob() << text("\blue \t []", i) - //Foreach goto(186) return /obj/item/weapon/healthanalyzer/attack(mob/M, mob/user) @@ -3168,7 +3086,6 @@ for(var/obj/item/weapon/storage/S in src) L += S.return_inv() - //Foreach goto(22) return L return @@ -3228,7 +3145,6 @@ if (cx > mx) cx = tx cy-- - //Foreach goto(56) src.closer.screen_loc = text("[],[]", mx, my) return @@ -3359,7 +3275,6 @@ spawn( 2 ) for(var/obj/item/weapon/card/data/D in src.loc) D.loc = src - //Foreach goto(23) return ..() return @@ -3401,7 +3316,6 @@ var/t for(var/obj/item/weapon/O in src) t += O.w_class - //Foreach goto(46) t += W.w_class if (t > 20) user.client_mob() << "You cannot fit the item inside. (Remove larger classed items)" @@ -3415,7 +3329,6 @@ add_fingerprint(user) for(var/mob/O in viewers(user, null)) O.show_message(text("\blue [] has added [] to []!", user, W, src), 1) - //Foreach goto(206) return /obj/item/weapon/storage/attackby(obj/item/weapon/W, mob/user) @@ -3433,7 +3346,6 @@ add_fingerprint(user) for(var/mob/O in viewers(user, null)) O.show_message(text("\blue [] has added [] to []!", user, W, src), 1) - //Foreach goto(139) return /obj/item/weapon/storage/dropped(mob/user) @@ -3466,7 +3378,6 @@ for(var/mob/M in range(1)) if (M.s_active == src) src.close(M) - //Foreach goto(76) src.orient2hud(user) src.add_fingerprint(user) return @@ -3533,7 +3444,6 @@ M.stat = 1 for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been knocked unconscious!", M), 1, "\red You hear someone fall.", 2) - //Foreach goto(169) M.show_message(text("\red This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)", time * 100 / 120)) return @@ -3626,7 +3536,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -3664,7 +3573,6 @@ src.amount-- if (src.amount < 1) user.u_equip(src) - //SN src = null del(src) return src.add_fingerprint(user) @@ -3682,7 +3590,6 @@ W.amount = 10 else W.amount += src.amount - //SN src = null del(src) return return @@ -3939,7 +3846,6 @@ for(var/mob/M in viewers(1, src)) if (M.client) src.attack_self(M) - //Foreach goto(308) else if (istype(src.master.loc, /mob)) src.attack_self(src.master.loc) @@ -3947,7 +3853,6 @@ for(var/mob/M in viewers(1, src.master)) if (M.client) src.attack_self(M) - //Foreach goto(384) else usr.client_mob() << browse(null, "window=radio") return @@ -4039,7 +3944,6 @@ for(var/mob/M in viewers(1, src)) if (M.client) src.attack_self(M) - //Foreach goto(83) src.add_fingerprint(user) return @@ -4126,7 +4030,6 @@ src.master:r_signal(signal) for(var/mob/O in hearers(1, src.loc)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(64) return /obj/item/weapon/radio/signaler/proc/s_signal(signal) @@ -4151,7 +4054,6 @@ if (R) R.r_signal(signal) return - //Foreach goto(48) sleep(50) delay = 0 @@ -4217,7 +4119,6 @@ for(var/mob/M in viewers(1, src)) if (M.client) src.attack_self(M) - //Foreach goto(501) else if (istype(src.master.loc, /mob)) src.attack_self(src.master.loc) @@ -4225,7 +4126,6 @@ for(var/mob/M in viewers(1, src.master)) if (M.client) src.attack_self(M) - //Foreach goto(577) else usr.client_mob() << browse(null, "window=radio") return @@ -4344,18 +4244,13 @@ for(var/i in R.sendm(msg)) receive -= i receive += i - //Foreach goto(118) for(var/i in R.send_crackle()) crackle -= i crackle += i - //Foreach goto(162) - //Foreach goto(43) for(var/i in receive) crackle -= i - //Foreach goto(203) for(var/mob/O in crackle) O.show_message(text("\icon[] Crackle,Crackle", src), 2) - //Foreach goto(233) var/speakerType = M.type if (istype(M, /mob/human) || (istype(M, /mob/ai))) for(var/mob/O in receive) @@ -4369,7 +4264,6 @@ O.show_message(text("[]-\icon[]\[[]\]-broadcasts: []", M.rname, src, src.freq, msg), 2) else O.show_message(text("[]-\icon[]\[[]\]-broadcasts: []", M.rname, src, src.freq, stars(msg)), 2) - //Foreach goto(284) if (src.freq == 5) for(var/mob/O in receive) var/mobType = O.type @@ -4382,7 +4276,6 @@ O.show_message(text("[]-\icon[]\[[]\]-broadcasts (over PA): []", M.rname, src, src.freq, msg), 2) else O.show_message(text("[]-\icon[]\[[]\]-broadcasts (over PA): []", M.rname, src, src.freq, stars(msg)), 2) - //Foreach goto(393) else for(var/mob/O in receive) var/mobType = O.type @@ -4395,14 +4288,12 @@ O.show_message(text("The monkey-\icon[]\[[]\]-broadcasts: []", src, src.freq, msg), 2) else O.show_message(text("The monkey-\icon[]\[[]\]-broadcasts: chimpering", src, src.freq), 2) - //Foreach goto(492) if (src.freq == 5) for(var/mob/O in receive) if (istype(O, M)) O.show_message(text("The monkey-\icon[]\[[]\]-broadcasts (over PA): []", src, src.freq, msg), 2) else O.show_message(text("The monkey-\icon[]\[[]\]-broadcasts (over PA): chimpering", src, src.freq), 2) - //Foreach goto(585) return /obj/item/weapon/radio/hear_talk(mob/M, msg) @@ -4469,13 +4360,11 @@ var/obj/O = M for(var/mob/B in viewers(M, null)) B.show_message(text("\red [] has been hit by [].", M, src), 1) - //Foreach goto(71) O.hitby(src) if (!( istype(M, /mob) )) return for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been hit by [].", M, src), 1) - //Foreach goto(143) if (M.health > -100.0) if (istype(M, /mob/human)) var/mob/human/H = M @@ -4562,7 +4451,6 @@ if (istype(M, /mob/human) || istype(M, /mob/monkey)) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been eyedropped with [] by [].", M, src, user), 1) - //Foreach goto(89) var/amount = src.chem.dropper_mob(M, 1) src.update_is() user.show_message(text("\red You drop [] units into []'s eyes. The dropper contains [] millimeters.", amount, M, src.chem.volume())) @@ -4710,7 +4598,6 @@ for(var/mob/M in viewers(1, src)) if (M.client) src.attack_self(M) - //Foreach goto(290) src.add_fingerprint(usr) else usr.client_mob() << browse(null, "window=implantpad") @@ -4760,7 +4647,6 @@ if ((user && src.imp)) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been implanted by [].", M, user), 1) - //Foreach goto(48) src.imp.loc = M src.imp.implanted = 1 src.imp = null @@ -4852,7 +4738,6 @@ else if (istype(M, /mob/monkey)) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been injected with [] by [].", M, src, user), 1) - //Foreach goto(192) var/amount = src.chem.transfer_mob(M, 5) src.update_is() @@ -4873,7 +4758,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -4891,7 +4775,6 @@ if (user) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been applied with [] by []", M, src, user), 1) - //Foreach goto(89) if (istype(M, /mob/human)) var/mob/human/H = M var/obj/item/weapon/organ/external/affecting = H.organs["chest"] @@ -4923,7 +4806,6 @@ ..() usr.client_mob() << text("\blue there are [] bruise pack\s left on the stack!", src.amount) if (src.amount <= 0) - //SN src = null del(src) return return @@ -4950,14 +4832,12 @@ var/obj/machinery/computer/teleporter/com = locate(/obj/machinery/computer/teleporter, locate(R.x - 2, R.y, R.z)) if (istype(com, /obj/machinery/computer/teleporter)) L[text("[][]", com.id, (src.icon_state == "tele1" ? " (Active)" : " (Inactive)"))] = com.locked - //Foreach goto(22) var/t1 = input(user, "Please select a location to lock in.", "Locking Computer", null) in L if ((user.equipped() != src || user.stat || user.restrained())) return var/T = L[t1] for(var/mob/O in hearers(user, null)) O.show_message("\blue Locked In", 2) - //Foreach goto(192) var/obj/portal/P = new /obj/portal( get_turf(src) ) P.target = T src.add_fingerprint(user) @@ -4977,7 +4857,6 @@ F.layer = 20 F.add_fingerprint(user) if (src.amount < 1) - //SN src = null del(src) return else @@ -4996,7 +4875,6 @@ for(var/mob/O in viewers(M, null)) if ((O.hasClient() && !( O.blinded ))) O.show_message(text("\red [] has been applied with [] by []", M, src, user), 1) - //Foreach goto(89) if (istype(M, /mob/human)) var/mob/human/H = M var/obj/item/weapon/organ/external/affecting = H.organs["chest"] @@ -5018,7 +4896,6 @@ H.UpdateDamage() src.amount-- if (src.amount <= 0) - //SN src = null del(src) return else @@ -5042,7 +4919,6 @@ W.amount = 5 else W.amount += W.amount - //SN src = null del(src) return return @@ -5238,11 +5114,9 @@ for(var/mob/human/M in world) if (M.start) dat += text(" [] - []
", M.name, (istype(M.wear_id, /obj/item/weapon/card/id) ? text("[]", M.wear_id.assignment) : "Unknown Position")) - //Foreach goto(23) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = dat P.name = "paper- 'Crew Manifest'" - //SN src = null del(src) return return @@ -5297,12 +5171,10 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) @@ -5330,7 +5202,6 @@ user.layer = TURF_LAYER for(var/mob/M in viewers(user, null)) M.show_message("The monkey hides under the table!", 1) - //Foreach goto(69) return /obj/table/CheckPass(atom/movable/O, turf/target) @@ -5357,7 +5228,6 @@ return if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/table_parts( src.loc ) - //SN src = null del(src) return return @@ -5372,12 +5242,10 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) - //SN src = null del(src) return if(3.0) @@ -5417,7 +5285,6 @@ return if (istype(W, /obj/item/weapon/wrench)) new /obj/item/weapon/rack_parts( src.loc ) - //SN src = null del(src) return return @@ -5568,13 +5435,11 @@ for(var/mob/O in viewers(src, null)) if (!( O.blinded )) O.client_mob() << text("\red [] has been scanned by [] with the []", src, user, W) - //Foreach goto(31) else if (!( istype(W, /obj/item/weapon/grab) )) for(var/mob/O in viewers(src, null)) if (!( O.blinded )) O.client_mob() << text("\red [] has been hit by [] with []", src, user, W) - //Foreach goto(102) return /atom/proc/add_fingerprint(mob/human/M) diff --git a/Code/mob.dm b/Code/mob.dm index 30bd02e..2888458 100644 --- a/Code/mob.dm +++ b/Code/mob.dm @@ -221,7 +221,6 @@ for(var/mob/M in world) if (M.rname == text("[]", msg)) return 1 - //Foreach goto(15) return 0 return @@ -244,7 +243,6 @@ step(src.affecting, src.assailant.dir) if (prob(75)) step(src.affecting, src.assailant.dir) - //SN src = null del(src) return @@ -259,7 +257,6 @@ /obj/item/weapon/grab/proc/process() if ((!( isturf(src.assailant.loc) ) || (!( isturf(src.affecting.loc) ) || (src.assailant.loc != src.affecting.loc && get_dist(src.assailant, src.affecting) > 1)))) - //SN src = null del(src) return if (src.assailant.client) @@ -287,7 +284,6 @@ for(var/obj/item/weapon/grab/G in src.affecting.grabbed_by) if (G.state == 2) src.allow_upgrade = 0 - //Foreach goto(341) if ((src.allow_upgrade) && (istype(src, /mob/human) || istype(src, /mob/monkey))) src.hud1.icon_state = "reinforce" else @@ -306,7 +302,6 @@ if (src.assailant.next_move > world.time) return if ((!( src.assailant.canmove ) || src.assailant.lying)) - //SN src = null del(src) return switch(S.id) @@ -315,7 +310,6 @@ if (!( src.killing )) for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has temporarily tightened his grip on []!", src.assailant, src.affecting), 1) - //Foreach goto(97) src.assailant.next_move = world.time + 10 src.affecting.stunned = max(2, src.affecting.stunned) src.affecting.paralysis = max(1, src.affecting.paralysis) @@ -330,7 +324,6 @@ if ((src.assailant.next_move > world.time && !( src.last_suffocate < world.time + 2 ))) return if ((!( src.assailant.canmove ) || src.assailant.lying)) - //SN src = null del(src) return switch(S.id) @@ -343,21 +336,17 @@ if (prob(75)) for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has grabbed [] aggressively (now hands)!", src.assailant, src.affecting), 1) - //Foreach goto(121) src.state = 2 src.icon_state = "grabbed1" else for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has failed to grab [] aggressively!", src.assailant, src.affecting), 1) - //Foreach goto(186) - //SN src = null del(src) return else if (src.state < 3) for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has reinforced his grip on [] (now neck)!", src.assailant, src.affecting), 1) - //Foreach goto(257) src.state = 3 src.icon_state = "grabbed+1" if (!( src.affecting.buckled )) @@ -370,7 +359,6 @@ if (src.killing) for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has tightened his grip on []'s neck!", src.assailant, src.affecting), 1) - //Foreach goto(392) src.assailant.next_move = world.time + 10 src.affecting.stunned = max(2, src.affecting.stunned) src.affecting.paralysis = max(1, src.affecting.paralysis) @@ -380,7 +368,6 @@ src.hud1.icon_state = "disarm/kill" for(var/mob/O in viewers(src.assailant, null)) O.show_message(text("\red [] has loosened the grip on []'s neck!", src.assailant, src.affecting), 1) - //Foreach goto(517) else return @@ -406,7 +393,6 @@ /obj/item/weapon/grab/dropped() - //SN src = null del(src) return return @@ -586,33 +572,24 @@ usr.next_move = world.time + 20 if ((!( usr.stat ) && usr.canmove && !( usr.restrained() ))) for(var/obj/O in usr.requests) - //O = null del(O) - //Foreach goto(557) for(var/obj/item/weapon/grab/G in usr.grabbed_by) if (G.state == 1) - //G = null del(G) else if (G.state == 2) if (prob(25)) for(var/mob/O in viewers(usr, null)) O.show_message(text("\red [] has broken free of []'s grip!", usr, G.assailant), 1) - //Foreach goto(681) - //G = null del(G) else if (G.state == 2) if (prob(5)) for(var/mob/O in viewers(usr, null)) O.show_message(text("\red [] has broken free of []'s headlock!", usr, G.assailant), 1) - //Foreach goto(762) - //G = null del(G) - //Foreach goto(602) for(var/mob/O in viewers(usr, null)) O.show_message(text("\red [] resists!", usr), 1) - //Foreach goto(824) else if (!usr.disable_one_click) src.DblClick() return @@ -998,11 +975,9 @@ /obj/equip_e/New() if (!( ticker )) - //SN src = null del(src) return spawn( 100 ) - //SN src = null del(src) return return @@ -1017,32 +992,26 @@ switch(src.place) if("head") if (!( src.target.wear_mask )) - //SN src = null del(src) return if("l_hand") if (!( src.target.l_hand )) - //SN src = null del(src) return if("r_hand") if (!( src.target.r_hand )) - //SN src = null del(src) return if("back") if (!( src.target.back )) - //SN src = null del(src) return if("handcuff") if (!( src.target.handcuffed )) - //SN src = null del(src) return if("internal") if ((!( (istype(src.target.wear_mask, /obj/item/weapon/clothing/mask) && istype(src.target.back, /obj/item/weapon/tank) && !( src.target.internal )) ) && !( src.target.internal ))) - //SN src = null del(src) return @@ -1050,7 +1019,6 @@ for(var/mob/O in viewers(src.target, null)) if ((O.hasClient() && !( O.blinded ))) O.show_message(text("\red [] is trying to put a [] on []", src.source, src.item, src.target), 1) - //Foreach goto(251) else var/message = null switch(src.place) @@ -1070,7 +1038,6 @@ else for(var/mob/M in viewers(src.target, null)) M.show_message(message, 1) - //Foreach goto(469) spawn( 30 ) src.done() return @@ -1194,11 +1161,9 @@ for(var/mob/M in viewers(src.target, 1)) if ((M.hasClient() && !( M.blinded ))) M.show_message(text("[] is now running on internals.", src.target), 1) - //Foreach goto(1097) else src.source.UpdateClothing() src.target.UpdateClothing() - //SN src = null del(src) return return @@ -1211,37 +1176,30 @@ switch(src.place) if("mask") if (!( src.target.wear_mask )) - //SN src = null del(src) return if("headset") if (!( src.target.w_radio )) - //SN src = null del(src) return if("l_hand") if (!( src.target.l_hand )) - //SN src = null del(src) return if("r_hand") if (!( src.target.r_hand )) - //SN src = null del(src) return if("suit") if (!( src.target.wear_suit )) - //SN src = null del(src) return if("uniform") if (!( src.target.w_uniform )) - //SN src = null del(src) return if("back") if (!( src.target.back )) - //SN src = null del(src) return if("syringe") @@ -1250,17 +1208,14 @@ return if("handcuff") if (!( src.target.handcuffed )) - //SN src = null del(src) return if("id") if ((!( src.target.wear_id ) || !( src.target.w_uniform ))) - //SN src = null del(src) return if("internal") if ((!( (istype(src.target.wear_mask, /obj/item/weapon/clothing/mask) && istype(src.target.back, /obj/item/weapon/tank) && !( src.target.internal )) ) && !( src.target.internal ))) - //SN src = null del(src) return @@ -1268,17 +1223,14 @@ if ((src.item && !( L.Find(src.place) ))) for(var/mob/O in viewers(src.target, null)) O.show_message(text("\red [] is trying to put \a [] on []", src.source, src.item, src.target), 1) - //Foreach goto(401) else if (src.place == "syringe") for(var/mob/O in viewers(src.target, null)) O.show_message(text("\red [] is trying to inject []!", src.source, src.target), 1) - //Foreach goto(466) else if (src.place == "pill") for(var/mob/O in viewers(src.target, null)) O.show_message(text("\red [] is trying to force [] to swallow []!", src.source, src.target, src.item), 1) - //Foreach goto(527) else var/message = null switch(src.place) @@ -1314,7 +1266,6 @@ message = text("\red [] is trying to empty []'s pockets!!", src.source, src.target) if("CPR") if (src.target.cpr_time >= world.time + 3) - //SN src = null del(src) return message = text("\red [] is trying perform CPR on []!", src.source, src.target) @@ -1328,7 +1279,6 @@ else for(var/mob/M in viewers(src.target, null)) M.show_message(message, 1) - //Foreach goto(1069) spawn( 30 ) src.done() return @@ -1492,7 +1442,6 @@ src.item.loc = src.target if("l_hand") if (istype(src.target, /obj/item/weapon/clothing/suit/straight_jacket)) - //SN src = null del(src) return if (src.target.l_hand) @@ -1515,7 +1464,6 @@ src.item.add_fingerprint(src.target) if("r_hand") if (istype(src.target, /obj/item/weapon/clothing/suit/straight_jacket)) - //SN src = null del(src) return if (src.target.r_hand) @@ -1653,7 +1601,6 @@ src.item.loc = src.target if("CPR") if (src.target.cpr_time >= world.time + 30) - //SN src = null del(src) return if ((src.target.health >= -75.0 && src.target.health < 0)) @@ -1666,33 +1613,27 @@ src.target.rejuv += 10 // change for(var/mob/O in viewers(src.source, null)) O.show_message(text("\red [] performs CPR on []!", src.source, src.target), 1) - //Foreach goto(3251) src.source.client_mob() << "\red Repeat every 7 seconds AT LEAST." if("syringe") var/obj/item/weapon/syringe/S = src.item src.item.add_fingerprint(src.source) if (!( istype(S, /obj/item/weapon/syringe) )) - //SN src = null del(src) return if (S.s_time >= world.time + 30) - //SN src = null del(src) return S.s_time = world.time var/a = S.inject(src.target) for(var/mob/O in viewers(src.source, null)) O.show_message(text("\red [] injects [] with the syringe!", src.source, src.target), 1) - //Foreach goto(3407) src.source.client_mob() << text("\red You inject [] units into []. The syringe contains [] units.", a, src.target, S.chem.volume()) if("pill") var/obj/item/weapon/m_pill/S = src.item if (!( istype(S, /obj/item/weapon/m_pill) )) - //SN src = null del(src) return if (S.s_time >= world.time + 30) - //SN src = null del(src) return S.s_time = world.time @@ -1700,7 +1641,6 @@ S.ingest(src.target) for(var/mob/O in viewers(src.source, null)) O.show_message(text("\red [] forces [] to swallow \a []!", src.source, src.target, a), 1) - //Foreach goto(3568) if("pockets") if (src.target.l_store) var/obj/item/weapon/W = src.target.l_store @@ -1736,12 +1676,10 @@ src.target.internal = src.target.back for(var/mob/M in viewers(src.target, 1)) M.show_message(text("[] is now running on internals.", src.target), 1) - //Foreach goto(3913) src.target.internal.add_fingerprint(src.source) else src.source.UpdateClothing() src.target.UpdateClothing() - //SN src = null del(src) return return @@ -1776,13 +1714,11 @@ for(var/t in src.organs) if (istype(src.organs[text("[]", t)], /obj/item/weapon/organ/external)) L += src.organs[text("[]", t)] - //Foreach goto(24) src.bruteloss = 0 src.fireloss = 0 for(var/obj/item/weapon/organ/external/O in L) src.bruteloss += O.brute_dam src.fireloss += O.burn_dam - //Foreach goto(94) return @@ -1796,7 +1732,6 @@ for(var/t in src.organs) if (istype(src.organs[text("[]", t)], /obj/item/weapon/organ/external)) L += src.organs[text("[]", t)] - //Foreach goto(24) //src.body_standing = null del(src.body_standing) src.body_standing = list( ) @@ -1826,7 +1761,6 @@ //src.body_standing += new /icon( 'dam_zones.dmi', text("[]", O.d_i_state) ) //src.body_lying += new /icon( 'dam_zones.dmi', text("[]2", O.d_i_state) ) - //Foreach goto(122) @@ -1878,7 +1812,6 @@ W.loc = src.loc W.dropped(src) W.layer = initial(W.layer) - //Foreach goto(25) src.UpdateClothing() src.monkeyizing = 1 src.canmove = 0 @@ -1887,7 +1820,6 @@ for(var/t in src.organs) //src.organs[text("[]", t)] = null del(src.organs[text("[]", t)]) - //Foreach goto(154) var/atom/movable/overlay/animation = new /atom/movable/overlay( src.loc ) animation.icon_state = "blank" animation.icon = 'mob.dmi' @@ -1913,7 +1845,6 @@ O << "You are now a monkey." O << "Don't be angry at the source as now you are just like him so deal with it." O << "Follow your objective." - //SN src = null del(src) return @@ -1929,7 +1860,6 @@ for(var/obj/item/weapon/implant/I in src) if (I.implanted) I.trigger(act, src) - //Foreach goto(114) var/message switch(act) if("blink") @@ -1945,7 +1875,6 @@ for(var/mob/A in view(null, null)) if (param == A.name) M = A - //Foreach goto(384) if (!( M )) param = null message = text("[] bows[]", src, (param ? text(" to [].", param) : ".")) @@ -1957,7 +1886,6 @@ for(var/mob/A in view(null, null)) if (param == A.name) M = A - //Foreach goto(505) if (!( M )) param = null message = text("[] salutes[]", src, (param ? text(" to [].", param) : ".")) @@ -2032,7 +1960,6 @@ for(var/mob/A in view(null, null)) if (param == A.name) M = A - //Foreach goto(1042) if (!( M )) param = null message = text("[] glares[]", src, (param ? text(" at [].", param) : ".")) @@ -2042,7 +1969,6 @@ for(var/mob/A in view(null, null)) if (param == A.name) M = A - //Foreach goto(1146) if (!( M )) param = null message = text("[] stares[]", src, (param ? text(" at [].", param) : ".")) @@ -2052,7 +1978,6 @@ for(var/mob/A in view(null, null)) if (param == A.name) M = A - //Foreach goto(1250) if (!( M )) param = null message = text("[] looks[]", src, (param ? text(" at [].", param) : ".")) @@ -2108,7 +2033,6 @@ for(var/atom/A as mob|obj|turf|area in view(null, null)) if (param == A.name) M = A - //Foreach goto(1667) if (!( M )) param = null else @@ -2195,7 +2119,6 @@ for(var/mob/A in view(1, null)) if (param == A.name) M = A - //Foreach goto(2336) if (M == src) M = null if (M) @@ -2210,7 +2133,6 @@ for(var/mob/A in view(1, null)) if (param == A.name) M = A - //Foreach goto(2492) if (M == src) M = null if (M) @@ -2226,11 +2148,9 @@ if (m_type & 1) for(var/mob/O in viewers(src, null)) O.show_message(message, m_type) - //Foreach goto(2673) else for(var/mob/O in hearers(src, null)) O.show_message(message, m_type) - //Foreach goto(2716) return /mob/human/proc/update_body() @@ -2244,7 +2164,6 @@ for(var/t in list( "chest", "head", "l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot" )) src.stand_icon.Blend(new /icon( 'human.dmi', text("[]", t) ), 3) src.lying_icon.Blend(new /icon( 'human.dmi', text("[]2", t) ), 3) - //Foreach goto(95) if (src.s_tone >= 0) src.stand_icon.Blend(rgb(src.s_tone, src.s_tone, src.s_tone), 0) src.lying_icon.Blend(rgb(src.s_tone, src.s_tone, src.s_tone), 0) @@ -2311,7 +2230,6 @@ if (S.active) shielded = 1 else - //Foreach continue //goto(32) var/b_loss = null var/f_loss = null switch(severity) @@ -2363,7 +2281,6 @@ if("r_foot") temp.take_damage(b_loss * 0.0225, f_loss * 0.0225) - //Foreach goto(282) src.UpdateDamageIcon() return @@ -2407,7 +2324,6 @@ src.weakened = rand(10, 15) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The blob has weakened []!", src), 1, "\red You hear someone fall.", 2) - //Foreach goto(820) temp.take_damage(damage) if ("chest") if ((((src.wear_suit && src.wear_suit.brute_protect & 2) || (src.w_uniform && src.w_uniform.brute_protect & 2)) && prob(85))) @@ -2419,13 +2335,11 @@ src.weakened = 5 for(var/mob/O in viewers(src, null)) O.show_message(text("\red The blob has knocked down []!", src), 1, "\red You hear someone fall.", 2) - //Foreach goto(993) else if (src.stunned < 5) src.stunned = 5 for(var/mob/O in viewers(src, null)) O.show_message(text("\red The blob has stunned []!", src), 1) - //Foreach goto(1063) src.stat = 1 temp.take_damage(damage) if ("diaper") @@ -2453,7 +2367,6 @@ if("r_foot") temp.take_damage(damage, 0) - //Foreach goto(282) src.UpdateDamageIcon() return @@ -2699,7 +2612,6 @@ for(var/mob/M in viewers(src, null)) if ((M.hasClient() && !( M.blinded ))) M.show_message(text("\red [] has been hit with by []", src, O), 1) - //Foreach goto(19) if (src.health > 0) var/dam_zone = pick("chest", "chest", "chest", "head", "diaper") if (istype(src.organs[text("[]", dam_zone)], /obj/item/weapon/organ/external)) @@ -2745,7 +2657,6 @@ for(var/mob/M in range(src, 1)) if ((M.pulling == src && M.stat == 0 && !( M.restrained() ))) t7 = null - //Foreach goto(62) if ((t7 && (src.pulling && ((get_dist(src, src.pulling) <= 1 || src.pulling.loc == src.loc) && (src.client && src.client.moving))))) var/turf/T = src.loc . = ..() @@ -2775,8 +2686,6 @@ if (istype(G, /obj/item/weapon/grab)) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1) - //Foreach goto(354) - //G = null del(G) else ok = 0 @@ -2841,7 +2750,6 @@ return if(config.logaccess) world.log << "LOGOUT: [src.key]" if (!( src.start )) - //SN src = null del(src) return else @@ -3068,7 +2976,6 @@ for(var/turf/T in A) if(T.isempty() ) L += T - //Foreach goto(1473) src.loc = pick(L) @@ -3111,7 +3018,6 @@ for(var/mob/M in world) if ((M.cliented() && !( M.stat ))) cancel = 1 - //Foreach goto(67) if (!( cancel )) @@ -3122,7 +3028,6 @@ for(var/mob/M in world) if ((M.cliented() && !( M.stat ))) cancel = 1 - //Foreach goto(67) if (!( cancel )) world << "Everyone is dead! Resetting in 30 seconds!" @@ -3608,7 +3513,6 @@ if(8.0) src.pixel_x = -8.0 - //Foreach goto(2918) src.weight = ((src.grabbed_by.len - a_grabs) / 2 + 1) * 1250000.0 + (a_grabs * 2500000.0) else if (src.lying) @@ -3755,13 +3659,11 @@ shielded = 1 S.active = 0 S.icon_state = "shield0" - //Foreach goto(22) for(var/obj/item/weapon/cloaking_device/S in src) if (S.active) shielded = 1 S.active = 0 S.icon_state = "shield0" - //Foreach goto(99) if ((shielded && flag != "bullet")) if (!( flag )) src << "\blue Ohhh that shield isn't going to help here!" @@ -3934,7 +3836,6 @@ message = copytext(message, 4, length(message) + 1) for(var/obj/item/weapon/radio/intercom/I in view(1, null)) I.talk_into(usr, message) - //Foreach goto(626) L += hearers(1, null) obj_range = 1 italics = 1 @@ -3981,11 +3882,9 @@ if (O) O.hear_talk(usr, message) return - //Foreach goto(948) for(var/mob/M in world) if (M.stat > 1) M << text("[][] []: []", src.rname, alt_name, (src.stat > 1 ? "\[dead \]" : ""), message) - //Foreach goto(1005) return /mob/human/UpdateClothing() @@ -4034,10 +3933,8 @@ //for(var/i in src.overlays) // src.overlays -= i src.overlays = null - //Foreach goto(351) //for(var/i in src.zone_sel.overlays) // src.zone_sel.overlays -= i - //Foreach goto(385) //*****RM if(src.zone_sel) @@ -4255,12 +4152,10 @@ if (S.active) shielded = 1 else - //Foreach continue //goto(2917) for(var/obj/item/weapon/cloaking_device/S in src) if (S.active) shielded = 2 else - //Foreach continue //goto(2969) if (shielded == 2) src.invisibility = 2 else @@ -4272,7 +4167,6 @@ spawn( 0 ) src.show_inv(M) return - //Foreach goto(3088) src.last_b_state = src.stat return @@ -4290,33 +4184,28 @@ if (prob(95)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(101) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/bio_suit)) if (prob(90)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(167) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/armor)) if (prob(60)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(233) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/swat_suit)) if (prob(99)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(299) return for(var/mob/O in viewers(src, null)) if ((O.hasClient() && !( O.blinded ))) O.show_message(text("\red The monkey has bit []!", src), 1) - //Foreach goto(344) var/damage = rand(1, 3) var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg", "diaper") if (istype(src.organs[text("[]", dam_zone)], /obj/item/weapon/organ/external)) @@ -4332,7 +4221,6 @@ for(var/mob/O in viewers(src, null)) if ((O.hasClient() && !( O.blinded ))) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(580) return /mob/human/attack_paw(mob/M as mob) @@ -4342,7 +4230,6 @@ src.resting = 0 for(var/mob/O in viewers(src, null)) O.show_message(text("\blue The monkey shakes [] trying to wake him up!", src), 1) - //Foreach goto(47) else if (istype(src.wear_mask, /obj/item/weapon/clothing/mask/muzzle)) return @@ -4351,32 +4238,27 @@ if (prob(95)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(159) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/bio_suit)) if (prob(90)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(225) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/armor)) if (prob(60)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(291) return else if (istype(src.wear_suit, /obj/item/weapon/clothing/suit/swat_suit)) if (prob(99)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(357) return for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has bit []!", src), 1) - //Foreach goto(402) var/damage = rand(1, 3) var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg", "diaper") if (istype(src.organs[text("[]", dam_zone)], /obj/item/weapon/organ/external)) @@ -4391,7 +4273,6 @@ else for(var/mob/O in viewers(src, null)) O.show_message(text("\red The monkey has attempted to bite []!", src), 1) - //Foreach goto(623) return /mob/human/attack_hand(mob/M as mob) @@ -4449,7 +4330,6 @@ src.resting = 0 for(var/mob/O in viewers(src, null)) O.show_message(text("\blue [] shakes [] trying to wake [] up!", M, src, src), 1) - //Foreach goto(80) else if (M.health >= -75.0) if (((H.head && H.head.flags & 4) || ((H.wear_mask && !( H.wear_mask.flags & 32 )) || ((src.head && src.head.flags & 4) || (src.wear_mask && !( src.wear_mask.flags & 32 )))))) @@ -4473,7 +4353,6 @@ src.resting = 0 for(var/mob/O in viewers(src, null)) O.show_message(text("\blue [] shakes [] trying to wake [] up!", M, src, src), 1) - //Foreach goto(80) else M << "They need CPR, and you can't perform it through this drone!" else @@ -4494,7 +4373,6 @@ G.synch() for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has grabbed [] passively!", M, src), 1) - //Foreach goto(441) else if (M.stat < 2) if (intentToApply == "hurt") @@ -4515,7 +4393,6 @@ if ((istype(affecting, /obj/item/weapon/organ/external) && prob(90))) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has punched []!", M, src), 1) - //Foreach goto(646) if (def_zone == "head") if ((((src.head && src.head.brute_protect & 1) || (src.wear_mask && src.wear_mask.brute_protect & 1)) && prob(99))) if (prob(20)) @@ -4528,7 +4405,6 @@ src.weakened = rand(10, 15) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has weakened []!", M, src), 1, "\red You hear someone fall.", 2) - //Foreach goto(820) affecting.take_damage(damage) else if (def_zone == "chest") @@ -4541,13 +4417,11 @@ src.weakened = 5 for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has knocked down []!", M, src), 1, "\red You hear someone fall.", 2) - //Foreach goto(993) else if (src.stunned < 5) src.stunned = 5 for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has stunned []!", M, src), 1) - //Foreach goto(1063) src.stat = 1 affecting.take_damage(damage) else @@ -4561,13 +4435,11 @@ src.weakened = 3 for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has knocked down []!", M, src), 1, "\red You hear someone fall.", 2) - //Foreach goto(1239) else if (src.stunned < 3) src.stunned = 3 for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has stunned []!", M, src), 1) - //Foreach goto(1309) src.stat = 1 affecting.take_damage(damage) else @@ -4579,7 +4451,6 @@ else for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has attempted to punch []!", M, src), 1) - //Foreach goto(1419) return else if (istype(M, /mob/drone)) var/damage = 0 @@ -4601,17 +4472,14 @@ src.weakened = 2 for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has pushed down []!", M, src), 1) - //Foreach goto(1529) else if (randn <= 60) src.drop_item() for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has disarmed []!", M, src), 1) - //Foreach goto(1596) else for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has attempted to disarm []!", M, src), 1) - //Foreach goto(1643) if (corruptedIntent) if (M.a_intent == "help") M.client_mob() << "You failed to help [src] due to poor control over the drone, and may have knocked \him down, but at least you have not hurt \him." @@ -4888,7 +4756,6 @@ for(var/mob/M in world) if (M.rname == text("[]", msg)) return 1 - //Foreach goto(15) return 0 return @@ -4956,7 +4823,6 @@ W.layer = initial(W.layer) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [] has thrown [].", src, W), 1) - //Foreach goto(133) W.density = 1 W.throwing = 1 W.throwspeed = initial(W.throwspeed) @@ -5030,7 +4896,6 @@ if (M.cliented()) total++ usr << text("\t [] ([]) []", M, M.cliented(), M.health) - //Foreach goto(32) usr << text("Total Players: []", total) return @@ -5040,7 +4905,6 @@ usr << "Registered DNA sequences:" for(var/M in reg_dna) usr << text("\t [] = []", M, reg_dna[text("[]", M)]) - //Foreach goto(26) return /mob/proc/equipped() @@ -5291,9 +5155,7 @@ set hidden = 1 for(var/obj/O in M) - //O = null del(O) - //Foreach goto(20) var/mob/monkey/O = new /mob/monkey( M.loc ) if (M.currentDrone!=null) M.currentDrone:releaseControl(0) @@ -5324,7 +5186,6 @@ for(var/V in O.vars) if (issaved(O.vars[V])) new_O.vars[V] = O.vars[V] - //Foreach goto(72) return @@ -5336,32 +5197,20 @@ switch(pass) if("sec_clothes") for(var/obj/item/weapon/clothing/under/O in world) - //O = null del(O) - //Foreach goto(52) if("sec_all_clothes") for(var/obj/item/weapon/clothing/O in world) - //O = null del(O) - //Foreach goto(97) if("sec_classic1") for(var/obj/item/weapon/clothing/suit/firesuit/O in world) - //O = null del(O) - //Foreach goto(142) for(var/obj/grille/O in world) - //O = null del(O) - //Foreach goto(185) for(var/obj/machinery/pod/O in world) - //O = null del(O) - //Foreach goto(228) if("clear_bombs") for(var/obj/item/weapon/assembly/r_i_ptank/O in world) - //O = null del(O) - //Foreach goto(273) if("dissimulate_aspect") usr.invisibility = !( usr.invisibility ) usr.sight |= SEE_SELF @@ -5384,7 +5233,6 @@ usr << "\blue Don't be insane about this list Get the facts." for(var/l in bombers) usr << text("[] 'made' a bomb.", l) - //Foreach goto(476) if("check_antagonist") if (ticker) if (ticker.killer) @@ -5456,7 +5304,6 @@ var/master = "
"
 	for(var/t in typesof(/area))
 		master += text("[]\n", t)
-		//Foreach goto(26)
 	src << browse(master)
 	return
 */
@@ -5509,7 +5356,6 @@
 		if (t.loc == null)
 			//t = null
 			del(t)
-		//Foreach goto(66)
 	if(!src.client)
 		if(config.loggame) world.log << "GAME: [usr.key] AM failed due to disconnect."
 		return
@@ -5700,7 +5546,6 @@
 
 	for(var/atom/movable/A in src)
 		A.burn(fi_amount)
-		//Foreach goto(15)
 	return
 
 /mob/Topic(href, href_list)
@@ -5804,7 +5649,6 @@
 
 	for(var/i in src.overlays)
 		src.overlays -= i
-		//Foreach goto(17)
 	if (src.wear_mask)
 		if (istype(src.wear_mask, /obj/item/weapon/clothing/mask))
 			var/t1 = src.wear_mask.s_istate
@@ -5849,7 +5693,6 @@
 			O.loc = src.loc
 			O.layer = initial(O.layer)
 			src.u_equip(O)
-			//Foreach goto(109)
 	if (src.health < 0)
 		src.stat = 2
 	return
@@ -5929,7 +5772,6 @@
 		msg = stars(msg)
 	for(var/mob/M in hearers(null, null))
 		M.show_message(msg, 2)
-		//Foreach goto(58)
 	return
 
 /mob/monkey/New()
@@ -6011,14 +5853,12 @@
 
 	for(var/mob/M in viewers(src, null))
 		M.show_message(text("\red [] has been hit by []", src, O), 1)
-		//Foreach goto(19)
 	if (src.health > 0)
 		var/shielded = 0
 		for(var/obj/item/weapon/shield/S in src)
 			if (S.active)
 				shielded = 1
 			else
-				//Foreach continue //goto(79)
 		src.bruteloss += 30
 		if ((O.icon_state == "flaming" && !( shielded )))
 			src.fireloss += 40
@@ -6051,14 +5891,12 @@
 		if ((prob(75) && src.health > 0))
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red The monkey has bit []!", src), 1)
-				//Foreach goto(63)
 			var/damage = rand(1, 5)
 			src.bruteloss += damage
 			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
 		else
 			for(var/mob/O in viewers(src, null))
 				O.show_message(text("\red The monkey has attempted to bite []!", src), 1)
-				//Foreach goto(144)
 	return
 
 /mob/monkey/attack_paw(mob/M as mob)
@@ -6068,20 +5906,17 @@
 		src.resting = 0
 		for(var/mob/O in viewers(src, null))
 			O.show_message("\blue The monkey shakes the monkey trying to wake him up!", 1)
-			//Foreach goto(47)
 	else
 		if ((M.a_intent == "hurt" && !( istype(src.wear_mask, /obj/item/weapon/clothing/mask/muzzle) )))
 			if ((prob(75) && src.health > 0))
 				for(var/mob/O in viewers(src, null))
 					O.show_message("\red The monkey has bit the monkey!", 1)
-					//Foreach goto(130)
 				var/damage = rand(1, 5)
 				src.bruteloss += damage
 				src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
 			else
 				for(var/mob/O in viewers(src, null))
 					O.show_message("\red The monkey has attempted to bite the monkey!", 1)
-					//Foreach goto(209)
 	return
 
 /mob/monkey/attack_hand(mob/M as mob)
@@ -6134,7 +5969,6 @@
 		for(var/mob/O in viewers(src, null))
 			if ((O.hasClient() && !( O.blinded )))
 				O.show_message(text("\blue [] shakes the monkey trying to wake him up!", M), 1)
-			//Foreach goto(47)
 	else
 		if (intentToApply == "hurt")
 			if (istype(M, /mob/human))
@@ -6142,7 +5976,6 @@
 					for(var/mob/O in viewers(src, null))
 						if ((O.hasClient() && !( O.blinded )))
 							O.show_message(text("\red [] has punched the monkey!", M), 1)
-						//Foreach goto(135)
 					var/damage = rand(5, 10)
 					if (prob(40))
 						damage = rand(10, 15)
@@ -6152,7 +5985,6 @@
 								for(var/mob/O in viewers(src, null))
 									if ((O.hasClient() && !( O.blinded )))
 										O.show_message(text("\red [] has knocked out the monkey!", M), 1)
-									//Foreach goto(248)
 								return
 					//This gives a damage bonus when the AI is controlling the drone. For now, it doesn't check their weapon or target zone.
 					if (aiControllingBonus && (!corruptedIntent))
@@ -6163,7 +5995,6 @@
 					for(var/mob/O in viewers(src, null))
 						if ((O.hasClient() && !( O.blinded )))
 							O.show_message(text("\red [] has attempted to punch the monkey!", M), 1)
-						//Foreach goto(336)
 			else if (istype(M, /mob/drone))
 				var/damage = 0
 				if (corruptedIntent)
@@ -6192,7 +6023,6 @@
 				G.synch()
 				for(var/mob/O in viewers(src, null))
 					O.show_message(text("\red [] has grabbed the monkey passively!", M), 1)
-					//Foreach goto(502)
 			else
 				if (!( src.paralysis ))
 					if (prob(25) || corruptedIntent)
@@ -6200,13 +6030,11 @@
 						for(var/mob/O in viewers(src, null))
 							if ((O.hasClient() && !( O.blinded )))
 								O.show_message(text("\red [] has pushed down the monkey!", M), 1)
-							//Foreach goto(571)
 					else
 						drop_item()
 						for(var/mob/O in viewers(src, null))
 							if ((O.hasClient() && !( O.blinded )))
 								O.show_message(text("\red [] has disarmed the monkey!", M), 1)
-							//Foreach goto(638)
 
 				if (corruptedIntent)
 					if (M.a_intent == "help")
@@ -6231,7 +6059,6 @@
 	..()
 	for(var/i in src.overlays)
 		src.overlays -= i
-		//Foreach goto(21)
 	if (!( src.lying ))
 		src.icon_state = "monkey1"
 	else
@@ -6289,7 +6116,6 @@
 			spawn( 0 )
 				src.show_inv(M)
 				return
-		//Foreach goto(662)
 	return
 
 /mob/monkey/Login()
@@ -6427,7 +6253,6 @@
 			for(var/turf/T in A)
 				if(T.isempty() )
 					L += T
-				//Foreach goto(1473)
 
 			src.loc = pick(L)
 	//src << browse('help.htm', "window=help")
@@ -6452,7 +6277,6 @@
 		for(var/mob/M in range(src, 1))
 			if ((M.pulling == src && M.stat == 0 && !( M.restrained() )))
 				return 0
-			//Foreach goto(93)
 	if ((t7 && src.pulling && get_dist(src, src.pulling) <= 1))
 		if (src.pulling.anchored)
 			src.pulling = null
@@ -6501,7 +6325,6 @@
 	for(var/mob/M in world)
 		if ((M.cliented() && !( M.stat )))
 			cancel = 1
-		//Foreach goto(79)
 	if (!( cancel ))
 		world << "Everyone is dead! Resetting in 30 seconds!"
 		if ((ticker && ticker.timing))
@@ -6795,7 +6618,6 @@
 							if(8.0)
 								src.pixel_x = -8.0
 
-			//Foreach goto(2333)
 		src.weight = ((src.grabbed_by.len - a_grabs) / 2 + 1) * 1250000.0 + (a_grabs * 2500000.0)
 	else
 		if (src.lying)
@@ -7052,11 +6874,9 @@
 		if (m_type & 1)
 			for(var/mob/O in viewers(src, null))
 				O.show_message(message, m_type)
-				//Foreach goto(703)
 		else
 			for(var/mob/O in hearers(src, null))
 				O.show_message(message, m_type)
-				//Foreach goto(746)
 	return
 
 /mob/monkey/say(message as text)
@@ -7071,7 +6891,6 @@
 		for(var/mob/M in world)
 			if (M.stat == 2)
 				M << text("[] []: []", src, (src.stat > 1 ? "\[dead \]" : ""), message)
-			//Foreach goto(50)
 		return
 	if (src.stat >= 1)
 		return
@@ -7135,17 +6954,14 @@
 					M.show_message(text("[] chimpers.", src), 2)
 
 
-			//Foreach goto(503)
 		for(var/obj/O in view(obj_range, null))
 			spawn( 0 )
 				if (O)
 					O.hear_talk(usr, message)
 				return
-			//Foreach goto(580)
 	for(var/mob/M in world)
 		if (M.stat > 1)
 			M << text("[] []: []", src, (src.stat > 1 ? "\[dead \]" : ""), message)
-		//Foreach goto(637)
 	return
 
 /mob/monkey/examine()
@@ -7326,7 +7142,6 @@
 		for(var/obj/item/weapon/grab/G in thisMob.grabbed_by)
 			if (G.state == 1)
 				if (!( grabbing.Find(G.assailant) ))
-					//G = null
 					del(G)
 			else
 				if (G.state == 2)
@@ -7334,8 +7149,6 @@
 					if ((prob(25) && (!( is_monkey ) || prob(25))))
 						for(var/mob/O in viewers(thisMob, null))
 							O.show_message(text("\red [] has broken free of []'s grip!", thisMob, G.assailant), 1)
-							//Foreach goto(309)
-						//G = null
 						del(G)
 					else
 						return
@@ -7345,12 +7158,9 @@
 						if ((prob(5) && !( is_monkey ) || prob(25)))
 							for(var/mob/O in viewers(thisMob, null))
 								O.show_message(text("\red [] has broken free of []'s headlock!", thisMob, G.assailant), 1)
-								//Foreach goto(423)
-							//G = null
 							del(G)
 						else
 							return
-			//Foreach goto(189)
 	if (thisMob.canmove)
 
 		if(thisMob.m_intent == "face")
@@ -7404,7 +7214,6 @@
 					if (((M.pulling == thisMob && (!( M.restrained() ) && M.stat == 0)) || locate(/obj/item/weapon/grab, thisMob.grabbed_by.len)))
 						src << "\blue You're restrained! You can't move!"
 						return 0
-					//Foreach goto(853)
 			src.moving = 1
 			if (locate(/obj/item/weapon/grab, thisMob))
 				src.move_delay = max(src.move_delay, world.time + 7)
@@ -7428,7 +7237,6 @@
 							M.other_mobs = 1
 							if (thisMob != M)
 								M.animate_movement = 3
-							//Foreach goto(1163)
 						for(var/mob/M in L)
 							spawn( 0 )
 								step(M, direct)
@@ -7437,7 +7245,6 @@
 								M.other_mobs = null
 								M.animate_movement = 1
 								return
-							//Foreach goto(1214)
 			else
 				//This should be equivalent to . = ..() when thisMob is src.mob, but should make moving thisMob work when thisMob is not src.mob. -shadowlord13
 				walk(thisMob, 0)
@@ -7463,7 +7270,6 @@
 /client/New()
 
 	if (banned.Find(src.ckey))
-		//SN src = null
 		del(src)
 		return
 
@@ -7489,7 +7295,6 @@
 				if("Moderator")
 					src.holder.level = 0
 				if("Banned")
-					//SN src = null
 					del(src)
 					return
 				else
diff --git a/Code/power.dm b/Code/power.dm
index 22763b8..0d6ab7a 100644
--- a/Code/power.dm
+++ b/Code/power.dm
@@ -176,7 +176,6 @@ atom/proc/electrocute(mob/user, prb, netnum)
 
 		user.stunned = 120/prot
 		user.weakened = 20/prot
-		//Foreach goto(72)
 		for(var/mob/M in hearers(src, null))
 			if(M == user)
 				continue
diff --git a/Code/shuttle.dm b/Code/shuttle.dm
index 621f3ef..602fd99 100644
--- a/Code/shuttle.dm
+++ b/Code/shuttle.dm
@@ -27,7 +27,6 @@
 			NE_X = M.x
 		if (M.x < NW_X)
 			NW_X = M.y
-		//Foreach goto(75)
 	var/length = abs(NE_X - NW_X)
 	var/width = abs(NE_Y - SE_Y)
 	var/obj/random = pick(src.parts)
@@ -46,13 +45,11 @@
 						M.relocate(T)
 						M.ty =  -M.ty
 						M.tx += length
-						//Foreach goto(374)
 					for(var/obj/move/M in src.parts)
 						M.tx += tx
 						M.ty += ty
 						var/T = locate(M.tx, M.ty, t_z)
 						M.relocate(T, 90)
-						//Foreach goto(468)
 				if(-90.0)
 					var/tx = SE_X
 					var/ty = SE_Y
@@ -64,13 +61,11 @@
 						M.relocate(T)
 						M.ty =  -M.ty
 						M.ty += width
-						//Foreach goto(571)
 					for(var/obj/move/M in src.parts)
 						M.tx += tx
 						M.ty += ty
 						var/T = locate(M.tx, M.ty, t_z)
 						M.relocate(T, -90.0)
-						//Foreach goto(663)
 				else
 		else
 	return
@@ -144,7 +139,6 @@
 
 	switch(severity)
 		if(1.0)
-			//SN src = null
 			var/turf/space/S = src.ReplaceWithSpace()
 			S.buildlinks()
 
@@ -152,7 +146,6 @@
 			return
 		if(2.0)
 			if (prob(50))
-				//SN src = null
 				var/turf/space/S = src.ReplaceWithSpace()
 				S.buildlinks()
 
diff --git a/Code/ss13_algorithm2.dm b/Code/ss13_algorithm2.dm
index 4153417..a62d46d 100644
--- a/Code/ss13_algorithm2.dm
+++ b/Code/ss13_algorithm2.dm
@@ -7,7 +7,6 @@
 			new_occupations[occupation] = 1
 		else
 			new_occupations[occupation] += 1
-		//Foreach goto(23)
 	occupations = new_occupations
 	return
 
@@ -25,7 +24,6 @@
 		occupations2[occupation] = list(  )
 		occupations3[occupation] = list(  )
 		final_occupations[occupation] = list(  )
-		//Foreach goto(78)
 	occupations1["Captain"] = list(  )
 	occupations2["Captain"] = list(  )
 	occupations3["Captain"] = list(  )
@@ -49,12 +47,10 @@
 					occupations2[M.occupation2] += M
 					if (M.occupation3 != "No Preference")
 						occupations3[M.occupation3] += M
-		//Foreach goto(187)
 	for(var/occupation in occupations)
 		occupations1[occupation] = shuffle(occupations1[occupation])
 		occupations2[occupation] = shuffle(occupations2[occupation])
 		occupations3[occupation] = shuffle(occupations3[occupation])
-		//Foreach goto(339)
 	occupations1["Captain"] = shuffle(occupations1["Captain"])
 	occupations2["Captain"] = shuffle(occupations2["Captain"])
 	occupations3["Captain"] = shuffle(occupations3["Captain"])
@@ -86,7 +82,6 @@
 			if (M.client)
 				if (M.start)
 					contenders += M
-			//Foreach goto(691)
 		if (contenders.len>1)
 			var/mob/human/M = pick(contenders)
 			final_occupations["Captain"] += M
@@ -104,7 +99,6 @@
 		if (assistant_occupations.Find(M.occupation1))
 			M.Assign_Rank(M.occupation1)
 			unassigned_mobs -= M
-		//Foreach goto(844)
 	for(var/occupation in occupation_choices)
 		var/list/L = occupations1[occupation]
 		if (L.len)
@@ -128,12 +122,10 @@
 						occupation_choices -= occupation
 		if ((!( occupation_choices.len ) || !( unassigned_mobs.len )))
 		else
-			//Foreach continue //goto(913)
 	for(var/mob/human/M in unassigned_mobs)
 		if (assistant_occupations.Find(M.occupation2))
 			M.Assign_Rank(M.occupation2)
 			unassigned_mobs -= M
-		//Foreach goto(1158)
 	for(var/occupation in occupation_choices)
 		var/list/L = occupations2[occupation]
 		if (L.len)
@@ -160,12 +152,10 @@
 						occupation_choices -= occupation
 		if ((!( occupation_choices.len ) || !( unassigned_mobs.len )))
 		else
-			//Foreach continue //goto(1227)
 	for(var/mob/human/M in unassigned_mobs)
 		if (assistant_occupations.Find(M.occupation3))
 			M.Assign_Rank(M.occupation3)
 			unassigned_mobs -= M
-		//Foreach goto(1502)
 	for(var/occupation in occupation_choices)
 		var/list/L = occupations3[occupation]
 		if (L.len)
@@ -190,7 +180,6 @@
 					unassigned_mobs -= M
 					if (eligible < 1)
 						occupation_choices -= occupation
-		//Foreach goto(1571)
 	if (unassigned_mobs.len)
 		unassigned_mobs = shuffle(unassigned_mobs)
 	for(var/mob/human/M in unassigned_mobs)
@@ -200,7 +189,6 @@
 			occupation_choices -= occupation
 			unassigned_mobs -= M
 			break ////
-		//Foreach goto(1846)
 	for(var/occupation in final_occupations)
 		var/mob/human/M = final_occupations[occupation]
 		if (ismob(M))
@@ -209,11 +197,8 @@
 			if (istype(M, /list))
 				for(var/mob/human/E in final_occupations[occupation])
 					E.Assign_Rank(occupation)
-					//Foreach goto(2003)
-		//Foreach goto(1931)
 	for(var/mob/human/M in unassigned_mobs)
 		M.Assign_Rank(pick("Research Assistant", "Technical Assistant", "Medical Assistant", "Staff Assistant"))
-		//Foreach goto(2051)
 	for (var/mob/ai/aiPlayer in world)
 		spawn(0)
 			var/newname = input(aiPlayer, "You are the AI. Would you like to change your name to something else?", "Name change", aiPlayer.rname)
@@ -329,7 +314,6 @@
 	for(var/job in uniquelist(occupations + assistant_occupations) )
 		if (job!="AI" || config.allowai)
 			HTML += text("[]
", src, occ, job, job) - //Foreach goto(105) HTML += text("Captain
", src, occ) HTML += "
" HTML += text("\[No Preference\]
", src, occ) diff --git a/Code/vote.dm b/Code/vote.dm index cde0cf2..a55e87c 100644 --- a/Code/vote.dm +++ b/Code/vote.dm @@ -333,4 +333,4 @@ //world << "Setting client [M.key]'s vote to: [href_list["vote"]]." M.vote() - return \ No newline at end of file + return diff --git a/Code/weap_sat.dm b/Code/weap_sat.dm index 7dee730..f02c528 100644 --- a/Code/weap_sat.dm +++ b/Code/weap_sat.dm @@ -9,20 +9,17 @@ switch(severity) if(1.0) - //SN src = null del(src) return if(2.0) if (prob(50)) for(var/x in src.verbs) src.verbs -= x - //Foreach goto(58) src.icon_state = "broken" if(3.0) if (prob(25)) for(var/x in src.verbs) src.verbs -= x - //Foreach goto(109) src.icon_state = "broken" else return @@ -48,7 +45,6 @@ var/t1 = text("-[],[],[]", T.x, T.y, T.z) t1 = text("[][]", R.text, t1) L[t1] = R - //Foreach goto(26) var/t1 = input("Please select a location to lock in.", "Locking Computer", null, null) in L var/R = L[t1] if ((prob(30) || istype(R, /obj/item/weapon/radio/beacon) && prob(50))) @@ -61,7 +57,6 @@ src.locked = null for(var/mob/O in hearers(src, null)) O.show_message("\blue Locked In", 2) - //Foreach goto(270) src.add_fingerprint(usr) return @@ -118,7 +113,6 @@ if (!( com.locked )) for(var/mob/O in hearers(src, null)) O.show_message("\red Failure: Cannot authenticate locked on coordinates. Please reinstantiat coordinate matrix.", 1, "\red Error!", 2) - //Foreach goto(80) return var/obj/effects/sparks/O = new /obj/effects/sparks( target ) O.dir = pick(1, 2, 4, 8) @@ -138,7 +132,6 @@ else for(var/mob/B in hearers(src, null)) B.show_message("\blue Test fire completed.", 2) - //Foreach goto(316) return /obj/machinery/teleport/station/verb/engage() @@ -156,7 +149,6 @@ use_power(5000) for(var/mob/O in hearers(src, null)) O.show_message("\blue Teleporter engaged!", 2) - //Foreach goto(70) src.add_fingerprint(usr) return @@ -174,7 +166,6 @@ com.icon_state = "tele0" for(var/mob/O in hearers(src, null)) O.show_message("\blue Teleporter disengaged!", 2) - //Foreach goto(70) src.add_fingerprint(usr) return @@ -193,7 +184,6 @@ active = 1 for(var/mob/O in hearers(src, null)) O.show_message("\blue Test firing!", 2) - //Foreach goto(60) com.teleport() use_power(5000) @@ -225,7 +215,6 @@ src.amount-- if (src.amount <= 0) sleep(50) - //SN src = null del(src) return var/turf/T = get_step(src, turn(src.dir, pick(90, 0, 0, -90.0))) @@ -253,7 +242,6 @@ src.amount-- if (src.amount <= 0) sleep(50) - //SN src = null del(src) return var/turf/T = get_step(src, turn(src.dir, pick(90, 0, 0, -90.0))) diff --git a/Code/weapons.dm b/Code/weapons.dm index 6e1c2bb..15538f3 100644 --- a/Code/weapons.dm +++ b/Code/weapons.dm @@ -13,7 +13,6 @@ if (src.passive) for(var/obj/beam/i_beam/I in range(2, src.loc)) I.left = 2 - //Foreach goto(30) spawn( 10 ) src.process() return @@ -23,21 +22,18 @@ for(var/obj/beam/i_beam/I in range(src.loc)) I.left = 10 - //Foreach goto(22) for(var/obj/item/weapon/infra/I in range(src.loc)) I.visible = 1 spawn( 0 ) if ((I && I.first)) I.first.vis_spread(1) return - //Foreach goto(69) for(var/obj/item/weapon/assembly/rad_infra/I in range(src.loc)) I.part2.visible = 1 spawn( 0 ) if ((I.part2 && I.part2.first)) I.part2.first.vis_spread(1) return - //Foreach goto(145) return /obj/item/weapon/infra_sensor/attack_self(mob/user as mob) @@ -92,7 +88,6 @@ else for(var/mob/O in hearers(null, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(58) return /obj/item/weapon/prox_sensor/HasProximity(atom/movable/AM as mob|obj) @@ -209,7 +204,6 @@ else for(var/mob/O in hearers(null, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(51) return /obj/item/weapon/infra/proc/process() @@ -368,7 +362,6 @@ else for(var/mob/O in hearers(null, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(51) return //*****RM @@ -545,7 +538,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -592,7 +584,6 @@ for(var/mob/O in hearers(1, src.loc)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(20) src.part2.ignite() return @@ -651,7 +642,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -712,7 +702,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -783,7 +772,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -880,7 +868,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -904,7 +891,6 @@ for(var/mob/O in hearers(1, src.loc)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(20) src.part2.ignite() return @@ -929,7 +915,6 @@ src.part2.master = null src.part1 = null src.part2 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -954,7 +939,6 @@ for(var/mob/O in hearers(1, src.loc)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(20) src.part2.ignite() return @@ -1067,7 +1051,6 @@ src.part1 = null src.part2 = null src.part3 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/weldingtool) )) @@ -1094,7 +1077,6 @@ //world << "miptank [src] got signal" for(var/mob/O in hearers(1, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(19) if ((src.status && prob(90))) //world << "sent ignite() to [src.part3]" @@ -1152,7 +1134,6 @@ src.part1 = null src.part2 = null src.part3 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/weldingtool) )) @@ -1181,7 +1162,6 @@ //world << "tiptank [src] got signal" for(var/mob/O in hearers(1, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(19) if ((src.status && prob(90))) //world << "sent ignite() to [src.part3]" src.part3.ignite() @@ -1251,7 +1231,6 @@ src.part1 = null src.part2 = null src.part3 = null - //SN src = null del(src) return if (!( istype(W, /obj/item/weapon/weldingtool) )) @@ -1280,7 +1259,6 @@ //world << "riptank [src] got signal" for(var/mob/O in hearers(1, null)) O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) - //Foreach goto(19) if ((src.status && prob(90))) //world << "sent ignite() to [src.part3]" src.part3.ignite() @@ -1294,7 +1272,6 @@ spawn( 0 ) if (A) A.las_act("bullet", src) - //SN src = null del(src) return return @@ -1313,7 +1290,6 @@ if ((!( src.current ) || src.loc == src.current)) src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z) if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy)) - //SN src = null del(src) return step_towards(src, src.current) @@ -1327,7 +1303,6 @@ spawn( 0 ) if (A) A.las_act(null, src) - //SN src = null del(src) return return @@ -1338,13 +1313,11 @@ if ((!( src.current ) || src.loc == src.current)) src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z) if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy)) - //SN src = null del(src) return step_towards(src, src.current) src.life-- if (src.life <= 0) - //SN src = null del(src) return spawn( 1 ) @@ -1357,7 +1330,6 @@ spawn( 0 ) if(A) A.las_act(1) - //SN src = null del(src) return return @@ -1369,7 +1341,6 @@ if (src.master) //world << "beam hit \ref[src]: calling master \ref[master].hit" src.master.hit() - //SN src = null del(src) return return @@ -1389,7 +1360,6 @@ //world << "i_beam \ref[src] : process" if ((src.loc.density || !( src.master ))) - //SN src = null // world << "beam hit loc [loc] or no master [master], deleting" del(src) return @@ -1444,7 +1414,6 @@ /obj/beam/i_beam/Bump() - //SN src = null del(src) return @@ -1493,5 +1462,4 @@ if (I) I.hit() return - //Foreach goto(44) return