From b97447781a55e44a87deda573afbc028a00b89bc Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Tue, 13 Mar 2012 05:12:21 +0000 Subject: [PATCH] PDA messages now require an active messaging server. The admin rejuvenate command now stabilizes body temperature as well. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3282 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/devices/PDA/PDA.dm | 20 ++++++++++++-- code/modules/admin/verbs/randomverbs.dm | 1 + .../mob/living/silicon/pai/software.dm | 20 +++++++++++--- code/modules/research/message_server.dm | 26 +++++++++++++++++- html/changelog.html | 9 ++++++ icons/obj/stationobjs.dmi | Bin 91389 -> 91769 bytes 6 files changed, 68 insertions(+), 8 deletions(-) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 749a5783cc8..bfbb7e84425 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -499,8 +499,15 @@ last_text = world.time + + var/AnsweringMS = 0 for (var/obj/machinery/message_server/MS in world) MS.send_pda_message("[P.owner]","[owner]","[t]") + if(MS.active) + AnsweringMS++ + + if(!AnsweringMS) + return tnote += "→ To [P.owner]:
[t]
" P.tnote += "← From [owner]:
[t]
" @@ -523,13 +530,20 @@ // pAI Message else + var/AnsweringMS = 0 + for (var/obj/machinery/message_server/MS in world) + MS.send_pda_message("[P]","[src]","[t]") + if(MS.active) + AnsweringMS++ + + if(!AnsweringMS) + return + + tnote += "→ To [P]:
[t]
" P.tnote += "← From [src]:
[t]
" - for (var/obj/machinery/message_server/MS in world) - MS.send_pda_message("[P]","[src]","[t]") - if (prob(15)) //Give the AI a chance of intercepting the message var/who = src if(prob(50)) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 97ac9aaf1dc..b53867a6574 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -506,6 +506,7 @@ Traitors and the like can also be revived with the previous role mostly intact. M.radiation = 0 //M.health = 100 M.nutrition = 400 + M.bodytemperature = 310 M.heal_overall_damage(1000, 1000) //M.updatehealth() M.buckled = initial(M.buckled) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 15ef10914c6..138be7efa5c 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -170,8 +170,14 @@ if(isnull(P)||P.toff) return + var/AnsweringMS = 0 for (var/obj/machinery/message_server/MS in world) MS.send_pda_message("[P.owner]","[src]","[t]") + if(MS.active) + AnsweringMS++ + + if(!AnsweringMS) + return tnote += "→ To [P.owner]:
[t]
" P.tnote += "← From [src]:
[t]
" @@ -195,12 +201,18 @@ else var/mob/living/silicon/pai/P = target - tnote += "→ To [P]:
[t]
" - P.tnote += "← From [src]:
[t]
" - - + var/AnsweringMS = 0 for (var/obj/machinery/message_server/MS in world) MS.send_pda_message("[P]","[src]","[t]") + if(MS.active) + AnsweringMS++ + + if(!AnsweringMS) + return + + + tnote += "→ To [P]:
[t]
" + P.tnote += "← From [src]:
[t]
" if (prob(15)) //Give the AI a chance of intercepting the message var/who = src diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index d7acdbc71e9..f8cc0dc42f4 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -54,6 +54,16 @@ var/list/datum/data_pda_msg/pda_msgs = list() var/list/datum/data_rc_msg/rc_msgs = list() + var/active = 1 + +/obj/machinery/message_server/process() + if((stat & (BROKEN|NOPOWER)) && active) + active = 0 + return + + update_icon() + return + /obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "") pda_msgs += new/datum/data_pda_msg(recipient,sender,message) @@ -61,8 +71,22 @@ rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth) /obj/machinery/message_server/attack_hand(user as mob) - user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays." +// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays." + user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" + active = !active + update_icon() + return + +/obj/machinery/message_server/update_icon() + if((stat & (BROKEN|NOPOWER))) + icon_state = "server-nopower" + else if (!active) + icon_state = "server-off" + else + icon_state = "server-on" + + return /datum/feedback_variable diff --git a/html/changelog.html b/html/changelog.html index 7d208d9d910..4a0ad1c7f0d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -92,6 +92,15 @@ should be listed in the changelog upon commit tho. Thanks. --> +
+

3/12/2012

+

PolymorphBlue updated:

+ +
+ +

11 March 2012

PolymorphBlue updated:

diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 4fbfadde86923072f00b79b536347aad7aa0b045..3a09fc9c650441739b9d57092d62bbafbeef2dae 100644 GIT binary patch delta 3681 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%0AwSa z0r$W559`CMBZD04SDZn{{Cju)Nnztf zH9LH(PG{SGMUu9tdKm1{Sk=F>GWanG)t(V63p?~J~A;eEW-y)s?w&lmT!3 z%HKo=naeK;%)kHqNi*QVg-%uRmC0m67eV;#_J@hbe0JiU7FZ>K4JyHR{U+E=AV`>HX|0H8PF&VYBs z4K!zf;eUre&YvU$uCfT@S^VIKzk~7d&b;r&1{F6p;D=wTKMK*}+dp74bMj>(FAvxY z4*D6P40zb>U=bt}_~F;(pO~1C@;YIB`4WGE3i#pY;>Z#B;g{}@Vs>VWMo0My@L;zT z6(H*k1_k~;;C}WuE(0u)&_3LOacJ|~I)7Fla(@l}ZZhEgKsP;j;fEi7_+|SYXL>vC z=T}xf646KQ*KghP9ryaK`$%XzeEs^BUcY`V@)Q7i7XCiqe)cyc1I#*YcoLX>xC7(R z=C^hJtUlx#{N3~c?{#`<@r56L_~AcxEVXkztmWYB%$AbJyNRgG&(EXHAQ%{g`he>M zet-A}jb2=Q;fEi7_=)ru-vEG!0=!x^dt@>E@DCEbzWBlqKm7Lkbr;{OYxM-P0bno) zEx=Q$RM_2#C=?3Z|A63!U#H)7-66+uVzZD*h?+b6@WT(kDZh#0yY+DZY-PxG-L^Ya z{UhKlzTk)7q#pnPY{7A+w<}BE?cCN`d^WGFd=x$iQ#Ov{nA8Ky=_tSf0000m`0#W= fQ3(ogU^D*%46sEPFH}o+00000NkvXXu0mjfzbT-2