Welding fuel now a bit harmful when drinking/injecting.

Admin Crew Manifest can read assignments from PDA.
Some other id-in-pda related glitches fixed.
APC frame can we unwrenched in hand.
Medical computer now have DNA records.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@910 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-01-24 01:00:20 +00:00
parent 3a8bc5c40b
commit 1de3867666
12 changed files with 88 additions and 50 deletions
+1 -1
View File
@@ -184,7 +184,7 @@
/obj/manifest/proc/manifest()
var/dat = "<B>Crew Manifest</B>:<BR>"
for(var/mob/living/carbon/human/M in world)
dat += text(" <B>[]</B> - []<BR>", M.name, (istype(M.wear_id, /obj/item/weapon/card/id) ? text("[]", M.wear_id.assignment) : "Unknown Position"))
dat += text(" <B>[]</B> - []<BR>", M.name, M.get_assignment())
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
P.info = dat
P.name = "paper- 'Crew Manifest'"
+1 -1
View File
@@ -2,7 +2,7 @@
/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( src.loc, 2 )
new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )
del(src)
/obj/item/apc_frame/proc/try_build(turf/on_wall)
+5 -12
View File
@@ -145,18 +145,11 @@ Frequency:
var/eqjobname
if (istype(M, /mob/living/carbon))
if (M:wear_id)
var/id
if (istype(M:wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = M:wear_id
if (pda.id) id = pda.id.assignment
else id = pda.ownjob
else id = M:wear_id.assignment
if (id) eqjobname = id
else eqjobname = "No job"
else
eqjobname = "No id"
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
eqjobname = H.get_assignment()
else if (istype(M, /mob/living/carbon))
eqjobname = "No id" //only humans can wear ID
else if (istype(M,/mob/living/silicon/ai))
eqjobname = "AI"
else if (istype(M,/mob/living/silicon/robot))