cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Another batch of runtime errors fixed.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1537 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
panurgomatic
2011-05-06 00:32:55 +00:00
parent 66be17746b
commit 2a1023b594
10 changed files with 121 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/ai/life.dm
+24
View File
@@ -135,11 +135,17 @@
src << "Connection verified. Searching for APC in power network."
sleep(50)
var/obj/machinery/power/apc/theAPC = null
/*
for (var/something in loc)
if (istype(something, /obj/machinery/power/apc))
if (!(something:stat & BROKEN))
theAPC = something
break
*/
for (var/obj/machinery/power/apc/APC in loc)
if (!(APC.stat & BROKEN))
theAPC = APC
break
if (theAPC==null)
src << "Unable to locate APC!"
src:aiRestorePowerRoutine = 2
@@ -152,11 +158,17 @@
src << "APC located. Optimizing route to APC to avoid needless power waste."
sleep(50)
theAPC = null
/*
for (var/something in loc)
if (istype(something, /obj/machinery/power/apc))
if (!(something:stat & BROKEN))
theAPC = something
break
*/
for (var/obj/machinery/power/apc/APC in loc)
if (!(APC.stat & BROKEN))
theAPC = APC
break
if (theAPC==null)
src << "APC connection lost!"
src:aiRestorePowerRoutine = 2
@@ -169,11 +181,17 @@
src << "Best route identified. Hacking offline APC power port."
sleep(50)
theAPC = null
/*
for (var/something in loc)
if (istype(something, /obj/machinery/power/apc))
if (!(something:stat & BROKEN))
theAPC = something
break
*/
for (var/obj/machinery/power/apc/APC in loc)
if (!(APC.stat & BROKEN))
theAPC = APC
break
if (theAPC==null)
src << "APC connection lost!"
src:aiRestorePowerRoutine = 2
@@ -186,11 +204,17 @@
src << "Power port upload access confirmed. Loading control program into APC power port software."
sleep(50)
theAPC = null
/*
for (var/something in loc)
if (istype(something, /obj/machinery/power/apc))
if (!(something:stat & BROKEN))
theAPC = something
break
*/
for (var/obj/machinery/power/apc/APC in loc)
if (!(APC.stat & BROKEN))
theAPC = APC
break
if (theAPC==null)
src << "APC connection lost!"
src:aiRestorePowerRoutine = 2
code/modules/mob/mob.dm
+2 -3
View File
@@ -1508,12 +1508,11 @@
if(src.muted)
src << "You are muted have a nice day"
return
if (!( ismob(M) ))
if (!ismob(M))
return
var/t = input("Message:", text("Private message to [M.key]")) as text|null
if (!( t ))
if (!t || !usr || !M)
return
if (!usr) return
if (usr.client && usr.client.holder)
M << "\red Admin PM from-<b>[key_name(usr, M, 0)]</b>: [t]"
usr << "\blue Admin PM to-<b>[key_name(M, usr, 1)]</b>: [t]"
code/modules/mob/transform_procs.dm
+7 -6
View File
@@ -169,12 +169,13 @@
src.invisibility = 101
for(var/t in src.organs)
del(src.organs[text("[t]")])
//src.client.screen -= main_hud1.contents
src.client.screen -= src.hud_used.contents
src.client.screen -= src.hud_used.adding
src.client.screen -= src.hud_used.mon_blo
src.client.screen -= list( src.oxygen, src.throw_icon, src.i_select, src.m_select, src.toxin, src.internals, src.fire, src.hands, src.healths, src.pullin, src.blind, src.flash, src.rest, src.sleep, src.mach )
src.client.screen -= list( src.zone_sel, src.oxygen, src.throw_icon, src.i_select, src.m_select, src.toxin, src.internals, src.fire, src.hands, src.healths, src.pullin, src.blind, src.flash, src.rest, src.sleep, src.mach )
if(src.client)
//src.client.screen -= main_hud1.contents
src.client.screen -= src.hud_used.contents
src.client.screen -= src.hud_used.adding
src.client.screen -= src.hud_used.mon_blo
src.client.screen -= list( src.oxygen, src.throw_icon, src.i_select, src.m_select, src.toxin, src.internals, src.fire, src.hands, src.healths, src.pullin, src.blind, src.flash, src.rest, src.sleep, src.mach )
src.client.screen -= list( src.zone_sel, src.oxygen, src.throw_icon, src.i_select, src.m_select, src.toxin, src.internals, src.fire, src.hands, src.healths, src.pullin, src.blind, src.flash, src.rest, src.sleep, src.mach )
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( src.loc )
// cyborgs produced by Robotize get an automatic power cell