-Fixed 592 - The recharger was checking if the gamemode was monkey. I just removed it, I doubt this will have an effect on anything.

-Fixed 661 - There was a typo which would show toxin damage twice instead of showing oxygen damage. I also made it clearer which damage was which with colour.
-Fixed 565 - I wish there was a proper way to fix this but it's better than having no door for 5 seconds. It'll now wait 2 ticks before performing the closing animation for the door.
-Fixed 722 - I think this is causing the problem, it's using name instead of real_name. I couldn't find any problems when testing this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4309 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-08-03 21:21:28 +00:00
parent a4bb788a23
commit e0905a1909
4 changed files with 19 additions and 12 deletions

View File

@@ -516,7 +516,7 @@
O.loc = C
C.occupant = O
connected = null
O.name = text("monkey ([])",copytext(md5(M.real_name), 2, 6))
O.real_name = text("monkey ([])",copytext(md5(M.real_name), 2, 6))
O.take_overall_damage(M.getBruteLoss() + 40, M.getFireLoss())
O.adjustToxLoss(M.getToxLoss() + 20)
O.adjustOxyLoss(M.getOxyLoss())

View File

@@ -60,31 +60,38 @@
user.machine = src
src.scan()
var/t = "<TT><B>Crew Monitoring</B><HR>"
t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A>"
t += "<BR><A href='?src=\ref[src];close=1'>Close</A>"
t += "<table><tr><td>Name</td><td>Vitals</td><td>Position</td></tr>"
t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> "
t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>"
var/list/logs = list()
for(var/obj/item/clothing/under/C in src.tracked)
var/log = ""
if((C) && (C.has_sensor) && (C.loc) && (C.loc.z == 1) && C.sensor_mode)
if(istype(C.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C.loc
var/dam1 = round(H.getOxyLoss(),1)
var/dam2 = round(H.getToxLoss(),1)
var/dam3 = round(H.getFireLoss(),1)
var/dam4 = round(H.getBruteLoss(),1)
var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
if(H.wear_id)
log += "<tr><td>[H.wear_id.name]</td>"
log += "<tr><td width='40%'>[H.wear_id.name]</td>"
else
log += "<tr><td>Unknown:</td>"
log += "<tr><td width='40%'>Unknown:</td>"
switch(C.sensor_mode)
if(1)
log+= "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]</td><td>Not Available</td></tr>"
log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>"
if(2)
log += "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam1] - [dam2] - [dam3] - [dam4]</td><td>Not Available</td></tr>"
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
if(3)
log+= "<td>[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"], [dam2] - [dam2] - [dam3] - [dam4]</td><td>[get_area(H)] ([H.x], [H.y])</td></tr>"
var/area/player_area = get_area(H)
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([H.x], [H.y])</td></tr>"
logs += log
logs = sortList(logs)
for(var/log in logs)

View File

@@ -634,7 +634,8 @@ About the new airlock wires panel:
if("opening")
if(overlays) overlays = null
if(p_open)
icon_state = "o_door_opening" //can not use flick due to BYOND bug updating overlays right before flicking
spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond.
flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking
else
flick("door_opening", src)
if("closing")

View File

@@ -53,8 +53,7 @@ obj/machinery/recharger/attack_hand(mob/user as mob)
update_icon()
obj/machinery/recharger/attack_paw(mob/user as mob)
if((ticker && ticker.mode.name == "monkey"))
return attack_hand(user)
return attack_hand(user)
obj/machinery/recharger/process()
if(stat & (NOPOWER|BROKEN) || !anchored)