cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Welding fuel now a bit harmful when drinking/injecting.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -5
View File
@@ -990,10 +990,7 @@ var/showadminmessages = 1
continue
H.paralysis += 5
if(H.wear_id)
var/obj/item/weapon/card/id/id = H.wear_id
if (istype (H.wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = H.wear_id
id = pda.id
var/obj/item/weapon/card/id/id = H.get_idcard()
for(var/A in id.access)
if(A == access_security)
security++
@@ -1404,7 +1401,7 @@ var/showadminmessages = 1
dat += "<table cellspacing=5><tr><th>Name</th><th>Position</th></tr>"
for(var/mob/living/carbon/human/H in world)
if(H.ckey)
dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, (istype(H.wear_id, /obj/item/weapon/card/id) ? text("[]", H.wear_id.assignment) : "Unknown Position"))
dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, H.get_assignment())
dat += "</table>"
usr << browse(dat, "window=manifest;size=440x410")
if("DNA")
code/modules/mob/living/carbon/human/human.dm
+56
View File
@@ -2587,3 +2587,59 @@
var/obj/machinery/bot/mulebot/MB = AM
if(istype(MB))
MB.RunOver(src)
//gets assignment from ID or ID inside PDA or PDA itself
//Useful when player do something with computers
/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job")
var/obj/item/device/pda/pda = src.wear_id
var/obj/item/weapon/card/id/id = src.wear_id
if (istype(pda))
if (pda.id)
. = pda.id.assignment
else
. = pda.ownjob
else if (istype(id))
. = id.assignment
else
return if_no_id
if (!.)
. = if_no_job
return
//gets name from ID or ID inside PDA or PDA itself
//Useful when player do something with computers
/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown")
var/obj/item/device/pda/pda = src.wear_id
var/obj/item/weapon/card/id/id = src.wear_id
if (istype(pda))
if (pda.id)
. = pda.id.registered
else
. = pda.owner
else if (istype(id))
. = id.registered
else
return if_no_id
return
//gets name from ID or PDA itself, ID inside PDA doesn't matter
//Useful when player is being seen by other mobs
/mob/living/carbon/human/proc/get_visible_name(var/if_no_id = "Unknown")
var/obj/item/device/pda/pda = src.wear_id
var/obj/item/weapon/card/id/id = src.wear_id
if (istype(pda))
. = pda.owner
else if (istype(id))
. = id.registered
else
return if_no_id
return
//gets ID card object from special clothes slot or null.
/mob/living/carbon/human/proc/get_idcard()
var/obj/item/weapon/card/id/id = src.wear_id
var/obj/item/device/pda/pda = src.wear_id
if (istype(pda) && pda.id)
id = pda.id
if (istype(id))
return id
code/modules/mob/living/carbon/human/whisper.dm
+2 -9
View File
@@ -18,15 +18,8 @@
var/alt_name = ""
if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
if (src.wear_id)
var/obj/item/weapon/card/id/id = src:wear_id
if(istype(src:wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = src:wear_id
id = pda.id
alt_name = " (as [id:registered])"
else
alt_name = " (as Unknown)"
var/mob/living/carbon/human/H = src
alt_name = " (as [H.get_visible_name()])"
// Mute disability
if (src.sdisabilities & 2)
return
code/modules/mob/living/say.dm
+2 -11
View File
@@ -27,17 +27,8 @@
var/alt_name = ""
if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
if (src:wear_id)
var/id
if(istype(src:wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = src:wear_id
id = pda.owner
else
id = src:wear_id.registered
alt_name = " (as [id])"
else
alt_name = " (as Unknown)"
var/mob/living/carbon/human/H = src
alt_name = " (as [H.get_visible_name()])"
// Mute disability
if (src.sdisabilities & 2)
return
code/modules/mob/new_player/new_player.dm
+1
View File
@@ -292,6 +292,7 @@ mob/new_player
G.fields["p_stat"] = "Active"
G.fields["m_stat"] = "Stable"
M.fields["b_type"] = text("[]", H.b_type)
M.fields["b_dna"] = H.dna.unique_enzymes
M.fields["mi_dis"] = "None"
M.fields["mi_dis_d"] = "No minor disabilities have been declared."
M.fields["ma_dis"] = "None"
code/modules/mob/say.dm
+2 -8
View File
@@ -14,14 +14,8 @@
var/alt_name = ""
if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
if (src:wear_id)
var/obj/item/weapon/card/id/id = src:wear_id
if(istype(src:wear_id, /obj/item/device/pda))
var/obj/item/device/pda/pda = src:wear_id
id = pda.id
alt_name = " (as [id:registered])"
else
alt_name = " (as Unknown)"
var/mob/living/carbon/human/H = src
alt_name = " (as [H.get_authentification_name()])"
else if (istype(src, /mob/dead/observer))
name = "Ghost"
alt_name = " ([src.real_name])"