Bugfixes galore:

- Retrovirus is now curable. However, unlike most viruses, when it infects a host it generates a random cure. This cure can be either Ryetalyn or rest. For good measure, a doctor should prescribe Ryetalyn AND send them to the recovery room for rest.
     - Fixed a crash in the seeds crate that would result in the crate only having berry seeds. A small typo.
     - Fixed some grammar.
     - Cloning people should now transfer their UI preferences onto the clones.
     - Portable Artificial Intelligences should now properly be able to use the messaging software. They generated some odd runtimes caused by normal PDAs not recognizing pAIs in the PDAs list.
     - Hopefully, I made equipping and dropping items a bit more responsive.
     - As a result of the fix above, the item duplication bug (two people pick an item up at the same time) should theoretically not happen anymore. When I mean theoretically, I mean I have no way of testing this for sure.
     - Cleaned up some of Deuryn's code in a previous revision.

Miscellaneous:
     - The Cold can now be cured if you're just laying down, although actually sleeping will greatly increase your odds of curing it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2016 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-08-16 04:56:32 +00:00
parent 4af91340fd
commit ca6a513377
9 changed files with 132 additions and 31 deletions
+43 -20
View File
@@ -458,34 +458,57 @@
var/obj/item/device/pda/P = locate(href_list["target"])
if (isnull(P)||P.toff || toff)
return
if(istype(P, /obj/item/device/pda))
if (isnull(P)||P.toff || toff)
return
if (last_text && world.time < last_text + 5)
return
if (last_text && world.time < last_text + 5)
return
last_text = world.time
last_text = world.time
for (var/obj/machinery/message_server/MS in world)
MS.send_pda_message("[P.owner]","[owner]","[t]")
for (var/obj/machinery/message_server/MS in world)
MS.send_pda_message("[P.owner]","[owner]","[t]")
tnote += "<i><b>&rarr; To [P.owner]:</b></i><br>[t]<br>"
P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];choice=Message;target=\ref[src]'>[owner]</a>:</b></i><br>[t]<br>"
tnote += "<i><b>&rarr; To [P.owner]:</b></i><br>[t]<br>"
P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];choice=Message;target=\ref[src]'>[owner]</a>:</b></i><br>[t]<br>"
if (prob(15)) //Give the AI a chance of intercepting the message
var/who = src.owner
if(prob(50))
who = P:owner
for(var/mob/living/silicon/ai/ai in world)
ai.show_message("<i>Intercepted message from <b>[who]</b>: [t]</i>")
if (prob(15)) //Give the AI a chance of intercepting the message
var/who = src.owner
if(prob(50))
who = P:owner
for(var/mob/living/silicon/ai/ai in world)
ai.show_message("<i>Intercepted message from <b>[who]</b>: [t]</i>")
if (!P.silent)
playsound(P.loc, 'twobeep.ogg', 50, 1)
for (var/mob/O in hearers(3, P.loc))
O.show_message(text("\icon[P] *[P.ttone]*"))
P.overlays = null
P.overlays += image('pda.dmi', "pda-r")
// pAI Message
else
tnote += "<i><b>&rarr; To [P]:</b></i><br>[t]<br>"
P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];soft=pdamessage;target=\ref[src]'>[src]</a>:</b></i><br>[t]<br>"
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))
who = P
for (var/mob/living/silicon/ai/ai in world)
ai.show_message("<i>Intercepted message from <b>[who]</b>: [t]</i>")
if (!P.silent)
playsound(P.loc, 'twobeep.ogg', 50, 1)
for (var/mob/O in hearers(3, P.loc))
O.show_message(text("\icon[P] *[P.ttone]*"))
P.overlays = null
P.overlays += image('pda.dmi', "pda-r")
if("Send Honk")//Honk virus
if(istype(cartridge, /obj/item/weapon/cartridge/clown))//Cartridge checks are kind of unnecessary since everything is done through switch.
var/obj/item/device/pda/P = locate(href_list["target"])//Leaving it alone in case it may do something useful, I guess.
+11
View File
@@ -123,7 +123,11 @@
else
user.u_equip(src)
else
if(istype(src.loc, /mob/living))
return
src.pickup(user)
user.lastDblClick = world.time + 2
user.next_move = world.time + 2
if (user.hand)
user.l_hand = src
@@ -155,6 +159,13 @@
return
else
user.u_equip(src)
else
if(istype(src.loc, /mob/living))
return
src.pickup(user)
user.lastDblClick = world.time + 2
user.next_move = world.time + 2
if (user.hand)
user.l_hand = src
else