mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-21 12:03:08 +01:00
Cleanbot autopatrols now Ghosts can see PDA messages, a PDA will show you the fingerprints if it is complete enough (Security scanner) Display case can be repaired. More update_clothing() calls Disabilities have their own window, now. Removed the genetics scanner, go use yer penlights!
This commit is contained in:
@@ -477,6 +477,10 @@
|
||||
tnote += "<i><b>→ To [P.owner]:</b></i><br>[t]<br>"
|
||||
P.tnote += "<i><b>← From <a href='byond://?src=\ref[P];choice=Message;target=\ref[src]'>[owner]</a>:</b></i><br>[t]<br>"
|
||||
|
||||
// Give every ghost the ability to see all messages
|
||||
for (var/mob/dead/observer/G in world)
|
||||
G.show_message("<i>PDA message from <b>[src.owner]</b> to <b>[P:owner]</b>: [t]</i>")
|
||||
|
||||
if (prob(15)) //Give the AI a chance of intercepting the message
|
||||
var/who = src.owner
|
||||
if(prob(50))
|
||||
@@ -763,8 +767,19 @@
|
||||
user << "\blue Unable to locate any fingerprints on [A]!"
|
||||
else
|
||||
user << "\blue Isolated [A:fingerprints.len] fingerprints."
|
||||
// for(var/i in L)
|
||||
// user << "\blue \t [i]"
|
||||
var/list/prints = A:fingerprints
|
||||
var/list/complete_prints = list()
|
||||
for(var/i in prints)
|
||||
var/list/templist = params2list(i)
|
||||
var/temp = stringpercent(templist["2"])
|
||||
if(temp <= 6)
|
||||
complete_prints += templist["2"]
|
||||
if(complete_prints.len < 1)
|
||||
user << "\blue No intact prints found"
|
||||
else
|
||||
user << "\blue Found [complete_prints.len] intact prints"
|
||||
for(var/i in complete_prints)
|
||||
user << "\blue " + i
|
||||
|
||||
if(3)
|
||||
if(!isnull(A.reagents))
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
/obj/item/device/geneticsanalyzer
|
||||
name = "Genetics Analyser"
|
||||
icon = 'device.dmi'
|
||||
icon_state = "genetics"
|
||||
w_class = 2
|
||||
|
||||
/obj/item/device/geneticsanalyzer/attack(mob/M as mob, mob/user as mob)
|
||||
for(var/mob/O in viewers(M, null))
|
||||
O.show_message(text("\red [] has analyzed []'s genetic code!", user, M), 1)
|
||||
//Foreach goto(67)
|
||||
user.show_message(text("\blue Analyzing Results for [M]: [M.dna.struc_enzymes]\n\t"), 1)
|
||||
user.show_message(text("\blue \t Epilepsy: [isblockon(getblock(M.dna.struc_enzymes, HEADACHEBLOCK,3),HEADACHEBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Cough: [isblockon(getblock(M.dna.struc_enzymes, COUGHBLOCK,3),COUGHBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Clumsy: [isblockon(getblock(M.dna.struc_enzymes, CLUMSYBLOCK,3),CLUMSYBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Twitch: [isblockon(getblock(M.dna.struc_enzymes, TWITCHBLOCK,3),TWITCHBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Nervous: [isblockon(getblock(M.dna.struc_enzymes, NERVOUSBLOCK,3),NERVOUSBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Blind: [isblockon(getblock(M.dna.struc_enzymes, BLINDBLOCK,3),BLINDBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Deaf: [isblockon(getblock(M.dna.struc_enzymes, DEAFBLOCK,3),DEAFBLOCK) ? "Yes" : "No"]"), 1)
|
||||
user.show_message(text("\blue \t Requires Glasses: [isblockon(getblock(M.dna.struc_enzymes, GLASSESBLOCK,3),GLASSESBLOCK) ? "Yes" : "No"]"), 1)
|
||||
|
||||
/*
|
||||
var/unknow = 0
|
||||
var/list/unknowns = list(HULKBLOCK,TELEBLOCK,FIREBLOCK,XRAYBLOCK,NOBREATHBLOCK,REMOTEVIEWBLOCK,REGENERATEBLOCK,INCREASERUNBLOCK,REMOTETALKBLOCK,MORPHBLOCK,BLENDBLOCK,HALLUCINATIONBLOCK,NOPRINTSBLOCK,SHOCKIMMUNITYBLOCK,SMALLSIZEBLOCK)
|
||||
for(var/unknown in unknowns)
|
||||
if(isblockon(getblock(M.dna.struc_enzymes, unknown,3),unknown))
|
||||
unknow += 1
|
||||
user.show_message(text("\blue \t Unknown Anomalies: [unknow]"))*/
|
||||
@@ -204,8 +204,8 @@ MASS SPECTROMETER
|
||||
var/merged = 0
|
||||
for(var/i = 1, i < (stored.len + 1), i++) //Lets see if the object is already in there!
|
||||
var/list/temp = stored[i]
|
||||
var/checker = temp[1]
|
||||
if(checker == A) //It is! Merge!
|
||||
var/atom/checker = temp[1]
|
||||
if(checker.original_atom == A || checker.original_atom == A.original_atom) //It is! Merge!
|
||||
merged = 1
|
||||
var/list/prints = temp[2]
|
||||
if(!prints)
|
||||
@@ -239,7 +239,7 @@ MASS SPECTROMETER
|
||||
if(!blood.Find(A.blood_DNA[j])) //It isn't! Add!
|
||||
blood += A.blood_DNA[j]
|
||||
var/list/sum_list[4] //Pack it back up!
|
||||
sum_list[1] = A
|
||||
sum_list[1] = checker
|
||||
sum_list[2] = prints
|
||||
sum_list[3] = fibers
|
||||
sum_list[4] = blood
|
||||
@@ -247,7 +247,7 @@ MASS SPECTROMETER
|
||||
break //We found it, we're done here.
|
||||
if(!merged) //Uh, oh! New data point!
|
||||
var/list/sum_list[4] //Pack it back up!
|
||||
sum_list[1] = A
|
||||
sum_list[1] = A.get_duplicate(src)
|
||||
if(!A.fingerprints)
|
||||
world << "Report this to a dev! [A] was lacking a list() for fingerprints!"
|
||||
sum_list[2] = list()
|
||||
|
||||
@@ -59,6 +59,26 @@
|
||||
|
||||
|
||||
/obj/structure/displaycase/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/gun/energy/laser/captain))
|
||||
if(!src.occupied)
|
||||
user << "\b You put the [W] back into the display case."
|
||||
del(W)
|
||||
src.occupied = 1
|
||||
update_icon()
|
||||
return
|
||||
if(istype(W, /obj/item/stack/sheet/glass))
|
||||
if(src.occupied && src.destroyed)
|
||||
var/obj/item/stack/sheet/glass/G = W
|
||||
user << "\b You repair the display case."
|
||||
G.amount--
|
||||
if (G.amount <= 0)
|
||||
user.update_clothing()
|
||||
del(G)
|
||||
src.destroyed = 0
|
||||
src.density = 1
|
||||
src.health = 30
|
||||
update_icon()
|
||||
return
|
||||
src.health -= W.force
|
||||
src.healthcheck()
|
||||
..()
|
||||
|
||||
@@ -219,6 +219,7 @@
|
||||
return
|
||||
|
||||
src.created_name = t
|
||||
user.update_clothing()
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user