Applied Stephen001's cleanup-reverse-engineer.patch

This commit is contained in:
Zjm7891
2008-07-11 14:20:33 +00:00
parent 662b884650
commit 3161a4f8ec
34 changed files with 8 additions and 705 deletions
+1 -1
View File
@@ -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
max_valve = 1e6 // the maximum setting of both valves
+1 -1
View File
@@ -156,4 +156,4 @@ obj/machinery/hologram_proj
/obj/projection
name = "Projection"
anchored = 1.0
anchored = 1.0
+1 -1
View File
@@ -341,4 +341,4 @@
usr.client_mob() << browse(null, "window=smes")
usr.machine = null
return
return
+1 -2
View File
@@ -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
src.density = 0
-1
View File
@@ -275,7 +275,6 @@ obj/machinery/power/solar_control
switch(severity)
if(1.0)
//SN src = null
del(src)
return
if(2.0)
+1 -1
View File
@@ -42,4 +42,4 @@ obj/machinery/power/terminal
icon_state = "term-f"
else
invisibility = 0
icon_state = "term"
icon_state = "term"
+1 -1
View File
@@ -245,4 +245,4 @@ obj/machinery/power/turbine
usr.client_mob() << browse(null, "window=turbine")
usr.machine = null
return
return
-2
View File
@@ -119,7 +119,6 @@ obj/machinery/freezer
for(var/obj/item/weapon/flasks/F in src)
d1 += text("<A href = '?src=\ref[];flask=[]'><B>Flask []</B></A>: [] / [] / []<BR>", src, counter, counter, F.oxygen, F.plasma, F.coolant)
counter++
//Foreach goto(78)
d1 += "Key: Oxygen / Plasma / Coolant<BR>"
else
d1 = "<B>No flasks!</B>"
@@ -148,7 +147,6 @@ obj/machinery/freezer
for(var/obj/item/weapon/flasks/F in src)
d1 += text("<A href = '?src=\ref[];flask=[]'><B>[] []</B></A>: []<BR>", src, counter, stars("Flask"), counter, stars(text("[] / [] / []", F.oxygen, F.plasma, F.coolant)))
counter++
//Foreach goto(380)
d1 += "Key: Oxygen / Plasma / Coolant<BR>"
else
d1 = "<B>No flasks!</B>"
-1
View File
@@ -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 <B> [] unloads [] from []!</B>", usr, A, src)
//Foreach goto(54)
if (ismob(A))
var/mob/M = A
if (M.client)
-2
View File
@@ -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 <B> [] loads [] into []!</B>", 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 <B> [] unloads [] from []!</B>", usr, A, src)
//Foreach goto(53)
if (ismob(A))
var/mob/M = A
if (M.client)
+1 -1
View File
@@ -38,4 +38,4 @@ obj/machinery/shuttle
router
name = "router"
icon_state = "router"
icon_state = "router"
-4
View File
@@ -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()
-2
View File
@@ -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
-1
View File
@@ -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 )
-11
View File
@@ -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
-2
View File
@@ -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
-2
View File
@@ -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 <B>The blob has been attacked with [][] </B>", 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 << "<FONT size = 3><B>Cent. Com. Update</B>: Biohazard Alert.</FONT>"
world << "\red Summary downloaded and printed out at all communications consoles."
for(var/mob/ai/aiPlayer in world)
-31
View File
@@ -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
-104
View File
@@ -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 += "<B>Members:</B>\n"
for(var/mob/M in src.members)
dat += text("\t[] ([])\n", M.rname, M.key)
//Foreach goto(79)
dat += text("Base: \t<A href='?src=\ref[];base=1'>[]</A>\nColor: \t<A href='?src=\ref[];color=1'>[]</A>\n\n<A href='?src=\ref[];nothing=1'>Refresh</A>", src, src.base, src, src.color, src)
dat += "</PRE>"
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 << "<B>All players have been pushed back!</B>"
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 << "<B>We are done picking! (All teams are full!)</B>"
src.picker = 0
@@ -219,7 +209,6 @@
dat += text("<B>Players (per Team): []</B><BR>\n<B>\"Please Pick a Player</B><BR>", src.play_team)
for(var/mob/human/H in src.players_left)
dat += text("<A href='?src=\ref[];pick=\ref[]'>[] ([])</A><BR>", 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 << "<H3><B>The game has been won!!!</B></H3>"
world << text("<B>Team: [] Team led by [] in []</B>", 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<A href='?src=\ref[];team=\ref[]'>[] Team</A>\n", src, O, O.color)
else
dat += text("\t<A href='?src=\ref[];team=\ref[]'>No Captain</A>\n", src, O)
//Foreach goto(43)
dat += text("<A href='?src=\ref[];add_team=1'>\[Add Team\]</A>\n<A href='?src=\ref[];select_team=1'>Captains Select Members</A>\n\n<A href='?src=\ref[];start=1'>Start the Game (and Set up Map)</A>\n\n<B>Win Options: []</B>\n<A href='?src=\ref[];win=collect'>Collection</A> - All flags same color on clipboard\n<A href='?src=\ref[];win=convert'>Conversion</A> - All flags same color\n<A href='?src=\ref[];win=none'>None</A>\n\n<B>Other Options:</B>\nAuto-Dress (Teams): <A href='?src=\ref[];autodress=1'>[]</A>\nRemove Engine Ejection: <A href='?src=\ref[];ejectengine=1'>[]</A>\nPaint Cans: <A href='?src=\ref[];paint_cans=1'>[]</A>\nImmobile flags (Territory): <A href='?src=\ref[];immobile=1'>[]</A>\nAdd Neutral Flags to Unused Bases: <A href='?src=\ref[];neutral_replace=1'>[]</A>\n\n<A href='?src=\ref[];nothing=1'>Refresh</A>", 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 += "</PRE>"
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 << "<B>STARTING!!!</B>"
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 = "<B>Boot Player:</B><HR>"
for(var/mob/M in world)
dat += text("<A href='?src=\ref[];boot2=\ref[]'>N:[] R:[] (K:[]) (IP:[])</A><BR>", 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 = "<B>Ban Player:</B><HR>"
for(var/mob/M in world)
dat += text("<A href='?src=\ref[];ban2=\ref[]'>N: [] R: [] (K: []) (IP: [])</A><BR>", src, M, M.name, M.rname, (M.client ? M.client : M.lastKnownCKey? "Formerly [M.lastKnownCKey]" : "No Client"), M.lastKnownIP)
//Foreach goto(362)
dat += "<HR><B>Unban Player:</B><HR>"
for(var/t in banned)
dat += text("<A href='?src=\ref[];unban2=[]'>K: []</A><BR>", 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 = "<B>Mute/Unmute Player:</B><HR>"
for(var/mob/M in world)
dat += text("<A href='?src=\ref[];mute2=\ref[]'>N:[] R:[] (K:[]) (IP: []) \[[]\]</A><BR>", 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 = "<HR><B>Banned Keys:</B><HR>"
for(var/t in banned)
dat += text("[]<BR>", ckey(t))
//Foreach goto(1424)
if ((src.rank in list( "Moderator", "Supervisor", "Administrator", "Major Administrator", "Primary Administrator" )))
dat += text("<HR><A href='?src=\ref[];boot=1'>Goto Ban Control Screen</A>", src)
usr << browse(dat, "window=ban_k")
@@ -699,13 +665,11 @@
for(var/mob/M in world)
if(M.cliented())
dat += text("[]<BR>", M.client.ckey)
//Foreach goto(1525)
usr << browse(dat, "window=keys")
if (href_list["l_players"])
var/dat = "<B>Name/Real Name/Key/IP:</B><HR>"
for(var/mob/M in world)
dat += text("N: [] R: [] (K: []) (IP: [])<BR>", 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 = "<B>Who are you sending a message to?</B><HR>"
for(var/mob/M in world)
dat += "<A href='?src=\ref[usr];priv_msg=\ref[M]'>N:[M.name] R:[M.rname] (K:[(M.client ? M.client : "Formerly [M.lastKnownCKey]")])</A><BR>"
//Foreach goto(1737)
usr << browse(dat, "window=p_send")
/*
@@ -755,7 +718,6 @@
var/dat = "<B>Registered DNA sequences:</B><HR>"
for(var/M in reg_dna)
dat += text("\t [] = []<BR>", 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 = "<B>Don't be insane about this list</B> Get the facts. They also could have disarmed one.<HR>"
for(var/l in bombers)
dat += text("[] 'made' a bomb.<BR>", 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("<B>Secret Base Nuke Code</B>: []<BR>", 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("<B>[]</B> points to []", usr, src), 1)
//Foreach goto(102)
return
/turf/proc/updatecell()
@@ -1531,7 +1472,6 @@
world << text("<B>[] was []</B>", 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 << "<FONT size = 3><B>The monkies have won!</B></FONT>"
for(var/mob/monkey/M in world)
if (M.cliented())
world << text("<B>[] was a monkey.</B>", M.key)
//Foreach goto(1194)
else
world << "<FONT size = 3><B>The Research Staff has stopped he monkey invasion!</B></FONT>"
for(var/mob/human/M in world)
if (M.cliented())
world << text("<B>[] was [].</B>", 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 << "<FONT size = 3><B>The Research Staff has stopped the Syndicate Operatives!</B></FONT>"
for(var/mob/human/H in world)
@@ -1799,7 +1724,6 @@
world << text("<B>[] was []</B>", H.key, H.rname)
else
world << text("[] was [] (Dead)", H.key, H.rname)
//Foreach goto(1414)
else
world << "<FONT size = 3><B>Neutral Victory</B></FONT>"
world << "<B>The Syndicate recovered the abandoned auth. disk but detonation of SS13 was averted.</B> 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("<B>[]</B> was left infected. \red (Has Stage [] Infection)", M.rname, round(M.virus))
else
alive += text("<B>[]</B> was left to be infected on Space Station 13.", M.rname)
//Foreach goto(1653)
if (humanwin)
world << "<FONT size = 3><B>The Research Staff have won!</B></FONT>"
else
world << "<FONT size = 3><B>The Virus has won!</B></FONT>"
for(var/I in escapees)
world << text("<FONT size = 2>[]</FONT>", I)
//Foreach goto(1851)
for(var/I in alive)
world << text("<FONT size = 2>[]</FONT>", I)
//Foreach goto(1883)
for(var/I in dead)
world << text("<FONT size = 1>[]</FONT>", 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 <B>The following survived the meteor attack!</B>"
for(var/I in L)
@@ -1875,7 +1793,6 @@
if("alive")
world << text("\t <FONT size = 1>[] at least is alive.</FONT>", I)
else
//Foreach goto(2092)
else
world << "\blue <B>No one survived the meteor attack!</B>"
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 <B>The game has ended!</B>"
for(var/I in L)
@@ -2004,7 +1920,6 @@
if("alive")
world << text("\t <FONT size = 1>[] decided to stay on the station.</FONT>", I)
else
//Foreach goto(2337)
else
world << "\blue <B>No one lived!</B>"
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 <B>Perceived target: [] - Position: [] ([]% certainty)</B><BR>", 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 << "<FONT size = 3><B>Cent. Com. Update</B> Enemy communication intercept. Security Level Elevated</FONT>"
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 <B>Perceived target: [] - Position: [] ([]% certainty)</B><BR>", 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 << "<FONT size = 2><B>Cent. Com. Update</B> Enemy communication intercept. Security Level Elevated</FONT>"
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)
-11
View File
@@ -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)
-1
View File
@@ -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"
-3
View File
@@ -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
-91
View File
@@ -117,7 +117,6 @@
for(var/mob/O in viewers(M, null))
if (O.hasClient() && (!( O.blinded )))
O.client_mob() << text("\red <B>[] has been knocked unconscious!</B>", M)
//Foreach goto(169)
M.client_mob() << text("\red <B>This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)</B>", 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
-16
View File
@@ -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
-7
View File
@@ -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 <B>Engine Ejected!</B>"
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()
-6
View File
@@ -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
-135
View File
@@ -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 <B>[] has been attacked with [][] </B>", 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 <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
//Foreach goto(514)
H.show_message(text("\red <B>This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)</B>", 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 <B>[] has been knocked down!</B>", 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 <B>[] has been stunned!</B>", 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 <B>[] has been knocked down!</B>", 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 <B>[] has been stunned!</B>", 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("[]-[]-[]<BR>", W.code, dir2text(get_dir(sr, tr)), direct)
//Foreach goto(114)
src.temp += "<B>Extranneous Signals:</B><BR>"
for(var/obj/item/weapon/implant/tracking/W in world)
//Label_332:
@@ -1000,7 +969,6 @@
else
direct = "weak"
src.temp += text("[]-[]-[]<BR>", W.id, dir2text(get_dir(sr, tr)), direct)
//Foreach goto(332)
src.temp += text("<B>You are at \[[],[],[]\]</B> in orbital coordinates.<BR><BR><A href='?src=\ref[];refresh=1'>Refresh</A><BR>", sr.x, sr.y, sr.z, src)
else
src.temp += "<B><FONT color='red'>Processing Error:</FONT></B> Unable to locate orbital position.<BR>"
@@ -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 <B>[] fires a revolver at []!</B>", 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 <B>[] has been knocked unconscious!</B>", M), 1, "\red You hear someone fall", 2)
//Foreach goto(181)
M.show_message(text("\red <B>This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)</B>", time * 100 / 120))
return
@@ -1461,7 +1422,6 @@
M.stat = 1
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] has been knocked unconscious!</B>", 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 <B>[] has been stunned with the taser gun by []!</B>", 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 += "<BR>"
//Foreach goto(186)
t1 += "</TT></HTML>"
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("<A href='?src=\ref[];pen=1'>Remove Pen</A><BR><HR>", src)
for(var/obj/item/weapon/paper/P in src)
dat += text("<A href='?src=\ref[];read=\ref[]'>[]</A> <A href='?src=\ref[];write=\ref[]'>Write</A> <A href='?src=\ref[];remove=\ref[]'>Remove</A><BR>", 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 = "<B>Clipboard</B><BR>"
for(var/obj/item/weapon/f_card/P in src)
dat += text("<A href='?src=\ref[];read=\ref[]'>[]</A> <A href='?src=\ref[];remove=\ref[]'>Remove</A><BR>", 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("[]<BR>", i)
//Foreach goto(41)
return dat
else
return "<B>There are no fingerprints on this card.</B>"
@@ -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 <B>[] has been knocked unconscious!</B>", M), 1, "\red You hear someone fall.", 2)
//Foreach goto(169)
M.show_message(text("\red <B>This was a []% hit. Roleplay it! (personality/memory change if the hit was severe enough)</B>", 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[] <I>Crackle,Crackle</I>", 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("<B>[]-\icon[]\[[]\]-broadcasts</B>: <I>[]</I>", M.rname, src, src.freq, msg), 2)
else
O.show_message(text("<B>[]-\icon[]\[[]\]-broadcasts</B>: <I>[]</I>", 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("<B>[]-\icon[]\[[]\]-broadcasts (over PA)</B>: <I>[]</I>", M.rname, src, src.freq, msg), 2)
else
O.show_message(text("<B>[]-\icon[]\[[]\]-broadcasts (over PA)</B>: <I>[]</I>", 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("<B>The monkey-\icon[]\[[]\]-broadcasts</B>: <I>[]</I>", src, src.freq, msg), 2)
else
O.show_message(text("<B>The monkey-\icon[]\[[]\]-broadcasts</B>: 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("<B>The monkey-\icon[]\[[]\]-broadcasts (over PA)</B>: <I>[]</I>", src, src.freq, msg), 2)
else
O.show_message(text("<B>The monkey-\icon[]\[[]\]-broadcasts (over PA)</B>: 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(" <B>[]</B> - []<BR>", 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 <B>[] has been hit by [] with []</B>", src, user, W)
//Foreach goto(102)
return
/atom/proc/add_fingerprint(mob/human/M)
-195
View File
File diff suppressed because it is too large Load Diff
-1
View File
@@ -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
-7
View File
@@ -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()
-16
View File
@@ -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("<a href=\"byond://?src=\ref[];occ=[];job=[]\">[]</a><br>", src, occ, job, job)
//Foreach goto(105)
HTML += text("<a href=\"byond://?src=\ref[];occ=[];job=Captain\">Captain</a><br>", src, occ)
HTML += "<br>"
HTML += text("<a href=\"byond://?src=\ref[];occ=[];job=No Preference\">\[No Preference\]</a><br>", src, occ)
+1 -1
View File
@@ -333,4 +333,4 @@
//world << "Setting client [M.key]'s vote to: [href_list["vote"]]."
M.vote()
return
return
-12
View File
@@ -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)))
-32
View File
@@ -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