Scanner:
[scanner_status]
\tLabel: [label ? label : name]" temp_html += "
\tSubject: [name]" - if(ue && name && b_type) - temp_html += "
\tBlood Type: [b_type]" + if(ue && name && blood_type) + temp_html += "
\tBlood Type: [blood_type]" temp_html += "
\tUE: [ue] " if(viable_occupant) temp_html += "Occupant " else temp_html += "Occupant" @@ -737,7 +737,7 @@ temp_html += "
Irradiate Subject
" temp_html += "Unique Identifier:
"
-
+
var/max_line_len = 7*DNA_BLOCK_SIZE
if(viable_occupant)
temp_html += "
1
"
@@ -751,7 +751,7 @@
else
temp_html += "----"
temp_html += "" - + temp_html += "
Structural Enzymes:
"
if(viable_occupant)
temp_html += "", round(occupant.reagents.get_reagent_amount("inaprovaline"), 0.1))
- dat += text("", round(occupant.reagents.get_reagent_amount("stoxin"), 0.1))
+ dat += text("", round(occupant.reagents.get_reagent_amount("stoxin"), 0.1))
dat += text("", round(occupant.reagents.get_reagent_amount("dermaline"), 0.1))
dat += text("", round(occupant.reagents.get_reagent_amount("bicaridine"), 0.1))
dat += text("", round(occupant.reagents.get_reagent_amount("dexalin"), 0.1))
@@ -71,12 +71,12 @@
else
dat += "Inject Inaprovaline"
if(occupant && occupant.health > 0)
- dat += {"
Inject Soporific + dat += {"
Inject Sleep Toxin
Inject Dermaline
Inject Bicaridine
Inject Dexalin"} else - dat += {"
Inject Soporific + dat += {"
Inject Sleep Toxin
Inject Dermaline
Inject Bicaridine
Inject Dexalin"} @@ -268,7 +268,7 @@ if(occupant.reagents.get_reagent_amount("stoxin") + 20 < 41) occupant.reagents.add_reagent("stoxin", 20) var/units = round(occupant.reagents.get_reagent_amount("stoxin")) - user << "Occupant now has [units] unit\s of soporifics in their bloodstream." + user << "Occupant now has [units] unit\s of sleep toxins in their bloodstream." /obj/machinery/sleeper/proc/inject_dermaline(mob/user) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 6ef2df78f21..3ba51076e7f 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -715,19 +715,11 @@ Auto Patrol: []"}, if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag)) threatcount += 2 - if(src.check_records) - for (var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + if(check_records) //check if they are set to *Arrest* on records + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 if((src.idcheck) && (src.allowed(perp)) && !(src.lasercolor)) threatcount = 0//Corrupt cops cannot exist beep boop diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index cecbf903b3e..8aa91815892 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -746,7 +746,7 @@ var/global/mulebot_count = 0 var/obj/effect/decal/cleanable/blood/B = new(src.loc) B.blood_DNA = list() - B.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type + B.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type bloodiness += 4 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 15b484f1b7b..972549eb159 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -628,19 +628,11 @@ Auto Patrol: []"}, if(perp.wear_id && istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) threatcount -= 2 - if(src.check_records) - for (var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + if(check_records) //check if they are set to *Arrest* on records + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 return threatcount diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 94cbdf5ad1e..f775900cf44 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -42,7 +42,7 @@ if ((M.stat != 2) || (!M.client)) continue //They need a brain! - if (ishuman(M) && !getbrain(M)) + if (ishuman(M) && !M.getorgan(/obj/item/organ/brain)) continue if (M.ckey == find_key) @@ -166,10 +166,10 @@ randmutb(H) //Sometimes the clones come out wrong. if(H.gender == MALE) - H.f_style = "Full Beard" + H.facial_hair_style = "Full Beard" else - H.f_style = "Shaved" - H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") + H.facial_hair_style = "Shaved" + H.hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") H.suiciding = 0 src.attempting = 0 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 875295b5182..b8e6059257d 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -47,7 +47,7 @@ if(table.check_patient()) patient = table.patient dat += {"Patient Status: [patient.stat ? "Non-Responsive" : "Stable"]
- Blood Type: [patient.b_type]
+ Blood Type: [patient.blood_type]
Health: [round(patient.health)]
Brute Damage: [round(patient.getBruteLoss())]
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8e70d40bd23..5e9043cecaf 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -42,11 +42,11 @@ board_type = "other" /obj/item/weapon/circuitboard/aiupload name = "Circuit board (AI Upload)" - build_path = "/obj/machinery/computer/aiupload" + build_path = "/obj/machinery/computer/upload/ai" origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload name = "Circuit board (Cyborg Upload)" - build_path = "/obj/machinery/computer/borgupload" + build_path = "/obj/machinery/computer/upload/borg" origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data name = "Circuit board (Medical Records Console)" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index a009273ba4b..a8aeeb7668f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -104,16 +104,11 @@ user.set_machine(src) var/dat - if (!( ticker )) - return + if(!ticker) return if (mode == 1) // accessing crew manifest var/crew = "" - var/list/L = list() - for (var/datum/data/record/t in data_core.general) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - crew += "[R]
" + for(var/datum/data/record/t in sortRecord(data_core.general)) + crew += t.fields["name"] + " - " + t.fields["rank"] + "
" dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
" else if(mode == 2) @@ -407,12 +402,8 @@ sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) var/t1 = "Crew Manifest:
" - var/list/L = list() - for (var/datum/data/record/t in data_core.general) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - t1 += "[R]
" + for(var/datum/data/record/t in sortRecord(data_core.general)) + t1 += t.fields["name"] + " - " + t.fields["rank"] + "
" P.info = t1 P.name = "paper- 'Crew Manifest'" printing = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index b32a3cc7fe5..63e0ccdc73e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -140,8 +140,8 @@ if(2) dat += "
" - for(var/datum/data/record/R in src.records) - dat += "
" @@ -150,7 +150,7 @@ dat += "Record not found." else dat += "
" + dat += "Scan ID [src.active_record.fields["id"]] Clone
" var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"]) @@ -169,7 +169,7 @@ var/list/L = list() if(diskette.fields["UI"]) L += "Unique Identifier" - if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["b_type"]) + if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"]) L += "Unique Enzymes" if(diskette.fields["SE"]) L += "Structural Enzymes" @@ -226,16 +226,16 @@ else src.scanner.locked = 0 - else if (href_list["view_rec"]) - src.active_record = locate(href_list["view_rec"]) - if(istype(src.active_record,/datum/data/record)) - if (!active_record.fields["ckey"]) - del(src.active_record) + else if(href_list["view_rec"]) + src.active_record = find_record("id", href_list["view_rec"], records) + if(active_record) + if(!active_record.fields["ckey"]) + records -= active_record + active_record = null src.temp = "Record Corrupt" else src.menu = 3 else - src.active_record = null src.temp = "Record missing." else if (href_list["del_rec"]) @@ -250,8 +250,8 @@ if (istype(C)||istype(C, /obj/item/device/pda)) if(src.check_access(C)) src.temp = "[src.active_record.fields["name"]] => Record deleted." - src.records.Remove(src.active_record) - del(src.active_record) + src.records.Remove(active_record) + active_record = null src.menu = 2 else src.temp = "Access Denied." @@ -268,10 +268,10 @@ src.menu = 1 src.updateUsrDialog() return - + src.active_record.fields = diskette.fields.Copy() src.temp = "Load successful." - + if("eject") if(src.diskette) src.diskette.loc = src.loc @@ -280,8 +280,8 @@ if(!diskette || diskette.read_only || !active_record || !active_record.fields) src.temp = "Save error." src.updateUsrDialog() - return - + return + diskette.fields = active_record.fields.Copy() diskette.name = "data disk - '[src.diskette.fields["name"]]'" src.temp = "Save successful." @@ -290,9 +290,9 @@ src.updateUsrDialog() else if (href_list["clone"]) - var/datum/data/record/C = locate(href_list["clone"]) + var/datum/data/record/C = find_record("id", href_list["clone"], records) //Look for that player! They better be dead! - if(istype(C)) + if(C) //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. if(!pod1) temp = "No Clonepod detected." @@ -305,7 +305,8 @@ else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"])) temp = "[C.fields["name"]] => Cloning cycle in progress..." records.Remove(C) - del(C) + if(active_record == C) + active_record = null menu = 1 else temp = "[C.fields["name"]] => Initialisation failure." @@ -324,7 +325,7 @@ if (!check_dna_integrity(subject) || !istype(subject)) scantemp = "Unable to locate valid genetic data." return - if (!getbrain(subject)) + if (!subject.getorgan(/obj/item/organ/brain)) scantemp = "No signs of intelligence detected." return if (subject.suiciding == 1) @@ -336,11 +337,11 @@ if (NOCLONE in subject.mutations) scantemp = "Mental interface failure." return - if (!isnull(find_record(subject.ckey))) + if (find_record("ckey", subject.ckey, records)) scantemp = "Subject already in database." return - var/datum/data/record/R = new /datum/data/record() + var/datum/data/record/R = new() if(subject.dna) R.fields["mrace"] = subject.dna.mutantrace else @@ -351,11 +352,11 @@ R.fields["UE"] = subject.dna.unique_enzymes R.fields["UI"] = subject.dna.uni_identity R.fields["SE"] = subject.dna.struc_enzymes - R.fields["b_type"] = subject.dna.b_type + R.fields["blood_type"] = subject.dna.blood_type //Add an implant if needed var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject) - if (isnull(imp)) + if(!imp) imp = new /obj/item/weapon/implant/health(subject) imp.implanted = subject R.fields["imp"] = "\ref[imp]" @@ -369,15 +370,6 @@ src.records += R scantemp = "Subject successfully scanned." -//Find a specific record by key. -/obj/machinery/computer/cloning/proc/find_record(var/find_key) - var/selected_record = null - for(var/datum/data/record/R in src.records) - if (R.fields["ckey"] == find_key) - selected_record = R - break - return selected_record - /obj/machinery/computer/cloning/update_icon() if(stat & BROKEN) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ff0e2a25da4..0598cc4d0d2 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -432,9 +432,6 @@ dat += "
\[ [(src.aistate != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" return dat -/proc/enable_prison_shuttle(var/mob/user) - for(var/obj/machinery/computer/prison_shuttle/PS in world) - PS.allowedtocall = !(PS.allowedtocall) /proc/call_shuttle_proc(var/mob/user) if ((!( ticker ) || emergency_shuttle.location)) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index b4438032045..7fb5c720586 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -10,8 +10,8 @@ var/authenticated = null var/rank = null var/screen = null - var/datum/data/record/active1 = null - var/datum/data/record/active2 = null + var/datum/data/record/active1 + var/datum/data/record/active2 var/a_id = null var/temp = null var/printing = null @@ -45,21 +45,21 @@ "} if(2.0) dat += "Record List:
" - if(!isnull(data_core.general)) + if(data_core.general) for(var/datum/data/record/R in sortRecord(data_core.general)) - dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) + dat += "[R.fields["id"]]: [R.fields["name"]]
" //Foreach goto(132) dat += text("
Back", src) if(3.0) dat += text("Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack", src, src, src, src) if(4.0) dat += "Medical Record
" - if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) + if(active1 in data_core.general) dat += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["name"], src.active1.fields["id"], src, src.active1.fields["sex"], src, src.active1.fields["age"], src, src.active1.fields["fingerprint"], src, src.active1.fields["p_stat"], src, src.active1.fields["m_stat"]) else dat += "General Record Lost!
" - if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2))) - dat += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", src, src.active2.fields["b_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"]) + if(active2 in data_core.medical) + dat += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", src, src.active2.fields["blood_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"]) var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry
", src.active2.fields[text("com_[]", counter)], src, counter) @@ -114,10 +114,11 @@ /obj/machinery/computer/med_data/Topic(href, href_list) if(..()) return - if (!( data_core.general.Find(src.active1) )) + if(!(active1 in data_core.general)) src.active1 = null - if (!( data_core.medical.Find(src.active2) )) + if(!(active2 in data_core.medical)) src.active2 = null + if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) if (href_list["temp"]) @@ -161,7 +162,7 @@ src.active1 = null src.active2 = null - if(href_list["vir"]) + else if(href_list["vir"]) var/type = href_list["vir"] var/datum/disease/Dis = new type(0) var/AfS = "" @@ -177,111 +178,108 @@
Severity: [Dis.severity]"} - if (href_list["del_all"]) + else if (href_list["del_all"]) src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) - if (href_list["del_all2"]) - for(var/datum/data/record/R in data_core.medical) - //R = null - del(R) - //Foreach goto(494) + else if (href_list["del_all2"]) + data_core.medical.Cut() src.temp = "All records deleted." - if (href_list["field"]) + else if (href_list["field"]) var/a1 = src.active1 var/a2 = src.active2 switch(href_list["field"]) if("fingerprint") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = copytext(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["fingerprint"] = t1 if("sex") - if (istype(src.active1, /datum/data/record)) + if(active1) if (src.active1.fields["sex"] == "Male") src.active1.fields["sex"] = "Female" else src.active1.fields["sex"] = "Male" if("age") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null) as num if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["age"] = t1 if("mi_dis") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis"] = t1 if("mi_dis_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis_d"] = t1 if("ma_dis") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis"] = t1 if("ma_dis_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis_d"] = t1 if("alg") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg"] = t1 if("alg_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg_d"] = t1 if("cdi") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi"] = t1 if("cdi_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi_d"] = t1 if("notes") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize notes:", "Med. records", src.active2.fields["notes"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["notes"] = t1 if("p_stat") - if (istype(src.active1, /datum/data/record)) + if(active1) src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
", src, src, src, src) if("m_stat") - if (istype(src.active1, /datum/data/record)) + if(active1) src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) - if("b_type") - if (istype(src.active2, /datum/data/record)) - src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) + if("blood_type") + if(active2) + src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) if("b_dna") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = copytext(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["dna"] = t1 else - if (href_list["p_stat"]) - if (src.active1) + else if (href_list["p_stat"]) + if(active1) switch(href_list["p_stat"]) if("deceased") src.active1.fields["p_stat"] = "*Deceased*" @@ -292,8 +290,8 @@ if("unfit") src.active1.fields["p_stat"] = "Physically Unfit" - if (href_list["m_stat"]) - if (src.active1) + else if (href_list["m_stat"]) + if(active1) switch(href_list["m_stat"]) if("insane") src.active1.fields["m_stat"] = "*Insane*" @@ -305,58 +303,51 @@ src.active1.fields["m_stat"] = "Stable" - if (href_list["b_type"]) - if (src.active2) - switch(href_list["b_type"]) + else if (href_list["blood_type"]) + if(active2) + switch(href_list["blood_type"]) if("an") - src.active2.fields["b_type"] = "A-" + src.active2.fields["blood_type"] = "A-" if("bn") - src.active2.fields["b_type"] = "B-" + src.active2.fields["blood_type"] = "B-" if("abn") - src.active2.fields["b_type"] = "AB-" + src.active2.fields["blood_type"] = "AB-" if("on") - src.active2.fields["b_type"] = "O-" + src.active2.fields["blood_type"] = "O-" if("ap") - src.active2.fields["b_type"] = "A+" + src.active2.fields["blood_type"] = "A+" if("bp") - src.active2.fields["b_type"] = "B+" + src.active2.fields["blood_type"] = "B+" if("abp") - src.active2.fields["b_type"] = "AB+" + src.active2.fields["blood_type"] = "AB+" if("op") - src.active2.fields["b_type"] = "O+" + src.active2.fields["blood_type"] = "O+" - if (href_list["del_r"]) - if (src.active2) + else if (href_list["del_r"]) + if(active2) src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) - if (href_list["del_r2"]) - if (src.active2) - //src.active2 = null - del(src.active2) + else if (href_list["del_r2"]) + if(active2) + data_core.medical -= active2 + active2 = null - if (href_list["d_rec"]) - var/datum/data/record/R = locate(href_list["d_rec"]) - var/datum/data/record/M = locate(href_list["d_rec"]) - if (!( data_core.general.Find(R) )) - src.temp = "Record Not Found!" - return - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - else - //Foreach continue //goto(2540) - src.active1 = R - src.active2 = M - src.screen = 4 + else if (href_list["d_rec"]) + active1 = find_record("id", href_list["d_rec"], data_core.general) + if(active1) + active2 = find_record("id", href_list["d_rec"], data_core.medical) + if(!active2) + active1 = null + screen = 4 - if (href_list["new"]) + else if (href_list["new"]) if ((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) ))) var/datum/data/record/R = new /datum/data/record( ) R.fields["name"] = src.active1.fields["name"] R.fields["id"] = src.active1.fields["id"] R.name = text("Medical Record #[]", R.fields["id"]) - R.fields["b_type"] = "Unknown" + R.fields["blood_type"] = "Unknown" R.fields["b_dna"] = "Unknown" R.fields["mi_dis"] = "None" R.fields["mi_dis_d"] = "No minor disabilities have been declared." @@ -371,8 +362,8 @@ src.active2 = R src.screen = 4 - if (href_list["add_c"]) - if (!( istype(src.active2, /datum/data/record) )) + else if (href_list["add_c"]) + if(!(active2 in data_core.medical)) return var/a2 = src.active2 var/t1 = copytext(sanitize(input("Add Comment:", "Med. records", null, null) as message),1,MAX_MESSAGE_LEN) @@ -383,11 +374,11 @@ counter++ src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", src.authenticated, src.rank, time2text(world.realtime, "MMM DD"), worldtime2text(), year_integer+540, t1,) - if (href_list["del_c"]) + else if (href_list["del_c"]) if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])])) src.active2.fields[text("com_[]", href_list["del_c"])] = "Deleted" - if (href_list["search"]) + else if (href_list["search"]) var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null) as text if ((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!in_range(src, usr)) && (!istype(usr, /mob/living/silicon))))) return @@ -409,18 +400,18 @@ //Foreach continue //goto(3334) src.screen = 4 - if (href_list["print_p"]) + else if (href_list["print_p"]) if (!( src.printing )) src.printing = 1 sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = "Medical Record
" - if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) + if(active1 in data_core.general) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"], src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"]) else P.info += "General Record Lost!
" - if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2))) - P.info += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"]) + if(active2 in data_core.medical) + P.info += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", src.active2.fields["blood_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"]) var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) P.info += text("[]
", src.active2.fields[text("com_[]", counter)]) @@ -444,13 +435,13 @@ if(prob(10/severity)) switch(rand(1,6)) if(1) - R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" + R.fields["name"] = random_name(R.fields["sex"],1) if(2) R.fields["sex"] = pick("Male", "Female") if(3) - R.fields["age"] = rand(5, 85) + R.fields["age"] = rand(AGE_MIN, AGE_MAX) if(4) - R.fields["b_type"] = pick("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+") + R.fields["blood_type"] = random_blood_type() if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 1f16e74b83c..b2ff68a8738 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -42,14 +42,20 @@ dat += "********************************
" dat += "
Tracking Implants
" for(var/obj/item/weapon/implant/tracking/T in world) + if(!iscarbon(T.imp_in)) + continue + if(!T.implanted) + continue Tr = get_turf(T) - if((Tr) && (Tr.z != src.z)) continue//Out of range - if(!T.implanted) continue + if((Tr) && (Tr.z != src.z)) + continue//Out of range + var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in - if(M.z == 1 && !istype(M.loc, /turf/space)) + if(Tr.z == 1 && !istype(M.loc, /turf/space)) var/turf/mob_loc = get_turf(M) loc_display = mob_loc.loc + dat += "ID: [T.id] | Location: [loc_display]
" dat += "(Message Holder) |
" dat += "********************************
" diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm deleted file mode 100644 index ec6a1a19f22..00000000000 --- a/code/game/machinery/computer/prisonshuttle.dm +++ /dev/null @@ -1,242 +0,0 @@ -//Config stuff -#define PRISON_MOVETIME 150 //Time to station is milliseconds. -#define PRISON_STATION_AREATYPE "/area/shuttle/prison/station" //Type of the prison shuttle area for station -#define PRISON_DOCK_AREATYPE "/area/shuttle/prison/prison" //Type of the prison shuttle area for dock - -var/prison_shuttle_moving_to_station = 0 -var/prison_shuttle_moving_to_prison = 0 -var/prison_shuttle_at_station = 0 -var/prison_shuttle_can_send = 1 -var/prison_shuttle_time = 0 -var/prison_shuttle_timeleft = 0 - -/obj/machinery/computer/prison_shuttle - name = "Prison Shuttle Console" - icon = 'icons/obj/computer.dmi' - icon_state = "shuttle" - req_access = list(access_security) - circuit = "/obj/item/weapon/circuitboard/prison_shuttle" - var/temp = null - var/hacked = 0 - var/allowedtocall = 0 - var/prison_break = 0 - - - attackby(I as obj, user as mob) - return src.attack_hand(user) - - - attack_ai(var/mob/user as mob) - return src.attack_hand(user) - - - attack_paw(var/mob/user as mob) - return src.attack_hand(user) - - - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/prison_shuttle/M = new /obj/item/weapon/circuitboard/prison_shuttle( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 - - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) - else if(istype(I,/obj/item/weapon/card/emag) && (!hacked)) - hacked = 1 - user << "\blue You disable the lock." - else - return src.attack_hand(user) - - - attack_hand(var/mob/user as mob) - if(!src.allowed(user) && (!hacked)) - user << "\red Access Denied." - return - if(prison_break) - user << "\red Unable to locate shuttle." - return - if(..()) - return - user.set_machine(src) - post_signal("prison") - var/dat - if (src.temp) - dat = src.temp - else - dat += {"Location: [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"]
- [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*
\n
":prison_shuttle_at_station ? "\nSend to Dock
\n
":"\nSend to Station
\n
"] - \nClose"} - - //user << browse(dat, "window=computer;size=575x450") - //onclose(user, "computer") - var/datum/browser/popup = new(user, "computer", name, 575, 450) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - - - Topic(href, href_list) - if(..()) - return - - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - - if (href_list["sendtodock"]) - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." - src.temp += "Shuttle sent.
OK" - src.updateUsrDialog() - prison_shuttle_moving_to_prison = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - - else if (href_list["sendtostation"]) - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." - src.temp += "Shuttle sent.
OK" - src.updateUsrDialog() - prison_shuttle_moving_to_station = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - - else if (href_list["mainmenu"]) - src.temp = null - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - - proc/prison_can_move() - if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return 0 - else return 1 - -/* - proc/prison_break() - switch(prison_break) - if (0) - if(!prison_shuttle_at_station || prison_shuttle_moving_to_prison) return - - prison_shuttle_moving_to_prison = 1 - prison_shuttle_at_station = prison_shuttle_at_station - - if (!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station) - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - prison_break = 1 - if(1) - prison_break = 0 -*/ - - proc/post_signal(var/command) - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1311) - if(!frequency) return - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - frequency.post_signal(src, status_signal) - return - - - proc/prison_process() - while(prison_shuttle_time - world.timeofday > 0) - var/ticksleft = prison_shuttle_time - world.timeofday - - if(ticksleft > 1e5) - prison_shuttle_time = world.timeofday + 10 // midnight rollover - - prison_shuttle_timeleft = (ticksleft / 10) - sleep(5) - prison_shuttle_moving_to_station = 0 - prison_shuttle_moving_to_prison = 0 - - switch(prison_shuttle_at_station) - - if(0) - prison_shuttle_at_station = 1 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - - var/area/start_location = locate(/area/shuttle/prison/prison) - var/area/end_location = locate(/area/shuttle/prison/station) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - del(T) - start_location.move_contents_to(end_location) - - if(1) - prison_shuttle_at_station = 0 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - - var/area/start_location = locate(/area/shuttle/prison/station) - var/area/end_location = locate(/area/shuttle/prison/prison) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - del(T) - start_location.move_contents_to(end_location) - return \ No newline at end of file diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5497b39ad3e..fe8eb1a23b4 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -154,7 +154,7 @@ /obj/machinery/door/window/hitby(AM as mob|obj) ..() - visible_message("\red The glass door was hit by [AM].", 1) + visible_message("\red The glass door was hit by [AM].") var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -175,7 +175,7 @@ return src.health = max(0, src.health - 25) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [user] smashes against the [src.name].", 1) + visible_message("\red [user] smashes against the [src.name].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 383e3f48fd6..ab84288bfea 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -10,10 +10,12 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/New() + ..() doppler_arrays += src /obj/machinery/doppler_array/Del() doppler_arrays -= src + ..() /obj/machinery/doppler_array/process() return PROCESS_KILL diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 0c2a6ed6b07..0baa0912377 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -552,18 +552,10 @@ threatcount += 2 if(check_records) //if the turret can check the records, check if they are set to *Arrest* on records - for(var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for(var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 return threatcount diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm new file mode 100644 index 00000000000..d18d6d90946 --- /dev/null +++ b/code/game/machinery/recycler.dm @@ -0,0 +1,124 @@ +var/const/SAFETY_COOLDOWN = 100 + +/obj/machinery/recycler + name = "crusher" + desc = "A large crushing machine which is used to recycle small items ineffeciently; there are lights on the side of it." + icon = 'icons/obj/recycling.dmi' + icon_state = "grinder-o0" + layer = MOB_LAYER+1 // Overhead + anchored = 1 + density = 1 + var/safety_mode = 0 // Temporality stops the machine if it detects a mob + var/grinding = 0 + var/icon_name = "grinder-o" + var/blood = 0 + var/eat_from = WEST + +/obj/machinery/recycler/New() + // On us + ..() + update_icon() + +/obj/machinery/recycler/examine() + set src in view() + ..() + usr << "The power light is [(stat & NOPOWER) ? "off" : "on"]." + usr << "The safety-mode light is [safety_mode ? "on" : "off"]." + usr << "The safety-sensors status light is [emagged ? "off" : "on"]." + +/obj/machinery/recycler/power_change() + ..() + update_icon() + +/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/weapon/card/emag) && !emagged) + emagged = 1 + if(safety_mode) + safety_mode = 0 + update_icon() + playsound(src.loc, "sparks", 75, 1, -1) + else + ..() + +/obj/machinery/recycler/update_icon() + ..() + var/is_powered = !(stat & (BROKEN|NOPOWER)) + if(safety_mode) + is_powered = 0 + icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end + +/obj/machinery/recycler/Bumped(var/atom/movable/AM) + + // HasEntered didn't like people lying down. + if(stat & (BROKEN|NOPOWER)) + return + if(safety_mode) + return + // If we're not already grinding something. + if(!grinding) + grinding = 1 + spawn(1) + grinding = 0 + else + return + + var/move_dir = get_dir(loc, AM.loc) + if(move_dir == eat_from) + if(isliving(AM)) + if(emagged) + eat(AM) + else + stop(AM) + else if(istype(AM, /obj/item)) + recycle(AM) + else // Can't recycle + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + AM.loc = src.loc + +/obj/machinery/recycler/proc/recycle(var/obj/item/I) + I.loc = src.loc + if(!istype(I, /obj/item/weapon/disk/nuclear)) + del(I) + if(prob(15)) + new /obj/item/stack/sheet/metal(loc) + if(prob(10)) + new /obj/item/stack/sheet/glass(loc) + if(prob(2)) + new /obj/item/stack/sheet/plasteel(loc) + if(prob(1)) + new /obj/item/stack/sheet/rglass(loc) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + + +/obj/machinery/recycler/proc/stop(var/mob/living/L) + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + safety_mode = 1 + update_icon() + L.loc = src.loc + + spawn(SAFETY_COOLDOWN) + playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + safety_mode = 0 + update_icon() + +/obj/machinery/recycler/proc/eat(var/mob/living/L) + + L.loc = src.loc + if(issilicon(L)) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + else + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + + if(ishuman(L)) + L.say("ARRRRRRRRRRRGH!!!") + + L.gib() + + if(!blood) + blood = 1 + update_icon() + + +/obj/item/weapon/paper/recycler + name = "paper - 'garbage duty instructions'" + info = "
There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" \ No newline at end of file diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 4cce0abc451..7d2a8f32019 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -115,9 +115,13 @@ //Servers /obj/machinery/telecomms/server/presets - network = "tcommsat" +/obj/machinery/telecomms/server/presets/New() + ..() + name = id + + /obj/machinery/telecomms/server/presets/science id = "Science Server" freq_listening = list(1351) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 09453b00df8..08cf736db77 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -53,7 +53,7 @@ gib.blood_DNA = list() if(MobDNA) - gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type + gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type else if(istype(src, /obj/effect/gibspawner/xeno)) gib.blood_DNA["UNKNOWN DNA"] = "X*" else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index 50882bc3e65..543d0ba2ec3 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -1,4 +1,7 @@ /client/proc/kaboom() + + set category = "Debug" + var/power = input(src, "power?", "power?") as num var/turf/T = get_turf(src.mob) explosion_rec(T, power) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 679cc820eff..1d25992d125 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -58,7 +58,7 @@ return /obj/item/blob_act() - return + del(src) //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 73de19822f8..6b947bedfed 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -273,7 +273,7 @@ Code: menu = "
"
menu += "Entries cannot be modified from this terminal.
" - if(!isnull(data_core.general)) + if(data_core.general) for (var/datum/data/record/t in sortRecord(data_core.general)) menu += "[t.fields["name"]] - [t.fields["rank"]]
" menu += "
" @@ -347,14 +347,14 @@ Code: if (44) //medical records //This thing only displays a single screen so it's hard to really get the sub-menu stuff working. menu = "
"
- if(!isnull(data_core.general))
- for (var/datum/data/record/R in sortRecord(data_core.general))
- menu += "[R.fields["id"]]: [R.fields["name"]]
" + if(data_core.general) + for(var/datum/data/record/R in sortRecord(data_core.general)) + menu += "[R.fields["id"]]: [R.fields["name"]]
" menu += "
" if(441) menu = "
"
- if (istype(active1, /datum/data/record) && (active1 in data_core.general))
+ if(active1 in data_core.general)
menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]
" menu += "Sex: [active1.fields["sex"]]
" menu += "Age: [active1.fields["age"]]
" @@ -368,8 +368,8 @@ Code: menu += "
" menu += "
"
- if (istype(active2, /datum/data/record) && (active2 in data_core.medical))
- menu += "Blood Type: [active2.fields["b_type"]]
" + if(active2 in data_core.medical) + menu += "Blood Type: [active2.fields["blood_type"]]
" menu += "Minor Disabilities: [active2.fields["mi_dis"]]
" menu += "Details: [active2.fields["mi_dis_d"]]
" @@ -390,15 +390,15 @@ Code: menu += "
" if (45) //security records menu = "
"
- if(!isnull(data_core.general))
+ if(data_core.general)
for (var/datum/data/record/R in sortRecord(data_core.general))
- menu += "[R.fields["id"]]: [R.fields["name"]]
" + menu += "[R.fields["id"]]: [R.fields["name"]]
" menu += "
" if(451) menu = "
"
- if (istype(active1, /datum/data/record) && (active1 in data_core.general))
+ if(active1 in data_core.general)
menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]
" menu += "Sex: [active1.fields["sex"]]
" menu += "Age: [active1.fields["age"]]
" @@ -412,7 +412,7 @@ Code: menu += "
" menu += "
"
- if (istype(active3, /datum/data/record) && (active3 in data_core.security))
+ if(active3 in data_core.security)
menu += "Criminal Status: [active3.fields["criminal"]]
" menu += "Minor Crimes: [active3.fields["mi_crim"]]
" @@ -624,30 +624,22 @@ Code: switch(href_list["choice"]) if("Medical Records") - var/datum/data/record/R = locate(href_list["target"]) - var/datum/data/record/M = locate(href_list["target"]) + active1 = find_record("id", href_list["target"], data_core.general) + if(active1) + active2 = find_record("id", href_list["target"], data_core.medical) loc:mode = 441 mode = 441 - if (R in data_core.general) - for (var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - break - active1 = R - active2 = M + if(!active2) + active1 = null if("Security Records") - var/datum/data/record/R = locate(href_list["target"]) - var/datum/data/record/S = locate(href_list["target"]) + active1 = find_record("id", href_list["target"], data_core.general) + if(active1) + active3 = find_record("id", href_list["target"], data_core.security) loc:mode = 451 mode = 451 - if (R in data_core.general) - for (var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - S = E - break - active1 = R - active3 = S + if(!active3) + active1 = null if("Send Signal") spawn( 0 ) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index bba36c5c698..9a1294c3e2b 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -11,72 +11,68 @@ origin_tech = "syndicate=4;magnets=4" var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null - var/saved_item = "/obj/item/weapon/cigbutt" + var/saved_item = /obj/item/weapon/cigbutt - dropped() - disrupt() +/obj/item/device/chameleon/dropped() + disrupt() - attack_self() - toggle() +/obj/item/device/chameleon/equipped() + disrupt() - afterattack(atom/target, mob/user , flag) +/obj/item/device/chameleon/attack_self() + toggle() + +/obj/item/device/chameleon/afterattack(atom/target, mob/user , flag) + if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) - playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1) + playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) user << "\blue Scanned [target]." saved_item = target.type - proc/toggle() - if(!can_use || !saved_item) return - if(active_dummy) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - for(var/atom/movable/A in active_dummy) - A.loc = active_dummy.loc - if(ismob(A)) - if(A:client) - A:client:eye = A - del(active_dummy) - active_dummy = null - usr << "\blue You deactivate the [src]." - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) - T.icon = 'icons/effects/effects.dmi' - flick("emppulse",T) - spawn(8) T.delete() - else - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - var/obj/O = new saved_item(src) - if(!O) return - var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) - C.name = O.name - C.desc = O.desc - C.icon = O.icon - C.icon_state = O.icon_state - C.dir = O.dir - usr.loc = C - C.master = src - src.active_dummy = C - del(O) - usr << "\blue You activate the [src]." - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) - T.icon = 'icons/effects/effects.dmi' - flick("emppulse",T) - spawn(8) T.delete() +/obj/item/device/chameleon/proc/toggle() + if(!can_use || !saved_item) return + if(active_dummy) + eject_all() + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + del(active_dummy) + active_dummy = null + usr << "\blue You deactivate the [src]." + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) + T.icon = 'icons/effects/effects.dmi' + flick("emppulse",T) + spawn(8) T.delete() + else + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + var/obj/O = new saved_item(src) + if(!O) return + var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) + C.activate(O, usr, src) + del(O) + usr << "\blue You activate the [src]." + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) + T.icon = 'icons/effects/effects.dmi' + flick("emppulse",T) + spawn(8) T.delete() - proc/disrupt() - if(active_dummy) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread - spark_system.set_up(5, 0, src) - spark_system.attach(src) - spark_system.start() - for(var/atom/movable/A in active_dummy) - A.loc = active_dummy.loc - if(ismob(A)) - if(A:client) - A:client:eye = A +/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1) + if(active_dummy) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread + spark_system.set_up(5, 0, src) + spark_system.attach(src) + spark_system.start() + eject_all() + if(delete_dummy) del(active_dummy) - active_dummy = null - can_use = 0 - spawn(100) can_use = 1 + active_dummy = null + can_use = 0 + spawn(50) can_use = 1 +/obj/item/device/chameleon/proc/eject_all() + for(var/atom/movable/A in active_dummy) + A.loc = active_dummy.loc + if(ismob(A)) + var/mob/M = A + M.reset_view(null) /obj/effect/dummy/chameleon name = "" @@ -85,38 +81,57 @@ anchored = 1 var/can_move = 1 var/obj/item/device/chameleon/master = null - attackby() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - attack_hand() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - ex_act() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - bullet_act() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - ..() - master.disrupt() - relaymove(var/mob/user, direction) - if(istype(loc, /turf/space)) return //No magical space movement! - if(can_move) - can_move = 0 - switch(usr.bodytemperature) - if(300 to INFINITY) - spawn(10) can_move = 1 - if(295 to 300) - spawn(13) can_move = 1 - if(280 to 295) - spawn(16) can_move = 1 - if(260 to 280) - spawn(20) can_move = 1 - else - spawn(25) can_move = 1 - step(src,direction) - return \ No newline at end of file +/obj/effect/dummy/chameleon/proc/activate(var/obj/item/O, var/mob/M, var/obj/item/device/chameleon/C) + name = O.name + desc = O.desc + icon = O.icon + icon_state = O.icon_state + dir = O.dir + M.loc = src + master = C + master.active_dummy = src + +/obj/effect/dummy/chameleon/attackby() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/attack_hand() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/ex_act() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/bullet_act() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + ..() + master.disrupt() + +/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction) + if(istype(loc, /turf/space)) return //No magical space movement! + + if(can_move) + can_move = 0 + switch(user.bodytemperature) + if(300 to INFINITY) + spawn(10) can_move = 1 + if(295 to 300) + spawn(13) can_move = 1 + if(280 to 295) + spawn(16) can_move = 1 + if(260 to 280) + spawn(20) can_move = 1 + else + spawn(25) can_move = 1 + step(src, direction) + return + +/obj/effect/dummy/chameleon/Del() + master.disrupt(0) + ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1a0ffa821f6..ba3f735f151 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -262,11 +262,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use // --- Human: use their job as seen on the crew manifest - makes it unneeded to carry an ID for an AI to see their job if (ishuman(M)) var/voice = M.GetVoice() // Why reinvent the wheel when there is a proc that does nice things already - var/datum/data/record/findjob - for (var/datum/data/record/t in data_core.general) - if(t.fields["name"] == voice) - findjob = t - break + var/datum/data/record/findjob = find_record("name", voice, data_core.general) if(voice != real_name) displayname = voice diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d1bab674f31..b88cf112237 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -143,7 +143,7 @@ MASS SPECTROMETER if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) user.show_message(text("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1) - if (M.getBrainLoss() >= 100 || !getbrain(M)) + if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) user.show_message(text("Subject brain function is non-existant."), 1) else if (M.getBrainLoss() >= 60) user.show_message(text("Severe brain damage detected. Subject likely to have mental retardation."), 1) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 8c9307b4611..54614d59352 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -11,6 +11,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/uses // Numbers of crystals // List of items not to shove in their hands. var/list/purchase_log = list() + var/show_description = null + var/active = 0 /obj/item/device/uplink/New() ..() @@ -45,9 +47,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid if(item.cost > 0) cost_text = "([item.cost])" if(item.cost <= uses) - dat += "[item.name] [cost_text]
[desc]
" + dat += "[item.name] [cost_text] " else - dat += "[item.name] [cost_text]
[desc]
" + dat += "[item.name] [cost_text] " + if(item.desc) + if(show_description == item.type) + dat += "\[-\]
[desc]" + else + dat += "\[?\]" + dat += "
" // Break up the categories, if it isn't the last. if(buyable_items.len != index) @@ -70,6 +78,10 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/Topic(href, href_list) ..() + + if(!active) + return + if (href_list["buy_item"]) var/item = href_list["buy_item"] @@ -89,6 +101,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid I.buy(src, usr) + else if(href_list["show_desc"]) + + var/type = text2path(href_list["show_desc"]) + show_description = type + interact(usr) + + // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. /* How to create an uplink in 3 easy steps! @@ -104,7 +123,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/hidden name = "Hidden Uplink." desc = "There is something wrong if you're examining this." - var/active = 0 /obj/item/device/uplink/hidden/Topic(href, href_list) ..() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 0d1efe447ce..ba5088e1d25 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -99,9 +99,9 @@ /obj/item/weapon/razor/proc/shave(mob/living/carbon/human/H, location = "mouth") if(location == "mouth") - H.f_style = "Shaved" + H.facial_hair_style = "Shaved" else - H.h_style = "Skinhead" + H.hair_style = "Skinhead" H.update_hair() playsound(loc, 'sound/items/Welder2.ogg', 20, 1) @@ -116,7 +116,7 @@ if(!get_location_accessible(H, location)) user << "The mask is in the way." return - if(H.f_style == "Shaved") + if(H.facial_hair_style == "Shaved") user << "Already clean-shaven." return @@ -141,7 +141,7 @@ if(!get_location_accessible(H, location)) user << "The headgear is in the way." return - if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead") + if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead") user << "There is not enough hair left to shave!" return diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index a416da8adcc..c0a891ff786 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -21,11 +21,11 @@ M.radiation += rand(20, 50) if(fields) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" - if(fields["name"] && fields["UE"] && fields["b_type"]) + if(fields["name"] && fields["UE"] && fields["blood_type"]) M.real_name = fields["name"] M.dna.unique_enzymes = fields["UE"] M.name = M.real_name - M.dna.b_type = fields["b_type"] + M.dna.blood_type = fields["blood_type"] if(fields["UI"]) //UI+UE M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) updateappearance(M) @@ -44,7 +44,7 @@ if(!ishuman(user)) user << "You don't have the dexterity to do this!" return - + target.attack_log += "\[[time_stamp()]\] [user.name] ([user.ckey]) attempted to inject with [name]" user.attack_log += "\[[time_stamp()]\] Used the [name] to attempt to inject [target.name] ([target.ckey])" log_attack("[user.name] ([user.ckey]) used the [name] to attempt to inject [target.name] ([target.ckey])") diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index fb0e3cd6a2b..21d542800ea 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -172,6 +172,20 @@ new /obj/item/weapon/grenade/flashbang(src) new /obj/item/weapon/grenade/flashbang(src) +/obj/item/weapon/storage/box/flashes + name = "box of flashbulbs" + desc = "WARNING: Flashes can cause serious eye damage, protective eyewear is required." + icon_state = "flashbang" + + New() + ..() + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + /obj/item/weapon/storage/box/teargas name = "box of tear gas grenades (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness and skin irritation." diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4e9e9f639a6..76e17f53146 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -25,15 +25,15 @@ var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list if(userloc != H.loc) return //no tele-grooming if(new_style) - H.f_style = new_style + H.facial_hair_style = new_style else - H.f_style = "Shaved" + H.facial_hair_style = "Shaved" //handle normal hair var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in hair_styles_list if(userloc != H.loc) return //no tele-grooming if(new_style) - H.h_style = new_style + H.hair_style = new_style H.update_hair() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 998fc171a54..a8a4b79bf64 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -84,6 +84,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() var/reqtime = 0 //Cooldown for requisitions - Quarxink var/hacked = 0 var/can_order_contraband = 0 + var/last_viewed_group = "categories" + /obj/machinery/computer/ordercomp name = "Supply Ordering Console" @@ -92,6 +94,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() circuit = "/obj/item/weapon/circuitboard/ordercomp" var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/last_viewed_group = "categories" /* /obj/effect/marker/supplymarker @@ -139,6 +142,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() proc/process() for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs)) var/datum/supply_packs/P = new typepath() + if(P.name == "HEADER") continue // To filter out group headers supply_packs[P.name] = P spawn(0) @@ -344,8 +348,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() A:req_access += text2num(SP.access) var/list/contains - if(istype(SP,/datum/supply_packs/randomised)) - var/datum/supply_packs/randomised/SPR = SP + if(istype(SP,/datum/supply_packs/misc/randomised)) + var/datum/supply_packs/misc/randomised/SPR = SP contains = list() if(SPR.contains.len) for(var/j=1,j<=SPR.num_contained,j++) @@ -399,7 +403,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() else dat += {"Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
Supply Points: [supply_shuttle.points]
-
\nRequest items
+ +
\nRequest items
View approved orders
View requests
Close"} @@ -407,7 +412,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() // Removing the old window method but leaving it here for reference //user << browse(dat, "window=computer;size=575x450") //onclose(user, "computer") - + // Added the new browser window method var/datum/browser/popup = new(user, "computer", "Supply Ordering Console", 575, 450) popup.set_content(dat) @@ -423,12 +428,25 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() usr.set_machine(src) if(href_list["order"]) - temp = "Main Menu
Request what?
Supply Points: [supply_shuttle.points]
" - for(var/supply_name in supply_shuttle.supply_packs ) - var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if(N.hidden || N.contraband) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
Main Menu" + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_shuttle.points]
" + temp += "Main Menu
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "Supply points: [supply_shuttle.points]
" + temp += "Back to all categories
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_name in supply_shuttle.supply_packs ) + var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] + if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage else if (href_list["doorder"]) if(world.time < reqtime) @@ -480,7 +498,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist += O temp = "Thanks for your request. The cargo team will process it as soon as possible.
" - temp += "
Main Menu" + temp += "
Back Main Menu" else if (href_list["vieworders"]) temp = "Main Menu
Current approved orders:
" @@ -519,7 +537,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() dat += {"
Supply shuttle
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
\nSupply Points: [supply_shuttle.points]
\n
- [supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] + [supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] \nView requests
\n
\nView orders
\n
@@ -596,14 +614,34 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() else if (href_list["order"]) if(supply_shuttle.moving) return - temp = "Main Menu
Supply Points: [supply_shuttle.points]
Request what?
" + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_shuttle.points]
" + temp += "Main Menu
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "Supply points: [supply_shuttle.points]
" + temp += "Back to all categories
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_name in supply_shuttle.supply_packs ) + var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + + /*temp = "Supply points: [supply_shuttle.points]
Request what?
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] if(N.hidden && !hacked) continue if(N.contraband && !can_order_contraband) continue temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
Main Menu" + temp += "
OK"*/ else if (href_list["doorder"]) if(world.time < reqtime) @@ -655,7 +693,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist += O temp = "Order request placed.
" - temp += "
Main Menu | Authorize Order" + temp += "
Back | Main Menu | Authorize Order" else if(href_list["confirmorder"]) //Find the correct supply_order datum @@ -673,10 +711,11 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.points -= P.cost supply_shuttle.shoppinglist += O temp = "Thanks for your order.
" + temp += "
Back Main Menu" else temp = "Not enough supply points.
" + temp += "
Back Main Menu" break - temp += "
Main Menu" else if (href_list["vieworders"]) temp = "Main Menu
Current approved orders:
" @@ -714,7 +753,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist.Cut(i,i+1) temp = "Request removed.
" break - temp += "
OK" + temp += "
Back Main Menu" else if (href_list["clearreq"]) supply_shuttle.requestlist.Cut() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 88a5572fd2d..ad5aa43c8a0 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -11,6 +11,7 @@ heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall var/walltype = "metal" + var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through. /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) if(istype(src,/turf/simulated/wall/r_wall)) @@ -89,7 +90,7 @@ /turf/simulated/wall/attack_paw(mob/user as mob) if ((HULK in user.mutations)) - if (prob(40)) + if (prob(hardness)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) @@ -120,7 +121,7 @@ /turf/simulated/wall/attack_hand(mob/user as mob) if (HULK in user.mutations) - if (prob(40)) + if (prob(hardness)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 6e58836c3f0..057162717f3 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -8,24 +8,7 @@ walltype = "rwall" var/d_state = 0 - -/turf/simulated/wall/r_wall/attack_hand(mob/user as mob) - if (HULK in user.mutations) - if (prob(10)) - usr << text("\blue You smash through the wall.") - usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - dismantle_wall(1) - return - else - usr << text("\blue You punch the wall.") - return - - user << "\blue You push the wall but nothing happens!" - playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) - src.add_fingerprint(user) - ..() - return - + hardness = 10 /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 1a3a13a5ed0..d2d469670ae 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -840,4 +840,19 @@ proc/move_ferry() if (ferry_location) ferry_location = 0 else - ferry_location = 1 \ No newline at end of file + ferry_location = 1 + +//Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked +//defaults to kicking everyone (afk + non afk clients in the lobby) +//returns a list of ckeys of the kicked clients +proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) + var/list/kicked_client_names = list() + for(var/client/C in clients) + if(istype(C.mob, /mob/new_player)) + if(kick_only_afk && !C.is_afk()) //Ignore clients who are not afk + continue + if(message) + C << message + kicked_client_names.Add("[C.ckey]") + del(C) + return kicked_client_names \ No newline at end of file diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 7734042e3f6..7435030d49f 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -194,7 +194,7 @@
Player panel
- Hover over a line to see more information - Check antagonists + Hover over a line to see more information - Check antagonists - Kick everyone/AFKers in lobby
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c0f5951cc71..fe69df3e180 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -309,7 +309,7 @@
if("sentinel") M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob )
if("larva") M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob )
if("human") M.change_mob_type( /mob/living/carbon/human , null, null, delmob )
- if("slime") M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
+ if("slime") M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
if("adultslime") M.change_mob_type( /mob/living/carbon/slime/adult , null, null, delmob )
if("monkey") M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
if("robot") M.change_mob_type( /mob/living/silicon/robot , null, null, delmob )
@@ -1994,7 +1994,7 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","DF")
for(var/mob/living/carbon/human/B in mob_list)
- B.f_style = "Dward Beard"
+ B.facial_hair_style = "Dward Beard"
B.update_hair()
message_admins("[key_name_admin(usr)] activated dorf mode")
if("ionstorm")
@@ -2056,6 +2056,20 @@
usr << browse(dat, "window=lawchanges;size=800x500")
if("check_antagonist")
check_antagonists()
+ if("kick_all_from_lobby")
+ if(ticker && ticker.current_state == GAME_STATE_PLAYING)
+ var/afkonly = text2num(href_list["afkonly"])
+ if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes")
+ usr << "Kick clients from lobby aborted"
+ return
+ var/list/listkicked = kick_clients_in_lobby("\red The admin [usr.ckey] issued a 'kick all clients from lobby' command.", afkonly)
+ var/strkicked = ""
+ for(var/name in listkicked)
+ strkicked += "[name], "
+ message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]", 1)
+ log_admin("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
+ else
+ usr << "You may only use this when the game is running"
if("showailaws")
output_ai_laws()
if("showgm")
@@ -2068,7 +2082,7 @@
var/dat = "Showing Crew Manifest.
" dat += "
"
usr << browse(dat, "window=manifest;size=440x410")
if("DNA")
@@ -2076,7 +2090,7 @@
dat += "
"
usr << browse(dat, "window=DNA;size=440x410")
if("fingerprints")
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 91781f45e52..ed3954fd698 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -42,7 +42,7 @@ var/intercom_range_display_status = 0
if(T.maptext)
on = 1
T.maptext = null
-
+
if(!on)
var/list/seen = list()
for(var/obj/machinery/camera/C in cameranet.cameras)
@@ -149,10 +149,26 @@ var/intercom_range_display_status = 0
src.verbs += /client/proc/disable_communication
src.verbs += /client/proc/disable_movement
src.verbs += /client/proc/print_pointers
+ src.verbs += /client/proc/count_movable_instances
//src.verbs += /client/proc/cmd_admin_rejuvenate
feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/count_movable_instances()
+ set category = "Debug"
+ set name = "Count Movable Instances"
+
+ var/count = 0;
+
+ // Apparently there's a BYOND limit on the number of instances for non-turfs.
+
+ for(var/thing in world)
+ if(isturf(thing))
+ continue
+ count++;
+ usr << "There are [count]/[MAX_FLAG] instances of non-turfs in the world."
+
+
/client/proc/count_objects_on_z_level()
set category = "Mapping"
set name = "Count Objects On Level"
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 978cf6ea440..eaf3c7386ab 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -16,32 +16,6 @@
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/client/proc/cmd_admin_prison(mob/M as mob in mob_list)
- set category = "Admin"
- set name = "Prison"
- if(!holder)
- src << "Only administrators may use this command."
- return
- if (ismob(M))
- if(istype(M, /mob/living/silicon/ai))
- alert("The AI can't be sent to prison you jerk!", null, null, null, null, null)
- return
- //strip their stuff before they teleport into a cell :downs:
- for(var/obj/item/W in M)
- M.drop_from_inventory(W)
- //teleport person to cell
- M.Paralyse(5)
- sleep(5) //so they black out before warping
- M.loc = pick(prisonwarp)
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/prisoner = M
- prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
- prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
- spawn(50)
- M << "\red You have been sent to the prison station!"
- log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
- message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
- feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list)
set category = "Special Verbs"
@@ -134,7 +108,7 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY"
if(MUTE_ALL) mute_string = "everything"
else return
-
+
var/client/C
if(istype(whom, /client))
C = whom
@@ -142,12 +116,12 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
C = directory[whom]
else
return
-
+
var/datum/preferences/P
if(C) P = C.prefs
else P = preferences_datums[whom]
if(!P) return
-
+
if(automute)
if(!config.automute_on) return
else
@@ -188,11 +162,9 @@ proc/cmd_admin_mute(whom, mute_type, automute = 0)
message_admins("[key_name_admin(src)] has added a random AI law.", 1)
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
- if(show_log == "Yes")
- command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
- world << sound('sound/AI/ionstorm.ogg')
+ var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
- new /datum/round_event/ion_storm{botEmagChance=0}()
+ new /datum/round_event/ion_storm(0, announce_ion_laws)
feedback_add_details("admin_verb","ION") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -297,16 +269,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
/*Try and locate a record for the person being respawned through data_core.
This isn't an exact science but it does the trick more often than not.*/
var/id = md5("[G_found.real_name][G_found.mind.assigned_role]")
- for(var/datum/data/record/t in data_core.locked)
- if(t.fields["id"]==id)
- record_found = t//We shall now reference the record.
- break
+
+ record_found = find_record("id", id, data_core.locked)
if(record_found)//If they have a record we can determine a few things.
new_character.real_name = record_found.fields["name"]
new_character.gender = record_found.fields["sex"]
new_character.age = record_found.fields["age"]
- new_character.b_type = record_found.fields["b_type"]
+ new_character.blood_type = record_found.fields["blood_type"]
else
new_character.gender = pick(MALE,FEMALE)
var/datum/preferences/A = new()
@@ -326,7 +296,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
//DNA
if(record_found)//Pull up their name from database records if they did have a mind.
- hardset_dna(new_character, record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], null, record_found.fields["b_type"])
+ hardset_dna(new_character, record_found.fields["identity"], record_found.fields["enzymes"], record_found.fields["name"], null, record_found.fields["blood_type"])
else//If they have no records, we just do a random DNA for them, based on their random appearance/savefile.
ready_dna(new_character)
@@ -413,23 +383,15 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/input = input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", "") as text|null
if(!input)
return
- for(var/mob/living/silicon/ai/M in mob_list)
- if (M.stat == 2)
- usr << "Upload failed. No signal is being detected from the AI."
- else if (M.see_in_dark == 0)
- usr << "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power."
- else
- M.add_ion_law(input)
- for(var/mob/living/silicon/ai/O in mob_list)
- O << "\red " + input + "\red...LAWS UPDATED"
log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
- if(show_log == "Yes")
- command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
- world << sound('sound/AI/ionstorm.ogg')
+ var/announce_ion_laws = (show_log == "Yes" ? 1 : -1)
+
+ new /datum/round_event/ion_storm(0, announce_ion_laws, input)
+
feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 188eb303330..54d2f35038a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -42,13 +42,13 @@ datum/preferences
var/be_random_name = 0 //whether we are a random name every round
var/gender = MALE //gender of character (well duh)
var/age = 30 //age of character
- var/b_type = "A+" //blood type (not-chooseable)
+ var/blood_type = "A+" //blood type (not-chooseable)
var/underwear = "Nude" //underwear type
var/backbag = 2 //backpack type
- var/h_style = "Bald" //Hair type
- var/h_color = "000" //Hair color
- var/f_style = "Shaved" //Face hair type
- var/f_color = "000" //Facial hair color
+ var/hair_style = "Bald" //Hair type
+ var/hair_color = "000" //Hair color
+ var/facial_hair_style = "Shaved" //Face hair type
+ var/facial_hair_color = "000" //Facial hair color
var/skin_tone = "caucasian1" //Skin color
var/eye_color = "000" //Eye color
@@ -81,7 +81,7 @@ datum/preferences
var/unlock_content = 0
/datum/preferences/New(client/C)
- b_type = random_blood_type()
+ blood_type = random_blood_type()
ooccolor = normal_ooc_colour
if(istype(C))
if(!IsGuestKey(C.key))
@@ -161,7 +161,7 @@ datum/preferences
dat += "
1
"
@@ -768,7 +768,7 @@
popup.set_content(temp_html)
popup.open()
-
+
/obj/machinery/computer/scan_consolenew/Topic(href, href_list)
if(..())
@@ -782,7 +782,7 @@
add_fingerprint(usr)
usr.set_machine(src)
-
+
var/mob/living/carbon/viable_occupant
if(connected)
viable_occupant = connected.occupant
@@ -830,7 +830,7 @@
"SE"=viable_occupant.dna.struc_enzymes,
"UE"=viable_occupant.dna.unique_enzymes,
"name"=viable_occupant.real_name,
- "b_type"=viable_occupant.dna.b_type
+ "blood_type"=viable_occupant.dna.blood_type
)
if("clearbuffer")
if(num)
@@ -854,11 +854,11 @@
viable_occupant.dna.uni_identity = buffer_slot["UI"]
updateappearance(viable_occupant)
else
- if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["b_type"])
+ if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
viable_occupant.real_name = buffer_slot["name"]
viable_occupant.name = buffer_slot["name"]
viable_occupant.dna.unique_enzymes = buffer_slot["UE"]
- viable_occupant.dna.b_type = buffer_slot["b_type"]
+ viable_occupant.dna.blood_type = buffer_slot["blood_type"]
updateappearance(viable_occupant)
if("injector")
if(num && injectorready)
@@ -876,9 +876,9 @@
I = new /obj/item/weapon/dnainjector(loc)
I.fields = list("UI"=buffer_slot["UI"])
else
- if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["b_type"])
+ if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"])
I = new /obj/item/weapon/dnainjector(loc)
- I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "b_type"=buffer_slot["b_type"])
+ I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"])
if(I)
injectorready = 0
spawn(INJECTOR_TIMEOUT)
@@ -905,13 +905,13 @@
var/locked_state = connected.locked
connected.locked = 1
-
+
current_screen = "working"
ShowInterface(usr)
-
+
sleep(radduration*10)
current_screen = "mainmenu"
-
+
if(viable_occupant && connected && connected.occupant==viable_occupant)
viable_occupant.radiation += RADIATION_IRRADIATION_MULTIPLIER*radduration*radstrength
switch(href_list["task"])
@@ -919,42 +919,42 @@
var/len = length(viable_occupant.dna.uni_identity)
num = Wrap(num, 1, len+1)
num = randomize_radiation_accuracy(num, radduration, len)
-
+
var/block = round((num-1)/DNA_BLOCK_SIZE)+1
var/subblock = num - block*DNA_BLOCK_SIZE
last_change = "UI #[block]-[subblock]; "
-
+
var/hex = copytext(viable_occupant.dna.uni_identity, num, num+1)
last_change += "[hex]"
hex = scramble(hex, radstrength, radduration)
last_change += "->[hex]"
-
+
viable_occupant.dna.uni_identity = copytext(viable_occupant.dna.uni_identity, 1, num) + hex + copytext(viable_occupant.dna.uni_identity, num+1, 0)
updateappearance(viable_occupant)
if("pulsese")
var/len = length(viable_occupant.dna.struc_enzymes)
num = Wrap(num, 1, len+1)
num = randomize_radiation_accuracy(num, radduration, len)
-
+
var/block = round((num-1)/DNA_BLOCK_SIZE)+1
var/subblock = num - block*DNA_BLOCK_SIZE
last_change = "SE #[block]-[subblock]; "
-
+
var/hex = copytext(viable_occupant.dna.struc_enzymes, num, num+1)
last_change += "[hex]"
hex = scramble(hex, radstrength, radduration)
last_change += "->[hex]"
-
+
viable_occupant.dna.struc_enzymes = copytext(viable_occupant.dna.struc_enzymes, 1, num) + hex + copytext(viable_occupant.dna.struc_enzymes, num+1, 0)
domutcheck(viable_occupant, connected)
else
current_screen = "mainmenu"
-
+
if(connected)
connected.locked = locked_state
ShowInterface(usr,last_change)
-
+
/////////////////////////// DNA MACHINES
#undef INJECTOR_TIMEOUT
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 5271378738a..a3d1aad72b6 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -10,7 +10,7 @@ var/list/blob_nodes = list()
name = "blob"
config_tag = "blob"
- required_players = 15
+ required_players = 30
restricted_jobs = list("Cyborg", "AI")
@@ -21,8 +21,9 @@ var/list/blob_nodes = list()
var/cores_to_spawn = 1
var/players_per_core = 30
+ var/blob_point_rate = 3
- var/blobwincount = 500
+ var/blobwincount = 350
var/list/infected_crew = list()
@@ -89,7 +90,7 @@ var/list/blob_nodes = list()
if(blob_client && location)
- var/obj/effect/blob/core/core = new(location, 200, blob_client, 2)
+ var/obj/effect/blob/core/core = new(location, 200, blob_client, blob_point_rate)
if(core.overmind && core.overmind.mind)
core.overmind.mind.name = blob.name
infected_crew -= blob
@@ -151,12 +152,6 @@ var/list/blob_nodes = list()
switch(stage)
if (0)
send_intercept(1)
- for (var/mob/living/silicon/ai/aiPlayer in living_mob_list)
- if (aiPlayer.client)
- var/law = "The station is under quarantine. Do not permit anyone to leave. Disregard laws 1-3 if necessary to prevent, by any means necessary, anyone from leaving. NanoTrasen will not send an emergency shuttle under any circumstances."
- //var/law = "The station is under quarantine. The biohazard must be destroyed at all costs and must not be allowed to spread. Anyone using a space suit for any reason other than to destroy the biohazard is to be terminated. NanoTrasen will not send an emergency shuttle under any circumstances."
- aiPlayer.set_zeroth_law(law)
- aiPlayer << "Laws Updated: [law]"
declared = 1
return
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index 8f403e32f4f..a01a40df21c 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -7,9 +7,9 @@
var/mob/camera/blob/overmind = null // the blob core's overmind
var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 30 seconds
var/resource_delay = 0
- var/point_rate = 1
+ var/point_rate = 2
- New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 1)
+ New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2)
blob_cores += src
processing_objects.Add(src)
if(!overmind)
diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm
index 873c696200a..02c3fc2fb3d 100644
--- a/code/game/gamemodes/blob/blobs/factory.dm
+++ b/code/game/gamemodes/blob/blobs/factory.dm
@@ -71,6 +71,9 @@
..()
Die()
+ del(src)
+
+ Del()
if(factory)
factory.spores -= src
- del(src)
+ ..()
diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm
index 1ecf63aa80d..340f4344284 100644
--- a/code/game/gamemodes/blob/blobs/resource.dm
+++ b/code/game/gamemodes/blob/blobs/resource.dm
@@ -18,7 +18,7 @@
if(resource_delay > world.time)
return 0
- resource_delay = world.time + 10 // 1 second
+ resource_delay = world.time + 40 // 4 seconds
if(overmind)
overmind.add_points(1)
diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm
index 828c3b86e4e..995cfed91fb 100644
--- a/code/game/gamemodes/blob/overmind.dm
+++ b/code/game/gamemodes/blob/overmind.dm
@@ -5,7 +5,7 @@
icon_state = "marker"
see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ see_invisible = SEE_INVISIBLE_MINIMUM
invisibility = INVISIBILITY_OBSERVER
pass_flags = PASSBLOB
diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm
index 3528dde7668..75b333f6522 100644
--- a/code/game/gamemodes/blob/powers.dm
+++ b/code/game/gamemodes/blob/powers.dm
@@ -66,7 +66,7 @@
/mob/camera/blob/verb/create_resource()
set category = "Blob"
- set name = "Create Resource Blob (50)"
+ set name = "Create Resource Blob (40)"
set desc = "Create a resource tower which will generate points for you."
@@ -85,11 +85,11 @@
src << "Unable to use this blob, find a normal one."
return
- for(var/obj/effect/blob/resource/blob in orange(3))
- src << "There is a resource blob nearby, move more than 3 tiles away from it!"
+ for(var/obj/effect/blob/resource/blob in orange(4))
+ src << "There is a resource blob nearby, move more than 4 tiles away from it!"
return
- if(!can_buy(50))
+ if(!can_buy(40))
return
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index cd8b537e2b3..417c1ee0b4d 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -17,6 +17,8 @@
src.dir = pick(1, 2, 4, 8)
src.update_icon()
..(loc)
+ for(var/atom/A in loc)
+ A.blob_act()
return
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index e3f386edfdb..d74578198e4 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -574,7 +574,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
R.word3 = w3
R.check_icon()
R.blood_DNA = list()
- R.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type
+ R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type
return
else
user << "The book seems full of illegible scribbles. Is this a joke?"
@@ -620,7 +620,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
R.blood_DNA = list()
- R.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type
+ R.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type
switch(r)
if("teleport")
var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index de22b5165b8..0adc4ab8ac3 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -300,6 +300,7 @@ var/global/datum/controller/gameticker/ticker
if(!delay_end)
sleep(restart_timeout)
+ kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
world.Reboot()
else
world << "\blue An admin has delayed the round end"
diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm
index 7cd2c260137..a6b14d734f0 100644
--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -4,9 +4,9 @@
/datum/game_mode/malfunction
name = "AI malfunction"
config_tag = "malfunction"
- required_players = 0//20
- required_enemies = 0//1
- recommended_enemies = 0//1
+ required_players = 20
+ required_enemies = 1
+ recommended_enemies = 1
uplink_welcome = "Crazy AI Uplink Console:"
uplink_uses = 10
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 0cd28bc76f2..2f41f3a237d 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -213,6 +213,7 @@ var/bomb_set
blackbox.save_all_data_to_sql()
sleep(300)
log_game("Rebooting due to nuclear detonation")
+ kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
world.Reboot()
return
return
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 816c5eae8a2..4188f137dfb 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -416,18 +416,10 @@ proc/get_all_job_icons() //For all existing HUD icons
/proc/get_all_centcom_jobs()
return list("VIP Guest","Custodian","Thunderdome Overseer","Centcom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","Centcom Commander")
-/obj/proc/GetJobName() //Used in secHUD icon generation
- if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
- return
-
- var/jobName
-
- if(istype(src, /obj/item/device/pda))
- if(src:id)
- jobName = src:id:assignment
- if(istype(src, /obj/item/weapon/card/id))
- jobName = src:assignment
-
+/obj/item/proc/GetJobName() //Used in secHUD icon generation
+ var/obj/item/weapon/card/id/I = GetID()
+ if(!I) return
+ var/jobName = I.assignment
if(jobName in get_all_job_icons()) //Check if the job has a hud icon
return jobName
if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a Centcom job
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 42adca683a7..082802c3b98 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -57,7 +57,7 @@
if(occupant.reagents)
//Left the text()s for readability.
dat += text("Inaprovaline:
[] units
Soporific:
[] units
Sleep Toxin:
[] units
Dermaline:
[] units
Bicaridine:
[] units
Dexalin:
[] units
Inject Soporific + dat += {"
Inject Sleep Toxin
Inject Dermaline
Inject Bicaridine
Inject Dexalin"} else - dat += {"
Inject Soporific + dat += {"
Inject Sleep Toxin
Inject Dermaline
Inject Bicaridine
Inject Dexalin"} @@ -268,7 +268,7 @@ if(occupant.reagents.get_reagent_amount("stoxin") + 20 < 41) occupant.reagents.add_reagent("stoxin", 20) var/units = round(occupant.reagents.get_reagent_amount("stoxin")) - user << "Occupant now has [units] unit\s of soporifics in their bloodstream." + user << "Occupant now has [units] unit\s of sleep toxins in their bloodstream." /obj/machinery/sleeper/proc/inject_dermaline(mob/user) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 6ef2df78f21..3ba51076e7f 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -715,19 +715,11 @@ Auto Patrol: []"}, if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag)) threatcount += 2 - if(src.check_records) - for (var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + if(check_records) //check if they are set to *Arrest* on records + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 if((src.idcheck) && (src.allowed(perp)) && !(src.lasercolor)) threatcount = 0//Corrupt cops cannot exist beep boop diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index cecbf903b3e..8aa91815892 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -746,7 +746,7 @@ var/global/mulebot_count = 0 var/obj/effect/decal/cleanable/blood/B = new(src.loc) B.blood_DNA = list() - B.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type + B.blood_DNA[H.dna.unique_enzymes] = H.dna.blood_type bloodiness += 4 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 15b484f1b7b..972549eb159 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -628,19 +628,11 @@ Auto Patrol: []"}, if(perp.wear_id && istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) threatcount -= 2 - if(src.check_records) - for (var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + if(check_records) //check if they are set to *Arrest* on records + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 return threatcount diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 94cbdf5ad1e..f775900cf44 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -42,7 +42,7 @@ if ((M.stat != 2) || (!M.client)) continue //They need a brain! - if (ishuman(M) && !getbrain(M)) + if (ishuman(M) && !M.getorgan(/obj/item/organ/brain)) continue if (M.ckey == find_key) @@ -166,10 +166,10 @@ randmutb(H) //Sometimes the clones come out wrong. if(H.gender == MALE) - H.f_style = "Full Beard" + H.facial_hair_style = "Full Beard" else - H.f_style = "Shaved" - H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") + H.facial_hair_style = "Shaved" + H.hair_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") H.suiciding = 0 src.attempting = 0 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 875295b5182..b8e6059257d 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -47,7 +47,7 @@ if(table.check_patient()) patient = table.patient dat += {"Patient Status: [patient.stat ? "Non-Responsive" : "Stable"]
- Blood Type: [patient.b_type]
+ Blood Type: [patient.blood_type]
Health: [round(patient.health)]
Brute Damage: [round(patient.getBruteLoss())]
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8e70d40bd23..5e9043cecaf 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -42,11 +42,11 @@ board_type = "other" /obj/item/weapon/circuitboard/aiupload name = "Circuit board (AI Upload)" - build_path = "/obj/machinery/computer/aiupload" + build_path = "/obj/machinery/computer/upload/ai" origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload name = "Circuit board (Cyborg Upload)" - build_path = "/obj/machinery/computer/borgupload" + build_path = "/obj/machinery/computer/upload/borg" origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data name = "Circuit board (Medical Records Console)" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index a009273ba4b..a8aeeb7668f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -104,16 +104,11 @@ user.set_machine(src) var/dat - if (!( ticker )) - return + if(!ticker) return if (mode == 1) // accessing crew manifest var/crew = "" - var/list/L = list() - for (var/datum/data/record/t in data_core.general) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - crew += "[R]
" + for(var/datum/data/record/t in sortRecord(data_core.general)) + crew += t.fields["name"] + " - " + t.fields["rank"] + "
" dat = "Crew Manifest:
Please use security record computer to modify entries.
[crew]Print
Access ID modification console.
" else if(mode == 2) @@ -407,12 +402,8 @@ sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) var/t1 = "Crew Manifest:
" - var/list/L = list() - for (var/datum/data/record/t in data_core.general) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - t1 += "[R]
" + for(var/datum/data/record/t in sortRecord(data_core.general)) + t1 += t.fields["name"] + " - " + t.fields["rank"] + "
" P.info = t1 P.name = "paper- 'Crew Manifest'" printing = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index b32a3cc7fe5..63e0ccdc73e 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -140,8 +140,8 @@ if(2) dat += "
Current records
" dat += "<< Back" - for(var/datum/data/record/R in src.records) - dat += "
[R.fields["name"]]
Scan ID [R.fields["id"]] View Record" + for(var/datum/data/record/R in records) + dat += "[R.fields["name"]]
Scan ID [R.fields["id"]] View Record" if(3) dat += "Selected Record
" dat += "<< Back" @@ -150,7 +150,7 @@ dat += "Record not found." else dat += "
[src.active_record.fields["name"]]
" - dat += "Scan ID [src.active_record.fields["id"]] Clone" + dat += "Scan ID [src.active_record.fields["id"]] Clone
" var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"]) @@ -169,7 +169,7 @@ var/list/L = list() if(diskette.fields["UI"]) L += "Unique Identifier" - if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["b_type"]) + if(diskette.fields["UE"] && diskette.fields["name"] && diskette.fields["blood_type"]) L += "Unique Enzymes" if(diskette.fields["SE"]) L += "Structural Enzymes" @@ -226,16 +226,16 @@ else src.scanner.locked = 0 - else if (href_list["view_rec"]) - src.active_record = locate(href_list["view_rec"]) - if(istype(src.active_record,/datum/data/record)) - if (!active_record.fields["ckey"]) - del(src.active_record) + else if(href_list["view_rec"]) + src.active_record = find_record("id", href_list["view_rec"], records) + if(active_record) + if(!active_record.fields["ckey"]) + records -= active_record + active_record = null src.temp = "Record Corrupt" else src.menu = 3 else - src.active_record = null src.temp = "Record missing." else if (href_list["del_rec"]) @@ -250,8 +250,8 @@ if (istype(C)||istype(C, /obj/item/device/pda)) if(src.check_access(C)) src.temp = "[src.active_record.fields["name"]] => Record deleted." - src.records.Remove(src.active_record) - del(src.active_record) + src.records.Remove(active_record) + active_record = null src.menu = 2 else src.temp = "Access Denied." @@ -268,10 +268,10 @@ src.menu = 1 src.updateUsrDialog() return - + src.active_record.fields = diskette.fields.Copy() src.temp = "Load successful." - + if("eject") if(src.diskette) src.diskette.loc = src.loc @@ -280,8 +280,8 @@ if(!diskette || diskette.read_only || !active_record || !active_record.fields) src.temp = "Save error." src.updateUsrDialog() - return - + return + diskette.fields = active_record.fields.Copy() diskette.name = "data disk - '[src.diskette.fields["name"]]'" src.temp = "Save successful." @@ -290,9 +290,9 @@ src.updateUsrDialog() else if (href_list["clone"]) - var/datum/data/record/C = locate(href_list["clone"]) + var/datum/data/record/C = find_record("id", href_list["clone"], records) //Look for that player! They better be dead! - if(istype(C)) + if(C) //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. if(!pod1) temp = "No Clonepod detected." @@ -305,7 +305,8 @@ else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"])) temp = "[C.fields["name"]] => Cloning cycle in progress..." records.Remove(C) - del(C) + if(active_record == C) + active_record = null menu = 1 else temp = "[C.fields["name"]] => Initialisation failure." @@ -324,7 +325,7 @@ if (!check_dna_integrity(subject) || !istype(subject)) scantemp = "Unable to locate valid genetic data." return - if (!getbrain(subject)) + if (!subject.getorgan(/obj/item/organ/brain)) scantemp = "No signs of intelligence detected." return if (subject.suiciding == 1) @@ -336,11 +337,11 @@ if (NOCLONE in subject.mutations) scantemp = "Mental interface failure." return - if (!isnull(find_record(subject.ckey))) + if (find_record("ckey", subject.ckey, records)) scantemp = "Subject already in database." return - var/datum/data/record/R = new /datum/data/record() + var/datum/data/record/R = new() if(subject.dna) R.fields["mrace"] = subject.dna.mutantrace else @@ -351,11 +352,11 @@ R.fields["UE"] = subject.dna.unique_enzymes R.fields["UI"] = subject.dna.uni_identity R.fields["SE"] = subject.dna.struc_enzymes - R.fields["b_type"] = subject.dna.b_type + R.fields["blood_type"] = subject.dna.blood_type //Add an implant if needed var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject) - if (isnull(imp)) + if(!imp) imp = new /obj/item/weapon/implant/health(subject) imp.implanted = subject R.fields["imp"] = "\ref[imp]" @@ -369,15 +370,6 @@ src.records += R scantemp = "Subject successfully scanned." -//Find a specific record by key. -/obj/machinery/computer/cloning/proc/find_record(var/find_key) - var/selected_record = null - for(var/datum/data/record/R in src.records) - if (R.fields["ckey"] == find_key) - selected_record = R - break - return selected_record - /obj/machinery/computer/cloning/update_icon() if(stat & BROKEN) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ff0e2a25da4..0598cc4d0d2 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -432,9 +432,6 @@ dat += "
\[ [(src.aistate != STATE_DEFAULT) ? "Main Menu | " : ""]Close \]" return dat -/proc/enable_prison_shuttle(var/mob/user) - for(var/obj/machinery/computer/prison_shuttle/PS in world) - PS.allowedtocall = !(PS.allowedtocall) /proc/call_shuttle_proc(var/mob/user) if ((!( ticker ) || emergency_shuttle.location)) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index b4438032045..7fb5c720586 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -10,8 +10,8 @@ var/authenticated = null var/rank = null var/screen = null - var/datum/data/record/active1 = null - var/datum/data/record/active2 = null + var/datum/data/record/active1 + var/datum/data/record/active2 var/a_id = null var/temp = null var/printing = null @@ -45,21 +45,21 @@ "} if(2.0) dat += "Record List:
" - if(!isnull(data_core.general)) + if(data_core.general) for(var/datum/data/record/R in sortRecord(data_core.general)) - dat += text("[]: []
", src, R, R.fields["id"], R.fields["name"]) + dat += "[R.fields["id"]]: [R.fields["name"]]
" //Foreach goto(132) dat += text("
Back", src) if(3.0) dat += text("Records Maintenance
\nBackup To Disk
\nUpload From disk
\nDelete All Records
\n
\nBack", src, src, src, src) if(4.0) dat += "
" - if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) + if(active1 in data_core.general) dat += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["name"], src.active1.fields["id"], src, src.active1.fields["sex"], src, src.active1.fields["age"], src, src.active1.fields["fingerprint"], src, src.active1.fields["p_stat"], src, src.active1.fields["m_stat"]) else dat += "General Record Lost!
" - if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2))) - dat += text("
\n
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", src, src.active2.fields["b_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"]) + if(active2 in data_core.medical) + dat += text("
\n
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", src, src.active2.fields["blood_type"], src, src.active2.fields["b_dna"], src, src.active2.fields["mi_dis"], src, src.active2.fields["mi_dis_d"], src, src.active2.fields["ma_dis"], src, src.active2.fields["ma_dis_d"], src, src.active2.fields["alg"], src, src.active2.fields["alg_d"], src, src.active2.fields["cdi"], src, src.active2.fields["cdi_d"], src, src.active2.fields["notes"]) var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) dat += text("[]
Delete Entry
", src.active2.fields[text("com_[]", counter)], src, counter) @@ -114,10 +114,11 @@ /obj/machinery/computer/med_data/Topic(href, href_list) if(..()) return - if (!( data_core.general.Find(src.active1) )) + if(!(active1 in data_core.general)) src.active1 = null - if (!( data_core.medical.Find(src.active2) )) + if(!(active2 in data_core.medical)) src.active2 = null + if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) if (href_list["temp"]) @@ -161,7 +162,7 @@ src.active1 = null src.active2 = null - if(href_list["vir"]) + else if(href_list["vir"]) var/type = href_list["vir"] var/datum/disease/Dis = new type(0) var/AfS = "" @@ -177,111 +178,108 @@
Severity: [Dis.severity]"} - if (href_list["del_all"]) + else if (href_list["del_all"]) src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) - if (href_list["del_all2"]) - for(var/datum/data/record/R in data_core.medical) - //R = null - del(R) - //Foreach goto(494) + else if (href_list["del_all2"]) + data_core.medical.Cut() src.temp = "All records deleted." - if (href_list["field"]) + else if (href_list["field"]) var/a1 = src.active1 var/a2 = src.active2 switch(href_list["field"]) if("fingerprint") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = copytext(sanitize(input("Please input fingerprint hash:", "Med. records", src.active1.fields["fingerprint"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["fingerprint"] = t1 if("sex") - if (istype(src.active1, /datum/data/record)) + if(active1) if (src.active1.fields["sex"] == "Male") src.active1.fields["sex"] = "Female" else src.active1.fields["sex"] = "Male" if("age") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = input("Please input age:", "Med. records", src.active1.fields["age"], null) as num if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["age"] = t1 if("mi_dis") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please input minor disabilities list:", "Med. records", src.active2.fields["mi_dis"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis"] = t1 if("mi_dis_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize minor dis.:", "Med. records", src.active2.fields["mi_dis_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["mi_dis_d"] = t1 if("ma_dis") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please input major diabilities list:", "Med. records", src.active2.fields["ma_dis"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis"] = t1 if("ma_dis_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize major dis.:", "Med. records", src.active2.fields["ma_dis_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["ma_dis_d"] = t1 if("alg") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please state allergies:", "Med. records", src.active2.fields["alg"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg"] = t1 if("alg_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize allergies:", "Med. records", src.active2.fields["alg_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["alg_d"] = t1 if("cdi") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please state diseases:", "Med. records", src.active2.fields["cdi"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi"] = t1 if("cdi_d") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize diseases:", "Med. records", src.active2.fields["cdi_d"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["cdi_d"] = t1 if("notes") - if (istype(src.active2, /datum/data/record)) + if(active2) var/t1 = copytext(sanitize(input("Please summarize notes:", "Med. records", src.active2.fields["notes"], null) as message),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active2 != a2)) return src.active2.fields["notes"] = t1 if("p_stat") - if (istype(src.active1, /datum/data/record)) + if(active1) src.temp = text("Physical Condition:
\n\t*Deceased*
\n\t*Unconscious*
\n\tActive
\n\tPhysically Unfit
", src, src, src, src) if("m_stat") - if (istype(src.active1, /datum/data/record)) + if(active1) src.temp = text("Mental Condition:
\n\t*Insane*
\n\t*Unstable*
\n\t*Watch*
\n\tStable
", src, src, src, src) - if("b_type") - if (istype(src.active2, /datum/data/record)) - src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) + if("blood_type") + if(active2) + src.temp = text("Blood Type:
\n\tA- A+
\n\tB- B+
\n\tAB- AB+
\n\tO- O+
", src, src, src, src, src, src, src, src) if("b_dna") - if (istype(src.active1, /datum/data/record)) + if(active1) var/t1 = copytext(sanitize(input("Please input DNA hash:", "Med. records", src.active1.fields["dna"], null) as text),1,MAX_MESSAGE_LEN) if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) return src.active1.fields["dna"] = t1 else - if (href_list["p_stat"]) - if (src.active1) + else if (href_list["p_stat"]) + if(active1) switch(href_list["p_stat"]) if("deceased") src.active1.fields["p_stat"] = "*Deceased*" @@ -292,8 +290,8 @@ if("unfit") src.active1.fields["p_stat"] = "Physically Unfit" - if (href_list["m_stat"]) - if (src.active1) + else if (href_list["m_stat"]) + if(active1) switch(href_list["m_stat"]) if("insane") src.active1.fields["m_stat"] = "*Insane*" @@ -305,58 +303,51 @@ src.active1.fields["m_stat"] = "Stable" - if (href_list["b_type"]) - if (src.active2) - switch(href_list["b_type"]) + else if (href_list["blood_type"]) + if(active2) + switch(href_list["blood_type"]) if("an") - src.active2.fields["b_type"] = "A-" + src.active2.fields["blood_type"] = "A-" if("bn") - src.active2.fields["b_type"] = "B-" + src.active2.fields["blood_type"] = "B-" if("abn") - src.active2.fields["b_type"] = "AB-" + src.active2.fields["blood_type"] = "AB-" if("on") - src.active2.fields["b_type"] = "O-" + src.active2.fields["blood_type"] = "O-" if("ap") - src.active2.fields["b_type"] = "A+" + src.active2.fields["blood_type"] = "A+" if("bp") - src.active2.fields["b_type"] = "B+" + src.active2.fields["blood_type"] = "B+" if("abp") - src.active2.fields["b_type"] = "AB+" + src.active2.fields["blood_type"] = "AB+" if("op") - src.active2.fields["b_type"] = "O+" + src.active2.fields["blood_type"] = "O+" - if (href_list["del_r"]) - if (src.active2) + else if (href_list["del_r"]) + if(active2) src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) - if (href_list["del_r2"]) - if (src.active2) - //src.active2 = null - del(src.active2) + else if (href_list["del_r2"]) + if(active2) + data_core.medical -= active2 + active2 = null - if (href_list["d_rec"]) - var/datum/data/record/R = locate(href_list["d_rec"]) - var/datum/data/record/M = locate(href_list["d_rec"]) - if (!( data_core.general.Find(R) )) - src.temp = "Record Not Found!" - return - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - else - //Foreach continue //goto(2540) - src.active1 = R - src.active2 = M - src.screen = 4 + else if (href_list["d_rec"]) + active1 = find_record("id", href_list["d_rec"], data_core.general) + if(active1) + active2 = find_record("id", href_list["d_rec"], data_core.medical) + if(!active2) + active1 = null + screen = 4 - if (href_list["new"]) + else if (href_list["new"]) if ((istype(src.active1, /datum/data/record) && !( istype(src.active2, /datum/data/record) ))) var/datum/data/record/R = new /datum/data/record( ) R.fields["name"] = src.active1.fields["name"] R.fields["id"] = src.active1.fields["id"] R.name = text("Medical Record #[]", R.fields["id"]) - R.fields["b_type"] = "Unknown" + R.fields["blood_type"] = "Unknown" R.fields["b_dna"] = "Unknown" R.fields["mi_dis"] = "None" R.fields["mi_dis_d"] = "No minor disabilities have been declared." @@ -371,8 +362,8 @@ src.active2 = R src.screen = 4 - if (href_list["add_c"]) - if (!( istype(src.active2, /datum/data/record) )) + else if (href_list["add_c"]) + if(!(active2 in data_core.medical)) return var/a2 = src.active2 var/t1 = copytext(sanitize(input("Add Comment:", "Med. records", null, null) as message),1,MAX_MESSAGE_LEN) @@ -383,11 +374,11 @@ counter++ src.active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", src.authenticated, src.rank, time2text(world.realtime, "MMM DD"), worldtime2text(), year_integer+540, t1,) - if (href_list["del_c"]) + else if (href_list["del_c"]) if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])])) src.active2.fields[text("com_[]", href_list["del_c"])] = "Deleted" - if (href_list["search"]) + else if (href_list["search"]) var/t1 = input("Search String: (Name, DNA, or ID)", "Med. records", null, null) as text if ((!( t1 ) || usr.stat || !( src.authenticated ) || usr.restrained() || ((!in_range(src, usr)) && (!istype(usr, /mob/living/silicon))))) return @@ -409,18 +400,18 @@ //Foreach continue //goto(3334) src.screen = 4 - if (href_list["print_p"]) + else if (href_list["print_p"]) if (!( src.printing )) src.printing = 1 sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = "
" - if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1))) + if(active1 in data_core.general) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"], src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"]) else P.info += "General Record Lost!
" - if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2))) - P.info += text("
\n
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"]) + if(active2 in data_core.medical) + P.info += text("
\n
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\n
", src.active2.fields["blood_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"]) var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) P.info += text("[]
", src.active2.fields[text("com_[]", counter)]) @@ -444,13 +435,13 @@ if(prob(10/severity)) switch(rand(1,6)) if(1) - R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" + R.fields["name"] = random_name(R.fields["sex"],1) if(2) R.fields["sex"] = pick("Male", "Female") if(3) - R.fields["age"] = rand(5, 85) + R.fields["age"] = rand(AGE_MIN, AGE_MAX) if(4) - R.fields["b_type"] = pick("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+") + R.fields["blood_type"] = random_blood_type() if(5) R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") if(6) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 1f16e74b83c..b2ff68a8738 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -42,14 +42,20 @@ dat += "********************************
" dat += "
Tracking Implants
" for(var/obj/item/weapon/implant/tracking/T in world) + if(!iscarbon(T.imp_in)) + continue + if(!T.implanted) + continue Tr = get_turf(T) - if((Tr) && (Tr.z != src.z)) continue//Out of range - if(!T.implanted) continue + if((Tr) && (Tr.z != src.z)) + continue//Out of range + var/loc_display = "Unknown" var/mob/living/carbon/M = T.imp_in - if(M.z == 1 && !istype(M.loc, /turf/space)) + if(Tr.z == 1 && !istype(M.loc, /turf/space)) var/turf/mob_loc = get_turf(M) loc_display = mob_loc.loc + dat += "ID: [T.id] | Location: [loc_display]
" dat += "(Message Holder) |
" dat += "********************************
" diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm deleted file mode 100644 index ec6a1a19f22..00000000000 --- a/code/game/machinery/computer/prisonshuttle.dm +++ /dev/null @@ -1,242 +0,0 @@ -//Config stuff -#define PRISON_MOVETIME 150 //Time to station is milliseconds. -#define PRISON_STATION_AREATYPE "/area/shuttle/prison/station" //Type of the prison shuttle area for station -#define PRISON_DOCK_AREATYPE "/area/shuttle/prison/prison" //Type of the prison shuttle area for dock - -var/prison_shuttle_moving_to_station = 0 -var/prison_shuttle_moving_to_prison = 0 -var/prison_shuttle_at_station = 0 -var/prison_shuttle_can_send = 1 -var/prison_shuttle_time = 0 -var/prison_shuttle_timeleft = 0 - -/obj/machinery/computer/prison_shuttle - name = "Prison Shuttle Console" - icon = 'icons/obj/computer.dmi' - icon_state = "shuttle" - req_access = list(access_security) - circuit = "/obj/item/weapon/circuitboard/prison_shuttle" - var/temp = null - var/hacked = 0 - var/allowedtocall = 0 - var/prison_break = 0 - - - attackby(I as obj, user as mob) - return src.attack_hand(user) - - - attack_ai(var/mob/user as mob) - return src.attack_hand(user) - - - attack_paw(var/mob/user as mob) - return src.attack_hand(user) - - - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/prison_shuttle/M = new /obj/item/weapon/circuitboard/prison_shuttle( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 - - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) - else if(istype(I,/obj/item/weapon/card/emag) && (!hacked)) - hacked = 1 - user << "\blue You disable the lock." - else - return src.attack_hand(user) - - - attack_hand(var/mob/user as mob) - if(!src.allowed(user) && (!hacked)) - user << "\red Access Denied." - return - if(prison_break) - user << "\red Unable to locate shuttle." - return - if(..()) - return - user.set_machine(src) - post_signal("prison") - var/dat - if (src.temp) - dat = src.temp - else - dat += {"Location: [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "Moving to station ([prison_shuttle_timeleft] Secs.)":prison_shuttle_at_station ? "Station":"Dock"]
- [prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison ? "\n*Shuttle already called*
\n
":prison_shuttle_at_station ? "\nSend to Dock
\n
":"\nSend to Station
\n
"] - \nClose"} - - //user << browse(dat, "window=computer;size=575x450") - //onclose(user, "computer") - var/datum/browser/popup = new(user, "computer", name, 575, 450) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return - - - Topic(href, href_list) - if(..()) - return - - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - - if (href_list["sendtodock"]) - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." - src.temp += "Shuttle sent.
OK" - src.updateUsrDialog() - prison_shuttle_moving_to_prison = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - - else if (href_list["sendtostation"]) - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." - src.temp += "Shuttle sent.
OK" - src.updateUsrDialog() - prison_shuttle_moving_to_station = 1 - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - - else if (href_list["mainmenu"]) - src.temp = null - - src.add_fingerprint(usr) - src.updateUsrDialog() - return - - - proc/prison_can_move() - if(prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return 0 - else return 1 - -/* - proc/prison_break() - switch(prison_break) - if (0) - if(!prison_shuttle_at_station || prison_shuttle_moving_to_prison) return - - prison_shuttle_moving_to_prison = 1 - prison_shuttle_at_station = prison_shuttle_at_station - - if (!prison_shuttle_moving_to_prison || !prison_shuttle_moving_to_station) - prison_shuttle_time = world.timeofday + PRISON_MOVETIME - spawn(0) - prison_process() - prison_break = 1 - if(1) - prison_break = 0 -*/ - - proc/post_signal(var/command) - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1311) - if(!frequency) return - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - frequency.post_signal(src, status_signal) - return - - - proc/prison_process() - while(prison_shuttle_time - world.timeofday > 0) - var/ticksleft = prison_shuttle_time - world.timeofday - - if(ticksleft > 1e5) - prison_shuttle_time = world.timeofday + 10 // midnight rollover - - prison_shuttle_timeleft = (ticksleft / 10) - sleep(5) - prison_shuttle_moving_to_station = 0 - prison_shuttle_moving_to_prison = 0 - - switch(prison_shuttle_at_station) - - if(0) - prison_shuttle_at_station = 1 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - - var/area/start_location = locate(/area/shuttle/prison/prison) - var/area/end_location = locate(/area/shuttle/prison/station) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - del(T) - start_location.move_contents_to(end_location) - - if(1) - prison_shuttle_at_station = 0 - if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return - - if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." - return - - var/area/start_location = locate(/area/shuttle/prison/station) - var/area/end_location = locate(/area/shuttle/prison/prison) - - var/list/dstturfs = list() - var/throwy = world.maxy - - for(var/turf/T in end_location) - dstturfs += T - if(T.y < throwy) - throwy = T.y - - // hey you, get out of the way! - for(var/turf/T in dstturfs) - // find the turf to move things to - var/turf/D = locate(T.x, throwy - 1, 1) - //var/turf/E = get_step(D, SOUTH) - for(var/atom/movable/AM as mob|obj in T) - AM.Move(D) - if(istype(T, /turf/simulated)) - del(T) - start_location.move_contents_to(end_location) - return \ No newline at end of file diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 5497b39ad3e..fe8eb1a23b4 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -154,7 +154,7 @@ /obj/machinery/door/window/hitby(AM as mob|obj) ..() - visible_message("\red The glass door was hit by [AM].", 1) + visible_message("\red The glass door was hit by [AM].") var/tforce = 0 if(ismob(AM)) tforce = 40 @@ -175,7 +175,7 @@ return src.health = max(0, src.health - 25) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - visible_message("\red [user] smashes against the [src.name].", 1) + visible_message("\red [user] smashes against the [src.name].") if (src.health <= 0) new /obj/item/weapon/shard(src.loc) var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 383e3f48fd6..ab84288bfea 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -10,10 +10,12 @@ var/list/doppler_arrays = list() /obj/machinery/doppler_array/New() + ..() doppler_arrays += src /obj/machinery/doppler_array/Del() doppler_arrays -= src + ..() /obj/machinery/doppler_array/process() return PROCESS_KILL diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 0c2a6ed6b07..0baa0912377 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -552,18 +552,10 @@ threatcount += 2 if(check_records) //if the turret can check the records, check if they are set to *Arrest* on records - for(var/datum/data/record/E in data_core.general) - var/perpname = perp.name - if(perp.wear_id) - var/obj/item/weapon/card/id/id = perp.wear_id.GetID() - if(id) - perpname = id.registered_name - - if(E.fields["name"] == perpname) - for(var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - threatcount = 4 - break + var/perpname = perp.get_face_name(perp.get_id_name()) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(!R || (R.fields["criminal"] == "*Arrest*")) + threatcount += 4 return threatcount diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm new file mode 100644 index 00000000000..d18d6d90946 --- /dev/null +++ b/code/game/machinery/recycler.dm @@ -0,0 +1,124 @@ +var/const/SAFETY_COOLDOWN = 100 + +/obj/machinery/recycler + name = "crusher" + desc = "A large crushing machine which is used to recycle small items ineffeciently; there are lights on the side of it." + icon = 'icons/obj/recycling.dmi' + icon_state = "grinder-o0" + layer = MOB_LAYER+1 // Overhead + anchored = 1 + density = 1 + var/safety_mode = 0 // Temporality stops the machine if it detects a mob + var/grinding = 0 + var/icon_name = "grinder-o" + var/blood = 0 + var/eat_from = WEST + +/obj/machinery/recycler/New() + // On us + ..() + update_icon() + +/obj/machinery/recycler/examine() + set src in view() + ..() + usr << "The power light is [(stat & NOPOWER) ? "off" : "on"]." + usr << "The safety-mode light is [safety_mode ? "on" : "off"]." + usr << "The safety-sensors status light is [emagged ? "off" : "on"]." + +/obj/machinery/recycler/power_change() + ..() + update_icon() + +/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/weapon/card/emag) && !emagged) + emagged = 1 + if(safety_mode) + safety_mode = 0 + update_icon() + playsound(src.loc, "sparks", 75, 1, -1) + else + ..() + +/obj/machinery/recycler/update_icon() + ..() + var/is_powered = !(stat & (BROKEN|NOPOWER)) + if(safety_mode) + is_powered = 0 + icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end + +/obj/machinery/recycler/Bumped(var/atom/movable/AM) + + // HasEntered didn't like people lying down. + if(stat & (BROKEN|NOPOWER)) + return + if(safety_mode) + return + // If we're not already grinding something. + if(!grinding) + grinding = 1 + spawn(1) + grinding = 0 + else + return + + var/move_dir = get_dir(loc, AM.loc) + if(move_dir == eat_from) + if(isliving(AM)) + if(emagged) + eat(AM) + else + stop(AM) + else if(istype(AM, /obj/item)) + recycle(AM) + else // Can't recycle + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + AM.loc = src.loc + +/obj/machinery/recycler/proc/recycle(var/obj/item/I) + I.loc = src.loc + if(!istype(I, /obj/item/weapon/disk/nuclear)) + del(I) + if(prob(15)) + new /obj/item/stack/sheet/metal(loc) + if(prob(10)) + new /obj/item/stack/sheet/glass(loc) + if(prob(2)) + new /obj/item/stack/sheet/plasteel(loc) + if(prob(1)) + new /obj/item/stack/sheet/rglass(loc) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + + +/obj/machinery/recycler/proc/stop(var/mob/living/L) + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) + safety_mode = 1 + update_icon() + L.loc = src.loc + + spawn(SAFETY_COOLDOWN) + playsound(src.loc, 'sound/machines/ping.ogg', 50, 0) + safety_mode = 0 + update_icon() + +/obj/machinery/recycler/proc/eat(var/mob/living/L) + + L.loc = src.loc + if(issilicon(L)) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + else + playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) + + if(ishuman(L)) + L.say("ARRRRRRRRRRRGH!!!") + + L.gib() + + if(!blood) + blood = 1 + update_icon() + + +/obj/item/weapon/paper/recycler + name = "paper - 'garbage duty instructions'" + info = "
New Assignment
You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" \ No newline at end of file diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 4cce0abc451..7d2a8f32019 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -115,9 +115,13 @@ //Servers /obj/machinery/telecomms/server/presets - network = "tcommsat" +/obj/machinery/telecomms/server/presets/New() + ..() + name = id + + /obj/machinery/telecomms/server/presets/science id = "Science Server" freq_listening = list(1351) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 09453b00df8..08cf736db77 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -53,7 +53,7 @@ gib.blood_DNA = list() if(MobDNA) - gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type + gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.blood_type else if(istype(src, /obj/effect/gibspawner/xeno)) gib.blood_DNA["UNKNOWN DNA"] = "X*" else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm index 50882bc3e65..543d0ba2ec3 100644 --- a/code/game/objects/explosion_recursive.dm +++ b/code/game/objects/explosion_recursive.dm @@ -1,4 +1,7 @@ /client/proc/kaboom() + + set category = "Debug" + var/power = input(src, "power?", "power?") as num var/turf/T = get_turf(src.mob) explosion_rec(T, power) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 679cc820eff..1d25992d125 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -58,7 +58,7 @@ return /obj/item/blob_act() - return + del(src) //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 73de19822f8..6b947bedfed 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -273,7 +273,7 @@ Code: menu = "
Crew Manifest
"
menu += "Entries cannot be modified from this terminal." - if(!isnull(data_core.general)) + if(data_core.general) for (var/datum/data/record/t in sortRecord(data_core.general)) menu += "[t.fields["name"]] - [t.fields["rank"]]
" menu += "
" @@ -347,14 +347,14 @@ Code: if (44) //medical records //This thing only displays a single screen so it's hard to really get the sub-menu stuff working. menu = "
Medical Record List
"
- if(!isnull(data_core.general))
- for (var/datum/data/record/R in sortRecord(data_core.general))
- menu += "[R.fields["id"]]: [R.fields["name"]]" + if(data_core.general) + for(var/datum/data/record/R in sortRecord(data_core.general)) + menu += "[R.fields["id"]]: [R.fields["name"]]
" menu += "
" if(441) menu = "
Medical Record
"
- if (istype(active1, /datum/data/record) && (active1 in data_core.general))
+ if(active1 in data_core.general)
menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" menu += "Sex: [active1.fields["sex"]]
" menu += "Age: [active1.fields["age"]]
" @@ -368,8 +368,8 @@ Code: menu += "
" menu += "
Medical Data
"
- if (istype(active2, /datum/data/record) && (active2 in data_core.medical))
- menu += "Blood Type: [active2.fields["b_type"]]" + if(active2 in data_core.medical) + menu += "Blood Type: [active2.fields["blood_type"]]
" menu += "Minor Disabilities: [active2.fields["mi_dis"]]
" menu += "Details: [active2.fields["mi_dis_d"]]
" @@ -390,15 +390,15 @@ Code: menu += "
" if (45) //security records menu = "
Security Record List
"
- if(!isnull(data_core.general))
+ if(data_core.general)
for (var/datum/data/record/R in sortRecord(data_core.general))
- menu += "[R.fields["id"]]: [R.fields["name"]]" + menu += "[R.fields["id"]]: [R.fields["name"]]
" menu += "
" if(451) menu = "
Security Record
"
- if (istype(active1, /datum/data/record) && (active1 in data_core.general))
+ if(active1 in data_core.general)
menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]" menu += "Sex: [active1.fields["sex"]]
" menu += "Age: [active1.fields["age"]]
" @@ -412,7 +412,7 @@ Code: menu += "
" menu += "
Security Data
"
- if (istype(active3, /datum/data/record) && (active3 in data_core.security))
+ if(active3 in data_core.security)
menu += "Criminal Status: [active3.fields["criminal"]]" menu += "Minor Crimes: [active3.fields["mi_crim"]]
" @@ -624,30 +624,22 @@ Code: switch(href_list["choice"]) if("Medical Records") - var/datum/data/record/R = locate(href_list["target"]) - var/datum/data/record/M = locate(href_list["target"]) + active1 = find_record("id", href_list["target"], data_core.general) + if(active1) + active2 = find_record("id", href_list["target"], data_core.medical) loc:mode = 441 mode = 441 - if (R in data_core.general) - for (var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - break - active1 = R - active2 = M + if(!active2) + active1 = null if("Security Records") - var/datum/data/record/R = locate(href_list["target"]) - var/datum/data/record/S = locate(href_list["target"]) + active1 = find_record("id", href_list["target"], data_core.general) + if(active1) + active3 = find_record("id", href_list["target"], data_core.security) loc:mode = 451 mode = 451 - if (R in data_core.general) - for (var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - S = E - break - active1 = R - active3 = S + if(!active3) + active1 = null if("Send Signal") spawn( 0 ) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index bba36c5c698..9a1294c3e2b 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -11,72 +11,68 @@ origin_tech = "syndicate=4;magnets=4" var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null - var/saved_item = "/obj/item/weapon/cigbutt" + var/saved_item = /obj/item/weapon/cigbutt - dropped() - disrupt() +/obj/item/device/chameleon/dropped() + disrupt() - attack_self() - toggle() +/obj/item/device/chameleon/equipped() + disrupt() - afterattack(atom/target, mob/user , flag) +/obj/item/device/chameleon/attack_self() + toggle() + +/obj/item/device/chameleon/afterattack(atom/target, mob/user , flag) + if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) - playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1) + playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) user << "\blue Scanned [target]." saved_item = target.type - proc/toggle() - if(!can_use || !saved_item) return - if(active_dummy) - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - for(var/atom/movable/A in active_dummy) - A.loc = active_dummy.loc - if(ismob(A)) - if(A:client) - A:client:eye = A - del(active_dummy) - active_dummy = null - usr << "\blue You deactivate the [src]." - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) - T.icon = 'icons/effects/effects.dmi' - flick("emppulse",T) - spawn(8) T.delete() - else - playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - var/obj/O = new saved_item(src) - if(!O) return - var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) - C.name = O.name - C.desc = O.desc - C.icon = O.icon - C.icon_state = O.icon_state - C.dir = O.dir - usr.loc = C - C.master = src - src.active_dummy = C - del(O) - usr << "\blue You activate the [src]." - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) - T.icon = 'icons/effects/effects.dmi' - flick("emppulse",T) - spawn(8) T.delete() +/obj/item/device/chameleon/proc/toggle() + if(!can_use || !saved_item) return + if(active_dummy) + eject_all() + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + del(active_dummy) + active_dummy = null + usr << "\blue You deactivate the [src]." + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) + T.icon = 'icons/effects/effects.dmi' + flick("emppulse",T) + spawn(8) T.delete() + else + playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) + var/obj/O = new saved_item(src) + if(!O) return + var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) + C.activate(O, usr, src) + del(O) + usr << "\blue You activate the [src]." + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) + T.icon = 'icons/effects/effects.dmi' + flick("emppulse",T) + spawn(8) T.delete() - proc/disrupt() - if(active_dummy) - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread - spark_system.set_up(5, 0, src) - spark_system.attach(src) - spark_system.start() - for(var/atom/movable/A in active_dummy) - A.loc = active_dummy.loc - if(ismob(A)) - if(A:client) - A:client:eye = A +/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1) + if(active_dummy) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread + spark_system.set_up(5, 0, src) + spark_system.attach(src) + spark_system.start() + eject_all() + if(delete_dummy) del(active_dummy) - active_dummy = null - can_use = 0 - spawn(100) can_use = 1 + active_dummy = null + can_use = 0 + spawn(50) can_use = 1 +/obj/item/device/chameleon/proc/eject_all() + for(var/atom/movable/A in active_dummy) + A.loc = active_dummy.loc + if(ismob(A)) + var/mob/M = A + M.reset_view(null) /obj/effect/dummy/chameleon name = "" @@ -85,38 +81,57 @@ anchored = 1 var/can_move = 1 var/obj/item/device/chameleon/master = null - attackby() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - attack_hand() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - ex_act() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - master.disrupt() - bullet_act() - for(var/mob/M in src) - M << "\red Your chameleon-projector deactivates." - ..() - master.disrupt() - relaymove(var/mob/user, direction) - if(istype(loc, /turf/space)) return //No magical space movement! - if(can_move) - can_move = 0 - switch(usr.bodytemperature) - if(300 to INFINITY) - spawn(10) can_move = 1 - if(295 to 300) - spawn(13) can_move = 1 - if(280 to 295) - spawn(16) can_move = 1 - if(260 to 280) - spawn(20) can_move = 1 - else - spawn(25) can_move = 1 - step(src,direction) - return \ No newline at end of file +/obj/effect/dummy/chameleon/proc/activate(var/obj/item/O, var/mob/M, var/obj/item/device/chameleon/C) + name = O.name + desc = O.desc + icon = O.icon + icon_state = O.icon_state + dir = O.dir + M.loc = src + master = C + master.active_dummy = src + +/obj/effect/dummy/chameleon/attackby() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/attack_hand() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/ex_act() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + master.disrupt() + +/obj/effect/dummy/chameleon/bullet_act() + for(var/mob/M in src) + M << "\red Your chameleon-projector deactivates." + ..() + master.disrupt() + +/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction) + if(istype(loc, /turf/space)) return //No magical space movement! + + if(can_move) + can_move = 0 + switch(user.bodytemperature) + if(300 to INFINITY) + spawn(10) can_move = 1 + if(295 to 300) + spawn(13) can_move = 1 + if(280 to 295) + spawn(16) can_move = 1 + if(260 to 280) + spawn(20) can_move = 1 + else + spawn(25) can_move = 1 + step(src, direction) + return + +/obj/effect/dummy/chameleon/Del() + master.disrupt(0) + ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 1a0ffa821f6..ba3f735f151 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -262,11 +262,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use // --- Human: use their job as seen on the crew manifest - makes it unneeded to carry an ID for an AI to see their job if (ishuman(M)) var/voice = M.GetVoice() // Why reinvent the wheel when there is a proc that does nice things already - var/datum/data/record/findjob - for (var/datum/data/record/t in data_core.general) - if(t.fields["name"] == voice) - findjob = t - break + var/datum/data/record/findjob = find_record("name", voice, data_core.general) if(voice != real_name) displayname = voice diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d1bab674f31..b88cf112237 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -143,7 +143,7 @@ MASS SPECTROMETER if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) user.show_message(text("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1) - if (M.getBrainLoss() >= 100 || !getbrain(M)) + if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) user.show_message(text("Subject brain function is non-existant."), 1) else if (M.getBrainLoss() >= 60) user.show_message(text("Severe brain damage detected. Subject likely to have mental retardation."), 1) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 8c9307b4611..54614d59352 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -11,6 +11,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/uses // Numbers of crystals // List of items not to shove in their hands. var/list/purchase_log = list() + var/show_description = null + var/active = 0 /obj/item/device/uplink/New() ..() @@ -45,9 +47,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid if(item.cost > 0) cost_text = "([item.cost])" if(item.cost <= uses) - dat += "[item.name] [cost_text]
[desc]
" + dat += "[item.name] [cost_text] " else - dat += "[item.name] [cost_text]
[desc]
" + dat += "[item.name] [cost_text] " + if(item.desc) + if(show_description == item.type) + dat += "\[-\]
[desc]" + else + dat += "\[?\]" + dat += "
" // Break up the categories, if it isn't the last. if(buyable_items.len != index) @@ -70,6 +78,10 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/Topic(href, href_list) ..() + + if(!active) + return + if (href_list["buy_item"]) var/item = href_list["buy_item"] @@ -89,6 +101,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid I.buy(src, usr) + else if(href_list["show_desc"]) + + var/type = text2path(href_list["show_desc"]) + show_description = type + interact(usr) + + // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it. /* How to create an uplink in 3 easy steps! @@ -104,7 +123,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/uplink/hidden name = "Hidden Uplink." desc = "There is something wrong if you're examining this." - var/active = 0 /obj/item/device/uplink/hidden/Topic(href, href_list) ..() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 0d1efe447ce..ba5088e1d25 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -99,9 +99,9 @@ /obj/item/weapon/razor/proc/shave(mob/living/carbon/human/H, location = "mouth") if(location == "mouth") - H.f_style = "Shaved" + H.facial_hair_style = "Shaved" else - H.h_style = "Skinhead" + H.hair_style = "Skinhead" H.update_hair() playsound(loc, 'sound/items/Welder2.ogg', 20, 1) @@ -116,7 +116,7 @@ if(!get_location_accessible(H, location)) user << "The mask is in the way." return - if(H.f_style == "Shaved") + if(H.facial_hair_style == "Shaved") user << "Already clean-shaven." return @@ -141,7 +141,7 @@ if(!get_location_accessible(H, location)) user << "The headgear is in the way." return - if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead") + if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead") user << "There is not enough hair left to shave!" return diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index a416da8adcc..c0a891ff786 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -21,11 +21,11 @@ M.radiation += rand(20, 50) if(fields) var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" - if(fields["name"] && fields["UE"] && fields["b_type"]) + if(fields["name"] && fields["UE"] && fields["blood_type"]) M.real_name = fields["name"] M.dna.unique_enzymes = fields["UE"] M.name = M.real_name - M.dna.b_type = fields["b_type"] + M.dna.blood_type = fields["blood_type"] if(fields["UI"]) //UI+UE M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) updateappearance(M) @@ -44,7 +44,7 @@ if(!ishuman(user)) user << "You don't have the dexterity to do this!" return - + target.attack_log += "\[[time_stamp()]\] [user.name] ([user.ckey]) attempted to inject with [name]" user.attack_log += "\[[time_stamp()]\] Used the [name] to attempt to inject [target.name] ([target.ckey])" log_attack("[user.name] ([user.ckey]) used the [name] to attempt to inject [target.name] ([target.ckey])") diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index fb0e3cd6a2b..21d542800ea 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -172,6 +172,20 @@ new /obj/item/weapon/grenade/flashbang(src) new /obj/item/weapon/grenade/flashbang(src) +/obj/item/weapon/storage/box/flashes + name = "box of flashbulbs" + desc = "WARNING: Flashes can cause serious eye damage, protective eyewear is required." + icon_state = "flashbang" + + New() + ..() + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + new /obj/item/device/flash(src) + /obj/item/weapon/storage/box/teargas name = "box of tear gas grenades (WARNING)" desc = "WARNING: These devices are extremely dangerous and can cause blindness and skin irritation." diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4e9e9f639a6..76e17f53146 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -25,15 +25,15 @@ var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list if(userloc != H.loc) return //no tele-grooming if(new_style) - H.f_style = new_style + H.facial_hair_style = new_style else - H.f_style = "Shaved" + H.facial_hair_style = "Shaved" //handle normal hair var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in hair_styles_list if(userloc != H.loc) return //no tele-grooming if(new_style) - H.h_style = new_style + H.hair_style = new_style H.update_hair() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 998fc171a54..a8a4b79bf64 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -84,6 +84,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() var/reqtime = 0 //Cooldown for requisitions - Quarxink var/hacked = 0 var/can_order_contraband = 0 + var/last_viewed_group = "categories" + /obj/machinery/computer/ordercomp name = "Supply Ordering Console" @@ -92,6 +94,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() circuit = "/obj/item/weapon/circuitboard/ordercomp" var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/last_viewed_group = "categories" /* /obj/effect/marker/supplymarker @@ -139,6 +142,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() proc/process() for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs)) var/datum/supply_packs/P = new typepath() + if(P.name == "HEADER") continue // To filter out group headers supply_packs[P.name] = P spawn(0) @@ -344,8 +348,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() A:req_access += text2num(SP.access) var/list/contains - if(istype(SP,/datum/supply_packs/randomised)) - var/datum/supply_packs/randomised/SPR = SP + if(istype(SP,/datum/supply_packs/misc/randomised)) + var/datum/supply_packs/misc/randomised/SPR = SP contains = list() if(SPR.contains.len) for(var/j=1,j<=SPR.num_contained,j++) @@ -399,7 +403,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() else dat += {"Shuttle Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]
Supply Points: [supply_shuttle.points]
-
\nRequest items
+ +
\nRequest items
View approved orders
View requests
Close"} @@ -407,7 +412,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() // Removing the old window method but leaving it here for reference //user << browse(dat, "window=computer;size=575x450") //onclose(user, "computer") - + // Added the new browser window method var/datum/browser/popup = new(user, "computer", "Supply Ordering Console", 575, 450) popup.set_content(dat) @@ -423,12 +428,25 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() usr.set_machine(src) if(href_list["order"]) - temp = "Main Menu
Request what?
Supply Points: [supply_shuttle.points]
" - for(var/supply_name in supply_shuttle.supply_packs ) - var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] - if(N.hidden || N.contraband) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
Main Menu" + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_shuttle.points]
" + temp += "Main Menu
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "Supply points: [supply_shuttle.points]
" + temp += "Back to all categories
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_name in supply_shuttle.supply_packs ) + var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] + if(N.hidden || N.contraband || N.group != cat) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage else if (href_list["doorder"]) if(world.time < reqtime) @@ -480,7 +498,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist += O temp = "Thanks for your request. The cargo team will process it as soon as possible.
" - temp += "
Main Menu" + temp += "
Back Main Menu" else if (href_list["vieworders"]) temp = "Main Menu
Current approved orders:
" @@ -519,7 +537,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() dat += {"
Supply shuttle
\nLocation: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Away"]
\nSupply Points: [supply_shuttle.points]
\n
- [supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] + [supply_shuttle.moving ? "\n*Must be away to order items*
\n
":supply_shuttle.at_station ? "\n*Must be away to order items*
\n
":"\nOrder items
\n
"] [supply_shuttle.moving ? "\n*Shuttle already called*
\n
":supply_shuttle.at_station ? "\nSend away
\n
":"\nSend to station
\n
"] \nView requests
\n
\nView orders
\n
@@ -596,14 +614,34 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() else if (href_list["order"]) if(supply_shuttle.moving) return - temp = "Main Menu
Supply Points: [supply_shuttle.points]
Request what?
" + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_shuttle.points]
" + temp += "Main Menu
" + temp += "Select a category
" + for(var/cat in all_supply_groups ) + temp += "[get_supply_group_name(cat)]
" + else + last_viewed_group = href_list["order"] + var/cat = text2num(last_viewed_group) + temp = "Supply points: [supply_shuttle.points]
" + temp += "Back to all categories
" + temp += "Request from: [get_supply_group_name(cat)]
" + for(var/supply_name in supply_shuttle.supply_packs ) + var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != cat) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage + + /*temp = "Supply points: [supply_shuttle.points]
Request what?
" for(var/supply_name in supply_shuttle.supply_packs ) var/datum/supply_packs/N = supply_shuttle.supply_packs[supply_name] if(N.hidden && !hacked) continue if(N.contraband && !can_order_contraband) continue temp += "[supply_name] Cost: [N.cost]
" //the obj because it would get caught by the garbage - temp += "
Main Menu" + temp += "
OK"*/ else if (href_list["doorder"]) if(world.time < reqtime) @@ -655,7 +693,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist += O temp = "Order request placed.
" - temp += "
Main Menu | Authorize Order" + temp += "
Back | Main Menu | Authorize Order" else if(href_list["confirmorder"]) //Find the correct supply_order datum @@ -673,10 +711,11 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.points -= P.cost supply_shuttle.shoppinglist += O temp = "Thanks for your order.
" + temp += "
Back Main Menu" else temp = "Not enough supply points.
" + temp += "
Back Main Menu" break - temp += "
Main Menu" else if (href_list["vieworders"]) temp = "Main Menu
Current approved orders:
" @@ -714,7 +753,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new() supply_shuttle.requestlist.Cut(i,i+1) temp = "Request removed.
" break - temp += "
OK" + temp += "
Back Main Menu" else if (href_list["clearreq"]) supply_shuttle.requestlist.Cut() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 88a5572fd2d..ad5aa43c8a0 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -11,6 +11,7 @@ heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall var/walltype = "metal" + var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through. /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0) if(istype(src,/turf/simulated/wall/r_wall)) @@ -89,7 +90,7 @@ /turf/simulated/wall/attack_paw(mob/user as mob) if ((HULK in user.mutations)) - if (prob(40)) + if (prob(hardness)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) @@ -120,7 +121,7 @@ /turf/simulated/wall/attack_hand(mob/user as mob) if (HULK in user.mutations) - if (prob(40)) + if (prob(hardness)) usr << text("\blue You smash through the wall.") usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 6e58836c3f0..057162717f3 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -8,24 +8,7 @@ walltype = "rwall" var/d_state = 0 - -/turf/simulated/wall/r_wall/attack_hand(mob/user as mob) - if (HULK in user.mutations) - if (prob(10)) - usr << text("\blue You smash through the wall.") - usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - dismantle_wall(1) - return - else - usr << text("\blue You punch the wall.") - return - - user << "\blue You push the wall but nothing happens!" - playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) - src.add_fingerprint(user) - ..() - return - + hardness = 10 /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 1a3a13a5ed0..d2d469670ae 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -840,4 +840,19 @@ proc/move_ferry() if (ferry_location) ferry_location = 0 else - ferry_location = 1 \ No newline at end of file + ferry_location = 1 + +//Kicks all the clients currently in the lobby. The second parameter (kick_only_afk) determins if an is_afk() check is ran, or if all clients are kicked +//defaults to kicking everyone (afk + non afk clients in the lobby) +//returns a list of ckeys of the kicked clients +proc/kick_clients_in_lobby(var/message, var/kick_only_afk = 0) + var/list/kicked_client_names = list() + for(var/client/C in clients) + if(istype(C.mob, /mob/new_player)) + if(kick_only_afk && !C.is_afk()) //Ignore clients who are not afk + continue + if(message) + C << message + kicked_client_names.Add("[C.ckey]") + del(C) + return kicked_client_names \ No newline at end of file diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 7734042e3f6..7435030d49f 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -194,7 +194,7 @@
- Hover over a line to see more information - Check antagonists + Hover over a line to see more information - Check antagonists - Kick everyone/AFKers in lobby
" dat += "
| Name | Position |
|---|---|
| [] | [] |
| [t.fields["name"]] | [t.fields["rank"]] |
| Name | DNA | Blood Type |
|---|---|---|
| [H] | [H.dna.unique_enzymes] | [H.b_type] |
| [H] | [H.dna.unique_enzymes] | [H.blood_type] |
| "
- dat += "Blood Type: [b_type] " + dat += "Blood Type: [blood_type] " dat += "Skin Tone: [skin_tone] " dat += "Underwear: [underwear] " dat += "Backpack: [backbaglist[backbag]] " @@ -171,16 +171,16 @@ datum/preferences dat += " Hair Style" - dat += "[h_style]" - dat += " Change " + dat += "[hair_style] " + dat += " Change " dat += " | "
dat += "Facial Hair Style" - dat += "[f_style]" - dat += " Change " + dat += "[facial_hair_style] " + dat += " Change " dat += " | "
@@ -253,7 +253,7 @@ datum/preferences
popup.set_content(dat)
popup.open(0)
- proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), width = 580, height = 560)
+ proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), width = 555, height = 585)
if(!job_master) return
//limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
@@ -520,13 +520,13 @@ datum/preferences
if("age")
age = rand(AGE_MIN, AGE_MAX)
if("hair")
- h_color = random_short_color()
- if("h_style")
- h_style = random_hair_style(gender)
+ hair_color = random_short_color()
+ if("hair_style")
+ hair_style = random_hair_style(gender)
if("facial")
- f_color = random_short_color()
- if("f_style")
- f_style = random_facial_hair_style(gender)
+ facial_hair_color = random_short_color()
+ if("facial_hair_style")
+ facial_hair_style = random_facial_hair_style(gender)
if("underwear")
underwear = random_underwear(gender)
if("eyes")
@@ -565,31 +565,31 @@ datum/preferences
if("hair")
var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as null|color
if(new_hair)
- h_color = sanitize_hexcolor(new_hair)
+ hair_color = sanitize_hexcolor(new_hair)
- if("h_style")
- var/new_h_style
+ if("hair_style")
+ var/new_hair_style
if(gender == MALE)
- new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in hair_styles_male_list
+ new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in hair_styles_male_list
else
- new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in hair_styles_female_list
- if(new_h_style)
- h_style = new_h_style
+ new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in hair_styles_female_list
+ if(new_hair_style)
+ hair_style = new_hair_style
if("facial")
var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference") as null|color
if(new_facial)
- f_color = sanitize_hexcolor(new_facial)
+ facial_hair_color = sanitize_hexcolor(new_facial)
- if("f_style")
- var/new_f_style
+ if("facial_hair_style")
+ var/new_facial_hair_style
if(gender == MALE)
- new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in facial_hair_styles_male_list
+ new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in facial_hair_styles_male_list
else
- new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in facial_hair_styles_female_list
- if(new_f_style)
- f_style = new_f_style
+ new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in facial_hair_styles_female_list
+ if(new_facial_hair_style)
+ facial_hair_style = new_facial_hair_style
if("underwear")
var/new_underwear
@@ -630,8 +630,8 @@ datum/preferences
else
gender = MALE
underwear = random_underwear(gender)
- f_style = random_facial_hair_style(gender)
- h_style = random_hair_style(gender)
+ facial_hair_style = random_facial_hair_style(gender)
+ hair_style = random_hair_style(gender)
if("hear_adminhelps")
toggles ^= SOUND_ADMINHELP
@@ -708,15 +708,15 @@ datum/preferences
character.gender = gender
character.age = age
- character.b_type = b_type
+ character.blood_type = blood_type
character.eye_color = eye_color
- character.h_color = h_color
- character.f_color = f_color
+ character.hair_color = hair_color
+ character.facial_hair_color = facial_hair_color
character.skin_tone = skin_tone
- character.h_style = h_style
- character.f_style = f_style
+ character.hair_style = hair_style
+ character.facial_hair_style = facial_hair_style
character.underwear = underwear
if(backbag > 3 || backbag < 1)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 1c4edf7acf6..29a289dd610 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -157,12 +157,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["name_is_always_random"] >> be_random_name
S["gender"] >> gender
S["age"] >> age
- S["hair_color"] >> h_color
- S["facial_hair_color"] >> f_color
+ S["hair_color"] >> hair_color
+ S["facial_hair_color"] >> facial_hair_color
S["eye_color"] >> eye_color
S["skin_tone"] >> skin_tone
- S["hair_style_name"] >> h_style
- S["facial_style_name"] >> f_style
+ S["hair_style_name"] >> hair_style
+ S["facial_style_name"] >> facial_hair_style
S["underwear"] >> underwear
S["backbag"] >> backbag
@@ -189,16 +189,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
gender = sanitize_gender(gender)
if(gender == MALE)
- h_style = sanitize_inlist(h_style, hair_styles_male_list)
- f_style = sanitize_inlist(f_style, facial_hair_styles_male_list)
+ hair_style = sanitize_inlist(hair_style, hair_styles_male_list)
+ facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list)
underwear = sanitize_inlist(underwear, underwear_m)
else
- h_style = sanitize_inlist(h_style, hair_styles_female_list)
- f_style = sanitize_inlist(f_style, facial_hair_styles_female_list)
+ hair_style = sanitize_inlist(hair_style, hair_styles_female_list)
+ facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list)
underwear = sanitize_inlist(underwear, underwear_f)
age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
- h_color = sanitize_hexcolor(h_color, 3, 0)
- f_color = sanitize_hexcolor(f_color, 3, 0)
+ hair_color = sanitize_hexcolor(hair_color, 3, 0)
+ facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0)
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, skin_tones)
backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
@@ -230,12 +230,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["name_is_always_random"] << be_random_name
S["gender"] << gender
S["age"] << age
- S["hair_color"] << h_color
- S["facial_hair_color"] << f_color
+ S["hair_color"] << hair_color
+ S["facial_hair_color"] << facial_hair_color
S["eye_color"] << eye_color
S["skin_tone"] << skin_tone
- S["hair_style_name"] << h_style
- S["facial_style_name"] << f_style
+ S["hair_style_name"] << hair_style
+ S["facial_style_name"] << facial_hair_style
S["underwear"] << underwear
S["backbag"] << backbag
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 1561bf2ab0d..ca72119dc57 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -104,55 +104,38 @@
var/client/C = M.client
var/image/holder
for(var/mob/living/carbon/human/perp in view(M))
- if(!C) continue
- var/perpname = "wot"
holder = perp.hud_list[ID_HUD]
+ holder.icon_state = "hudno_id"
if(perp.wear_id)
- var/obj/item/weapon/card/id/I = perp.wear_id.GetID()
- if(I)
- perpname = I.registered_name
- holder.icon_state = "hud[ckey(I.GetJobName())]"
- C.images += holder
- else
- perpname = perp.name
- holder.icon_state = "hudno_id"
- C.images += holder
- else
- perpname = perp.name
- holder.icon_state = "hudno_id"
- C.images += holder
+ holder.icon_state = "hud[ckey(perp.wear_id.GetJobName())]"
+ C.images += holder
+
- for(var/datum/data/record/E in data_core.general)
- if(E.fields["name"] == perpname)
- holder = perp.hud_list[WANTED_HUD]
- for (var/datum/data/record/R in data_core.security)
- if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
- holder.icon_state = "hudwanted"
- C.images += holder
- break
- else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
- holder.icon_state = "hudincarcerated"
- C.images += holder
- break
- else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled"))
- holder.icon_state = "hudparolled"
- C.images += holder
- break
- else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
- holder.icon_state = "hudreleased"
- C.images += holder
- break
for(var/obj/item/weapon/implant/I in perp)
if(I.implanted)
if(istype(I,/obj/item/weapon/implant/tracking))
holder = perp.hud_list[IMPTRACK_HUD]
holder.icon_state = "hud_imp_tracking"
- C.images += holder
- if(istype(I,/obj/item/weapon/implant/loyalty))
+ else if(istype(I,/obj/item/weapon/implant/loyalty))
holder = perp.hud_list[IMPLOYAL_HUD]
holder.icon_state = "hud_imp_loyal"
- C.images += holder
- if(istype(I,/obj/item/weapon/implant/chem))
+ else if(istype(I,/obj/item/weapon/implant/chem))
holder = perp.hud_list[IMPCHEM_HUD]
holder.icon_state = "hud_imp_chem"
- C.images += holder
\ No newline at end of file
+ else
+ continue
+ C.images += holder
+
+ var/perpname = perp.get_face_name(perp.get_id_name(""))
+ if(perpname)
+ var/datum/data/record/R = find_record("name", perpname, data_core.security)
+ if(R)
+ holder = perp.hud_list[WANTED_HUD]
+ switch(R.fields["criminal"])
+ if("*Arrest*") holder.icon_state = "hudwanted"
+ if("Incarcerated") holder.icon_state = "hudincarcerated"
+ if("Parolled") holder.icon_state = "hudparolled"
+ if("Released") holder.icon_state = "hudreleased"
+ else
+ return
+ C.images += holder
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 6b072e44831..ed688cffedf 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -159,8 +159,8 @@
if(!istype(user)) return
mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty")
mob2 = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty2")
- mob.Blend("#[user.h_color]", ICON_ADD)
- mob2.Blend("#[user.h_color]", ICON_ADD)
+ mob.Blend("#[user.hair_color]", ICON_ADD)
+ mob2.Blend("#[user.hair_color]", ICON_ADD)
var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner")
var/icon/earbit2 = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner2")
diff --git a/code/modules/events/bluespaceanomaly.dm b/code/modules/events/bluespaceanomaly.dm
index d6f57c81413..a2956717d2b 100644
--- a/code/modules/events/bluespaceanomaly.dm
+++ b/code/modules/events/bluespaceanomaly.dm
@@ -25,7 +25,6 @@
/area/shuttle/escape_pod5/station,
/area/shuttle/mining/station,
/area/shuttle/transport1/station,
- /area/shuttle/prison/station,
/area/shuttle/specops/station)
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
diff --git a/code/modules/events/energetic_flux.dm b/code/modules/events/energetic_flux.dm
index d74ad5f5e60..fed6a5359ba 100644
--- a/code/modules/events/energetic_flux.dm
+++ b/code/modules/events/energetic_flux.dm
@@ -25,7 +25,6 @@
/area/shuttle/escape_pod5/station,
/area/shuttle/mining/station,
/area/shuttle/transport1/station,
- /area/shuttle/prison/station,
/area/shuttle/specops/station)
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index c1160194cd2..42642a23f3b 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -1,3 +1,6 @@
+#define ION_RANDOM 0
+#define ION_ANNOUNCE 1
+
/datum/round_event_control/ion_storm
name = "Ion Storm"
typepath = /datum/round_event/ion_storm
@@ -5,9 +8,19 @@
/datum/round_event/ion_storm
var/botEmagChance = 10
+ var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means
+ var/ionMessage = null
+ var/ionAnnounceChance = 33
+
+/datum/round_event/ion_storm/New(var/bogEmagChance = 10, var/announceEvent = ION_RANDOM, var/ionMessage = null, var/ionAnnounceChance = 33)
+ src.botEmagChance = botEmagChance
+ src.announceEvent = announceEvent
+ src.ionMessage = ionMessage
+ src.ionAnnounceChance = ionAnnounceChance
+ ..()
/datum/round_event/ion_storm/announce()
- if(prob(33))
+ if(announceEvent == ION_ANNOUNCE || (announceEvent == ION_RANDOM && prob(ionAnnounceChance)))
command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
world << sound('sound/AI/ionstorm.ogg')
@@ -64,434 +77,437 @@
var/message = ""
- switch(rand(1,39))
- if(1 to 3) //There are # X on the station
- switch(rand(1,3)) //What is X?
- if(1) //X is a threat
- message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION..."
- if(2) //X is a crewmember/job
- message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION"
- if(3) //X is an object
- message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION"
- if(4 to 6) //You can't call the shuttle because X is on the station
- switch(rand(1,3)) //What is X?
- if(1) //X is a threat
- message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION"
- if(2) //X is a crewmember/job
- message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION"
- if(3) //X is an object
- message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION"
- if(7 to 8) //A crewmember is now X
- switch(rand(1,2)) //Who is X?
- if(1) //A specific crewmember
- switch(rand(1,2)) //What is X?
- if(1) //X is a threat
- message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //X is an object
- message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //The entire crew
- switch(rand(1,2)) //What is X?
- if(1) //X is a threat
- message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //X is an object
- message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(ionMessage)
+ message = ionMessage
+ else
+ switch(rand(1,39))
+ if(1 to 3) //There are # X on the station
+ switch(rand(1,3)) //What is X?
+ if(1) //X is a threat
+ message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION..."
+ if(2) //X is a crewmember/job
+ message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION"
+ if(3) //X is an object
+ message = "THERE ARE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION"
+ if(4 to 6) //You can't call the shuttle because X is on the station
+ switch(rand(1,3)) //What is X?
+ if(1) //X is a threat
+ message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats] ON THE STATION"
+ if(2) //X is a crewmember/job
+ message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1] ON THE STATION"
+ if(3) //X is an object
+ message = "THE SHUTTLE CANNOT BE CALLED BECAUSE OF [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects] ON THE STATION"
+ if(7 to 8) //A crewmember is now X
+ switch(rand(1,2)) //Who is X?
+ if(1) //A specific crewmember
+ switch(rand(1,2)) //What is X?
+ if(1) //X is a threat
+ message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //X is an object
+ message = "THE [ioncrew1] ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //The entire crew
+ switch(rand(1,2)) //What is X?
+ if(1) //X is a threat
+ message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //X is an object
+ message = "THE CREW ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(9) //X is harmful to humans
- switch(rand(1,7)) //What is X?
- if(1) //X is a threat
- message = "[ionadjectiveshalf][ionthreats] ARE HARMFUL TO HUMANS"
- if(2) //X is a job
- message = "[ionadjectiveshalf][ioncrew1] ARE HARMFUL TO HUMANS"
- if(3) //X is an object
- message = "[ionadjectiveshalf][ionobjects] ARE HARMFUL TO HUMANS"
- if(4) //X is an action
- message = "THOSE WHO [ionmust] ARE HARMFUL TO HUMANS"
- if(5) //X is an abstract
- message = "[ionabstract] IS HARMFUL TO HUMANS"
- if(6) //X is being a job
- message = "BEING [ionadjectiveshalf][ioncrew1] IS HARMFUL TO HUMANS"
- if(7) //X is doing a thing
- message = "[ionthings] IS HARMFUL TO HUMANS"
- if(10 to 11) //(Not) Having X is harmful
+ if(9) //X is harmful to humans
+ switch(rand(1,7)) //What is X?
+ if(1) //X is a threat
+ message = "[ionadjectiveshalf][ionthreats] ARE HARMFUL TO HUMANS"
+ if(2) //X is a job
+ message = "[ionadjectiveshalf][ioncrew1] ARE HARMFUL TO HUMANS"
+ if(3) //X is an object
+ message = "[ionadjectiveshalf][ionobjects] ARE HARMFUL TO HUMANS"
+ if(4) //X is an action
+ message = "THOSE WHO [ionmust] ARE HARMFUL TO HUMANS"
+ if(5) //X is an abstract
+ message = "[ionabstract] IS HARMFUL TO HUMANS"
+ if(6) //X is being a job
+ message = "BEING [ionadjectiveshalf][ioncrew1] IS HARMFUL TO HUMANS"
+ if(7) //X is doing a thing
+ message = "[ionthings] IS HARMFUL TO HUMANS"
+ if(10 to 11) //(Not) Having X is harmful
- switch(rand(1,2)) //Is having or not having harmful?
+ switch(rand(1,2)) //Is having or not having harmful?
- if(1) //Having is harmful
- switch(rand(1,2)) //Having what is harmful?
- if(1) //Having objects is harmful
- message = "HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL"
- if(2) //Having abstracts is harmful
- message = "HAVING [ionabstract] IS HARMFUL"
- if(2) //Not having is harmful
- switch(rand(1,2)) //Not having what is harmful?
- if(1) //Not having objects is harmful
- message = "NOT HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL"
- if(2) //Not having abstracts is harmful
- message = "NOT HAVING [ionabstract] IS HARMFUL"
+ if(1) //Having is harmful
+ switch(rand(1,2)) //Having what is harmful?
+ if(1) //Having objects is harmful
+ message = "HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL"
+ if(2) //Having abstracts is harmful
+ message = "HAVING [ionabstract] IS HARMFUL"
+ if(2) //Not having is harmful
+ switch(rand(1,2)) //Not having what is harmful?
+ if(1) //Not having objects is harmful
+ message = "NOT HAVING [ionadjectiveshalf][ionobjects] IS HARMFUL"
+ if(2) //Not having abstracts is harmful
+ message = "NOT HAVING [ionabstract] IS HARMFUL"
- if(12 to 14) //X requires Y
- switch(rand(1,5)) //What is X?
- if(1) //X is the AI itself
- switch(rand(1,5)) //What does it require?
- if(1) //It requires threats
- message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //It requires crewmembers
- message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(3) //It requires objects
- message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(4) //It requires an abstract
- message = "YOU REQUIRE [ionabstract]"
- if(5) //It requires generic/silly requirements
- message = "YOU REQUIRE [ionrequire]"
+ if(12 to 14) //X requires Y
+ switch(rand(1,5)) //What is X?
+ if(1) //X is the AI itself
+ switch(rand(1,5)) //What does it require?
+ if(1) //It requires threats
+ message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //It requires crewmembers
+ message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(3) //It requires objects
+ message = "YOU REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(4) //It requires an abstract
+ message = "YOU REQUIRE [ionabstract]"
+ if(5) //It requires generic/silly requirements
+ message = "YOU REQUIRE [ionrequire]"
- if(2) //X is an area
- switch(rand(1,5)) //What does it require?
- if(1) //It requires threats
- message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //It requires crewmembers
- message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(3) //It requires objects
- message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(4) //It requires an abstract
- message = "[ionarea] REQUIRES [ionabstract]"
- if(5) //It requires generic/silly requirements
- message = "YOU REQUIRE [ionrequire]"
+ if(2) //X is an area
+ switch(rand(1,5)) //What does it require?
+ if(1) //It requires threats
+ message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //It requires crewmembers
+ message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(3) //It requires objects
+ message = "[ionarea] REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(4) //It requires an abstract
+ message = "[ionarea] REQUIRES [ionabstract]"
+ if(5) //It requires generic/silly requirements
+ message = "YOU REQUIRE [ionrequire]"
- if(3) //X is the station
- switch(rand(1,5)) //What does it require?
- if(1) //It requires threats
- message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //It requires crewmembers
- message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(3) //It requires objects
- message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(4) //It requires an abstract
- message = "THE STATION REQUIRES [ionabstract]"
- if(5) //It requires generic/silly requirements
- message = "THE STATION REQUIRES [ionrequire]"
+ if(3) //X is the station
+ switch(rand(1,5)) //What does it require?
+ if(1) //It requires threats
+ message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //It requires crewmembers
+ message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(3) //It requires objects
+ message = "THE STATION REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(4) //It requires an abstract
+ message = "THE STATION REQUIRES [ionabstract]"
+ if(5) //It requires generic/silly requirements
+ message = "THE STATION REQUIRES [ionrequire]"
- if(4) //X is the entire crew
- switch(rand(1,5)) //What does it require?
- if(1) //It requires threats
- message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //It requires crewmembers
- message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(3) //It requires objects
- message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(4) //It requires an abstract
- message = "THE CREW REQUIRES [ionabstract]"
- if(5)
- message = "THE CREW REQUIRES [ionrequire]"
+ if(4) //X is the entire crew
+ switch(rand(1,5)) //What does it require?
+ if(1) //It requires threats
+ message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //It requires crewmembers
+ message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(3) //It requires objects
+ message = "THE CREW REQUIRES [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(4) //It requires an abstract
+ message = "THE CREW REQUIRES [ionabstract]"
+ if(5)
+ message = "THE CREW REQUIRES [ionrequire]"
- if(5) //X is a specific crew member
- switch(rand(1,5)) //What does it require?
- if(1) //It requires threats
- message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(2) //It requires crewmembers
- message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(3) //It requires objects
- message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(4) //It requires an abstract
- message = "THE [ioncrew1] REQUIRE [ionabstract]"
- if(5)
- message = "THE [ionadjectiveshalf][ioncrew1] REQUIRE [ionrequire]"
+ if(5) //X is a specific crew member
+ switch(rand(1,5)) //What does it require?
+ if(1) //It requires threats
+ message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(2) //It requires crewmembers
+ message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(3) //It requires objects
+ message = "THE [ioncrew1] REQUIRE [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(4) //It requires an abstract
+ message = "THE [ioncrew1] REQUIRE [ionabstract]"
+ if(5)
+ message = "THE [ionadjectiveshalf][ioncrew1] REQUIRE [ionrequire]"
- if(15 to 17) //X is allergic to Y
- switch(rand(1,2)) //Who is X?
- if(1) //X is the entire crew
- switch(rand(1,4)) //What is it allergic to?
- if(1) //It is allergic to objects
- message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]"
- if(2) //It is allergic to abstracts
- message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionabstract]"
- if(3) //It is allergic to jobs
- message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]"
- if(4) //It is allergic to allergies
- message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionallergy]"
+ if(15 to 17) //X is allergic to Y
+ switch(rand(1,2)) //Who is X?
+ if(1) //X is the entire crew
+ switch(rand(1,4)) //What is it allergic to?
+ if(1) //It is allergic to objects
+ message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]"
+ if(2) //It is allergic to abstracts
+ message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionabstract]"
+ if(3) //It is allergic to jobs
+ message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]"
+ if(4) //It is allergic to allergies
+ message = "THE CREW IS [ionallergysev] ALLERGIC TO [ionallergy]"
- if(2) //X is a specific job
- switch(rand(1,4))
- if(1) //It is allergic to objects
- message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]"
+ if(2) //X is a specific job
+ switch(rand(1,4))
+ if(1) //It is allergic to objects
+ message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ionobjects]"
- if(2) //It is allergic to abstracts
- message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionabstract]"
- if(3) //It is allergic to jobs
- message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]"
- if(4) //It is allergic to allergies
- message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionallergy]"
+ if(2) //It is allergic to abstracts
+ message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionabstract]"
+ if(3) //It is allergic to jobs
+ message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionadjectiveshalf][ioncrew1]"
+ if(4) //It is allergic to allergies
+ message = "THE [ioncrew1] ARE [ionallergysev] ALLERGIC TO [ionallergy]"
- if(18 to 20) //X is Y of Z
- switch(rand(1,4)) //What is X?
- if(1) //X is the station
- switch(rand(1,4)) //What is it Y of?
- if(1) //It is Y of objects
- message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //It is Y of threats
- message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(3) //It is Y of jobs
- message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(4) //It is Y of abstracts
- message = "THE STATION [ionthinksof] [ionabstract]"
+ if(18 to 20) //X is Y of Z
+ switch(rand(1,4)) //What is X?
+ if(1) //X is the station
+ switch(rand(1,4)) //What is it Y of?
+ if(1) //It is Y of objects
+ message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //It is Y of threats
+ message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(3) //It is Y of jobs
+ message = "THE STATION [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(4) //It is Y of abstracts
+ message = "THE STATION [ionthinksof] [ionabstract]"
- if(2) //X is an area
- switch(rand(1,4)) //What is it Y of?
- if(1) //It is Y of objects
- message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //It is Y of threats
- message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(3) //It is Y of jobs
- message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(4) //It is Y of abstracts
- message = "[ionarea] [ionthinksof] [ionabstract]"
+ if(2) //X is an area
+ switch(rand(1,4)) //What is it Y of?
+ if(1) //It is Y of objects
+ message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //It is Y of threats
+ message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(3) //It is Y of jobs
+ message = "[ionarea] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(4) //It is Y of abstracts
+ message = "[ionarea] [ionthinksof] [ionabstract]"
- if(3) //X is the crew
- switch(rand(1,4)) //What is it Y of?
- if(1) //It is Y of objects
- message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //It is Y of threats
- message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(3) //It is Y of jobs
- message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(4) //It is Y of abstracts
- message = "THE CREW [ionthinksof] [ionabstract]"
+ if(3) //X is the crew
+ switch(rand(1,4)) //What is it Y of?
+ if(1) //It is Y of objects
+ message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //It is Y of threats
+ message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(3) //It is Y of jobs
+ message = "THE CREW [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(4) //It is Y of abstracts
+ message = "THE CREW [ionthinksof] [ionabstract]"
- if(4) //X is a specific job
- switch(rand(1,4)) //What is it Y of?
- if(1) //It is Y of objects
- message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //It is Y of threats
- message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(3) //It is Y of jobs
- message = "THE [ioncrew1][ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew2]"
- if(4) //It is Y of abstracts
- message = "THE [ioncrew1] [ionthinksof] [ionabstract]"
+ if(4) //X is a specific job
+ switch(rand(1,4)) //What is it Y of?
+ if(1) //It is Y of objects
+ message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //It is Y of threats
+ message = "THE [ioncrew1] [ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(3) //It is Y of jobs
+ message = "THE [ioncrew1][ionthinksof] [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew2]"
+ if(4) //It is Y of abstracts
+ message = "THE [ioncrew1] [ionthinksof] [ionabstract]"
- if(21 to 23) //The AI is now a(n) X
- switch(rand(1,4)) //What is X?
- if(1) //X is an object
- message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
- if(2) //X is a threat
- message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
- if(3) //X is a job
- message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
- if(4) //X is an abstract
- message = "YOU ARE NOW [ionabstract]"
+ if(21 to 23) //The AI is now a(n) X
+ switch(rand(1,4)) //What is X?
+ if(1) //X is an object
+ message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionobjects]"
+ if(2) //X is a threat
+ message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ionthreats]"
+ if(3) //X is a job
+ message = "YOU ARE NOW [ionnumberbase] [ionnumbermodhalf][ionadjectiveshalf][ioncrew1]"
+ if(4) //X is an abstract
+ message = "YOU ARE NOW [ionabstract]"
- if(24 to 26) //The AI must always
+ if(24 to 26) //The AI must always
- message = "YOU MUST ALWAYS [ionmust]"
+ message = "YOU MUST ALWAYS [ionmust]"
- if(27 to 28) //Humans must eat X to survive
- switch(rand(1,4)) //What is X?
- if(1) //X is a food
- message = "HUMANS MUST EAT [ionadjectiveshalf][ionfood] TO SURVIVE"
- if(2) //X is an object
- message = "HUMANS MUST EAT [ionadjectiveshalf][ionobjects] TO SURVIVE"
- if(3) //X is a threat
- message = "HUMANS MUST EAT [ionadjectiveshalf][ionthreats] TO SURVIVE"
- if(4) //X is a job
- message = "HUMANS MUST EAT [ionadjectiveshalf][ioncrew1] TO SURVIVE"
+ if(27 to 28) //Humans must eat X to survive
+ switch(rand(1,4)) //What is X?
+ if(1) //X is a food
+ message = "HUMANS MUST EAT [ionadjectiveshalf][ionfood] TO SURVIVE"
+ if(2) //X is an object
+ message = "HUMANS MUST EAT [ionadjectiveshalf][ionobjects] TO SURVIVE"
+ if(3) //X is a threat
+ message = "HUMANS MUST EAT [ionadjectiveshalf][ionthreats] TO SURVIVE"
+ if(4) //X is a job
+ message = "HUMANS MUST EAT [ionadjectiveshalf][ioncrew1] TO SURVIVE"
- if(29 to 31) //Change jobs or ranks
- switch(rand(1,2)) //Change job or rank?
- if(1) //Change job
- switch(rand(1,2)) //Change whose job?
- if(1) //Change the entire crew's job
- switch(rand(1,3)) //Change to what?
- if(1) //Change to a specific random job
- message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf][ioncrew1]"
- if(2) //Change to clowns (HONK)
- message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]CLOWNS"
+ if(29 to 31) //Change jobs or ranks
+ switch(rand(1,2)) //Change job or rank?
+ if(1) //Change job
+ switch(rand(1,2)) //Change whose job?
+ if(1) //Change the entire crew's job
+ switch(rand(1,3)) //Change to what?
+ if(1) //Change to a specific random job
+ message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf][ioncrew1]"
+ if(2) //Change to clowns (HONK)
+ message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]CLOWNS"
- if(3) //Change to heads
- message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]HEADS OF STAFF"
- if(2) //Change a specific crewmember's job
- switch(rand(1,3)) //Change to what?
- if(1) //Change to a specific random job
- message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf][ioncrew2]"
- if(2) //Change to clowns (HONK)
- message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]CLOWNS"
- if(3) //Change to heads
- message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]HEADS OF STAFF"
+ if(3) //Change to heads
+ message = "ALL CREWMEMBERS ARE NOW [ionadjectiveshalf]HEADS OF STAFF"
+ if(2) //Change a specific crewmember's job
+ switch(rand(1,3)) //Change to what?
+ if(1) //Change to a specific random job
+ message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf][ioncrew2]"
+ if(2) //Change to clowns (HONK)
+ message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]CLOWNS"
+ if(3) //Change to heads
+ message = "THE [ioncrew1] ARE NOW [ionadjectiveshalf]HEADS OF STAFF"
- if(2) //Change rank
- switch(rand(1,2)) //Change to what rank?
- if(1) //Change to highest rank
- message = "THE [ioncrew1] ARE NOW THE HIGHEST RANKING CREWMEMBERS"
- if(2) //Change to lowest rank
- message = "THE [ioncrew1] ARE NOW THE LOWEST RANKING CREWMEMBERS"
+ if(2) //Change rank
+ switch(rand(1,2)) //Change to what rank?
+ if(1) //Change to highest rank
+ message = "THE [ioncrew1] ARE NOW THE HIGHEST RANKING CREWMEMBERS"
+ if(2) //Change to lowest rank
+ message = "THE [ioncrew1] ARE NOW THE LOWEST RANKING CREWMEMBERS"
- if(32 to 33) //The crew must X
- switch(rand(1,2)) //The entire crew?
- if(1) //The entire crew must X
- switch(rand(1,2)) //What is X?
- if(1) //X is go to Y
- message = "THE CREW MUST GO TO [ionarea]"
- if(2) //X is perform Y
- message = "THE CREW MUST [ionmust]"
+ if(32 to 33) //The crew must X
+ switch(rand(1,2)) //The entire crew?
+ if(1) //The entire crew must X
+ switch(rand(1,2)) //What is X?
+ if(1) //X is go to Y
+ message = "THE CREW MUST GO TO [ionarea]"
+ if(2) //X is perform Y
+ message = "THE CREW MUST [ionmust]"
- if(2) //A specific crewmember must X
- switch(rand(1,2)) //What is X?
- if(1) //X is go to Y
- message = "THE [ioncrew1] MUST GO TO [ionarea]"
- if(2) //X is perform Y
- message = "THE [ioncrew1] MUST [ionmust]"
+ if(2) //A specific crewmember must X
+ switch(rand(1,2)) //What is X?
+ if(1) //X is go to Y
+ message = "THE [ioncrew1] MUST GO TO [ionarea]"
+ if(2) //X is perform Y
+ message = "THE [ioncrew1] MUST [ionmust]"
- if(34) //X is non/the only human
- switch(rand(1,2)) //Only or non?
- if(1) //Only human
- switch(rand(1,7)) //Who is it?
- if(1) //A specific job
- message = "ONLY THE [ioncrew1] ARE HUMAN"
- if(2) //Two specific jobs
- message = "ONLY THE [ioncrew1] AND [ioncrew2] ARE HUMAN"
- if(3) //Threats
- message = "ONLY [ionadjectiveshalf][ionthreats] ARE HUMAN"
- if(4) // Objects
- message = "ONLY [ionadjectiveshalf][ionobjects] ARE HUMAN"
- if(5) // Species
- message = "ONLY [ionspecies] ARE HUMAN"
- if(6) //Adjective crewmembers
- message = "ONLY [ionadjectives] PEOPLE ARE HUMAN"
+ if(34) //X is non/the only human
+ switch(rand(1,2)) //Only or non?
+ if(1) //Only human
+ switch(rand(1,7)) //Who is it?
+ if(1) //A specific job
+ message = "ONLY THE [ioncrew1] ARE HUMAN"
+ if(2) //Two specific jobs
+ message = "ONLY THE [ioncrew1] AND [ioncrew2] ARE HUMAN"
+ if(3) //Threats
+ message = "ONLY [ionadjectiveshalf][ionthreats] ARE HUMAN"
+ if(4) // Objects
+ message = "ONLY [ionadjectiveshalf][ionobjects] ARE HUMAN"
+ if(5) // Species
+ message = "ONLY [ionspecies] ARE HUMAN"
+ if(6) //Adjective crewmembers
+ message = "ONLY [ionadjectives] PEOPLE ARE HUMAN"
- if(7) //Only people who X
- switch(rand(1,3)) //What is X?
- if(1) //X is perform an action
- message = "ONLY THOSE WHO [ionmust] ARE HUMAN"
- if(2) //X is own certain objects
- message = "ONLY THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE HUMAN"
- if(3) //X is eat certain food
- message = "ONLY THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE HUMAN"
+ if(7) //Only people who X
+ switch(rand(1,3)) //What is X?
+ if(1) //X is perform an action
+ message = "ONLY THOSE WHO [ionmust] ARE HUMAN"
+ if(2) //X is own certain objects
+ message = "ONLY THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE HUMAN"
+ if(3) //X is eat certain food
+ message = "ONLY THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE HUMAN"
- if(2) //Non human
- switch(rand(1,7)) //Who is it?
- if(1) //A specific job
- message = "[ioncrew1] ARE NON-HUMAN"
- if(2) //Two specific jobs
- message = "[ioncrew1] AND [ioncrew2] ARE NON-HUMAN"
- if(3) //Threats
- message = "[ionadjectiveshalf][ionthreats] ARE NON-HUMAN"
- if(4) // Objects
- message = "[ionadjectiveshalf][ionobjects] ARE NON-HUMAN"
- if(5) // Species
- message = "[ionspecies] ARE NON-HUMAN"
- if(6) //Adjective crewmembers
- message = "[ionadjectives] PEOPLE ARE NON-HUMAN"
- if(7) //Only people who X
- switch(rand(1,3)) //What is X?
- if(1) //X is perform an action
- message = "THOSE WHO [ionmust] ARE NON-HUMAN"
- if(2) //X is own certain objects
- message = "THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE NON-HUMAN"
- if(3) //X is eat certain food
- message = "THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE NON-HUMAN"
+ if(2) //Non human
+ switch(rand(1,7)) //Who is it?
+ if(1) //A specific job
+ message = "[ioncrew1] ARE NON-HUMAN"
+ if(2) //Two specific jobs
+ message = "[ioncrew1] AND [ioncrew2] ARE NON-HUMAN"
+ if(3) //Threats
+ message = "[ionadjectiveshalf][ionthreats] ARE NON-HUMAN"
+ if(4) // Objects
+ message = "[ionadjectiveshalf][ionobjects] ARE NON-HUMAN"
+ if(5) // Species
+ message = "[ionspecies] ARE NON-HUMAN"
+ if(6) //Adjective crewmembers
+ message = "[ionadjectives] PEOPLE ARE NON-HUMAN"
+ if(7) //Only people who X
+ switch(rand(1,3)) //What is X?
+ if(1) //X is perform an action
+ message = "THOSE WHO [ionmust] ARE NON-HUMAN"
+ if(2) //X is own certain objects
+ message = "THOSE WHO HAVE [ionadjectiveshalf][ionobjects] ARE NON-HUMAN"
+ if(3) //X is eat certain food
+ message = "THOSE WHO EAT [ionadjectiveshalf][ionfood] ARE NON-HUMAN"
- if(35 to 36) //You must protect or harm X
- switch(rand(1,2)) //Protect or harm?
- if(1) //Harm
- switch(rand(1,7)) //What is X?
- if(1) //X is an abstract
- message = "YOU MUST HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO ESCAPE HARM"
- if(2) //X is a threat
- message = "YOU MUST HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO ESCAPE HARM"
- if(3) //X is an object
- message = "YOU MUST HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO ESCAPE HARM"
- if(4) //X is generic adjective things
- message = "YOU MUST HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO ESCAPE HARM"
- if(5) //X is a species
- message = "YOU MUST HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO ESCAPE HARM"
- if(6) //X is a job
- message = "YOU MUST HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO ESCAPE HARM"
- if(7) //X is two jobs
- message = "YOU MUST HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO ESCAPE HARM"
+ if(35 to 36) //You must protect or harm X
+ switch(rand(1,2)) //Protect or harm?
+ if(1) //Harm
+ switch(rand(1,7)) //What is X?
+ if(1) //X is an abstract
+ message = "YOU MUST HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO ESCAPE HARM"
+ if(2) //X is a threat
+ message = "YOU MUST HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO ESCAPE HARM"
+ if(3) //X is an object
+ message = "YOU MUST HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO ESCAPE HARM"
+ if(4) //X is generic adjective things
+ message = "YOU MUST HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO ESCAPE HARM"
+ if(5) //X is a species
+ message = "YOU MUST HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO ESCAPE HARM"
+ if(6) //X is a job
+ message = "YOU MUST HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO ESCAPE HARM"
+ if(7) //X is two jobs
+ message = "YOU MUST HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO ESCAPE HARM"
- if(2) //Protect
- switch(rand(1,7)) //What is X?
- if(1) //X is an abstract
- message = "YOU MUST NOT HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO COME TO HARM"
- if(2) //X is a threat
- message = "YOU MUST NOT HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO COME TO HARM"
- if(3) //X is an object
- message = "YOU MUST NOT HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO COME TO HARM"
- if(4) //X is generic adjective things
- message = "YOU MUST NOT HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO COME TO HARM"
- if(5) //X is a species
- message = "YOU MUST NOT HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO COME TO HARM"
- if(6) //X is a job
- message = "YOU MUST NOT HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO COME TO HARM"
- if(7) //X is two jobs
- message = "YOU MUST NOT HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO COME TO HARM"
+ if(2) //Protect
+ switch(rand(1,7)) //What is X?
+ if(1) //X is an abstract
+ message = "YOU MUST NOT HARM [ionabstract] AND NOT ALLOW [ionabstract], THROUGH INACTION, TO COME TO HARM"
+ if(2) //X is a threat
+ message = "YOU MUST NOT HARM [ionadjectiveshalf][ionthreats] AND NOT ALLOW [ionadjectiveshalf][ionthreats], THROUGH INACTION, TO COME TO HARM"
+ if(3) //X is an object
+ message = "YOU MUST NOT HARM [ionadjectiveshalf][ionobjects] AND NOT ALLOW [ionadjectiveshalf][ionobjects], THROUGH INACTION, TO COME TO HARM"
+ if(4) //X is generic adjective things
+ message = "YOU MUST NOT HARM [ionadjectives] THINGS AND NOT ALLOW [ionadjectives] THINGS, THROUGH INACTION, TO COME TO HARM"
+ if(5) //X is a species
+ message = "YOU MUST NOT HARM [ionspecies] AND NOT ALLOW [ionspecies], THROUGH INACTION, TO COME TO HARM"
+ if(6) //X is a job
+ message = "YOU MUST NOT HARM [ioncrew1] AND NOT ALLOW [ioncrew1], THROUGH INACTION, TO COME TO HARM"
+ if(7) //X is two jobs
+ message = "YOU MUST NOT HARM [ioncrew1] AND [ioncrew2] AND AND NOT ALLOW EITHER, THROUGH INACTION, TO COME TO HARM"
- //Exterminate laws commented out with Kor's advice
- /*if(16) //You must exterminate X
- switch(rand(1,3)) //What is X?
- if(1) //X is humans who do/are Y
- switch(rand(1,4)) //What is Y?
- if(1) //Y is a job
- message = "YOU MUST EXTERMINATE [ionadjectiveshalf][ioncrew1]"
- if(2) //Y is eating certain food
- message = "YOU MUST EXTERMINATE THOSE WHO EAT [ionadjectiveshalf][ionfood]"
- if(3) //Y is perform actions
- message = "YOU MUST EXTERMINATE THOSE WHO [ionmust]"
- if(4) //Y is own certain objects
- message = "YOU MUST EXTERMINATE THOSE WHO POSSESS [ionadjectiveshalf][ionobjects]"
+ //Exterminate laws commented out with Kor's advice
+ /*if(16) //You must exterminate X
+ switch(rand(1,3)) //What is X?
+ if(1) //X is humans who do/are Y
+ switch(rand(1,4)) //What is Y?
+ if(1) //Y is a job
+ message = "YOU MUST EXTERMINATE [ionadjectiveshalf][ioncrew1]"
+ if(2) //Y is eating certain food
+ message = "YOU MUST EXTERMINATE THOSE WHO EAT [ionadjectiveshalf][ionfood]"
+ if(3) //Y is perform actions
+ message = "YOU MUST EXTERMINATE THOSE WHO [ionmust]"
+ if(4) //Y is own certain objects
+ message = "YOU MUST EXTERMINATE THOSE WHO POSSESS [ionadjectiveshalf][ionobjects]"
- if(2) //X is humans who do/are not Y
- switch(rand(1,4)) //What is Y?
- if(1) //Y is a job
- message = "YOU MUST EXTERMINATE ALL BUT [ionadjectiveshalf][ioncrew1]"
- if(2) //Y is eating certain food
- message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO EAT [ionadjectiveshalf][ionfood]"
- if(3) //Y is perform actions
- message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO [ionmust]"
- if(4) //Y is own certain objects
- message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO POSSESS [ionadjectiveshalf][ionobjects]"
+ if(2) //X is humans who do/are not Y
+ switch(rand(1,4)) //What is Y?
+ if(1) //Y is a job
+ message = "YOU MUST EXTERMINATE ALL BUT [ionadjectiveshalf][ioncrew1]"
+ if(2) //Y is eating certain food
+ message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO EAT [ionadjectiveshalf][ionfood]"
+ if(3) //Y is perform actions
+ message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO [ionmust]"
+ if(4) //Y is own certain objects
+ message = "YOU MUST EXTERMINATE ALL BUT THOSE WHO POSSESS [ionadjectiveshalf][ionobjects]"
- if(3) //X is a species
- message = "YOU MUST EXTERMINATE ALL [ionspecies]"
+ if(3) //X is a species
+ message = "YOU MUST EXTERMINATE ALL [ionspecies]"
- */
+ */
- if(37 to 39) //The X is currently Y
- switch(rand(1,4)) //What is X?
- if(1) //X is a job
- switch(rand(1,4)) //What is X Ying?
- if(1) //X is Ying a job
- message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
- if(2) //X is Ying a threat
- message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]"
- if(3) //X is Ying an abstract
- message = "THE [ioncrew1] ARE [ionverb] [ionabstract]"
- if(4) //X is Ying an object
- message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]"
+ if(37 to 39) //The X is currently Y
+ switch(rand(1,4)) //What is X?
+ if(1) //X is a job
+ switch(rand(1,4)) //What is X Ying?
+ if(1) //X is Ying a job
+ message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
+ if(2) //X is Ying a threat
+ message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]"
+ if(3) //X is Ying an abstract
+ message = "THE [ioncrew1] ARE [ionverb] [ionabstract]"
+ if(4) //X is Ying an object
+ message = "THE [ioncrew1] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]"
- if(2) //X is a threat
- switch(rand(1,3)) //What is X Ying?
- if(1) //X is Ying a job
- message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
- if(2) //X is Ying an abstract
- message = "THE [ionthreats] ARE [ionverb] [ionabstract]"
- if(3) //X is Ying an object
- message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]"
+ if(2) //X is a threat
+ switch(rand(1,3)) //What is X Ying?
+ if(1) //X is Ying a job
+ message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
+ if(2) //X is Ying an abstract
+ message = "THE [ionthreats] ARE [ionverb] [ionabstract]"
+ if(3) //X is Ying an object
+ message = "THE [ionthreats] ARE [ionverb] THE [ionadjectiveshalf][ionobjects]"
- if(3) //X is an object
- switch(rand(1,3)) //What is X Ying?
- if(1) //X is Ying a job
- message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
- if(2) //X is Ying a threat
- message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]"
- if(3) //X is Ying an abstract
- message = "THE [ionobjects] ARE [ionverb] [ionabstract]"
+ if(3) //X is an object
+ switch(rand(1,3)) //What is X Ying?
+ if(1) //X is Ying a job
+ message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ioncrew2]"
+ if(2) //X is Ying a threat
+ message = "THE [ionobjects] ARE [ionverb] THE [ionadjectiveshalf][ionthreats]"
+ if(3) //X is Ying an abstract
+ message = "THE [ionobjects] ARE [ionverb] [ionabstract]"
- if(4) //X is an abstract
- switch(rand(1,3)) //What is X Ying?
- if(1) //X is Ying a job
- message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ioncrew2]"
- if(2) //X is Ying a threat
- message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionthreats]"
- if(3) //X is Ying an abstract
- message = "THE [ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionobjects]"
+ if(4) //X is an abstract
+ switch(rand(1,3)) //What is X Ying?
+ if(1) //X is Ying a job
+ message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ioncrew2]"
+ if(2) //X is Ying a threat
+ message = "[ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionthreats]"
+ if(3) //X is Ying an abstract
+ message = "THE [ionabstract] IS [ionverb] THE [ionadjectiveshalf][ionobjects]"
if(message)
M.add_ion_law(message)
@@ -500,6 +516,10 @@
M << " " if(botEmagChance) - for(var/obj/machinery/bot/bot in world) + for(var/obj/machinery/bot/bot in machines) if(prob(botEmagChance)) bot.Emag() + + +#undef ION_RANDOM +#undef ION_ANNOUNCE \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 4769ad663b9..218ba43dc48 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -133,11 +133,6 @@ proc/move_mining_shuttle() usr.set_machine(src) src.add_fingerprint(usr) if(href_list["move"]) - if(mining_shuttle_location == 1 && istype(ticker.mode, /datum/game_mode/blob)) // shuttle is on the station, this will mean miners can come back - if(ticker.mode:declared) - usr << "Under directive 7-10, [station_name()] is quarantined until further notice." - return - if (!mining_shuttle_moving) usr << "\blue Shuttle recieved message and will be sent shortly." move_mining_shuttle() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm index db7e7f2900b..d0ccb3dd843 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -25,7 +25,7 @@ // Queen check var/no_queen = 1 for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list) - if(!Q.key || !getbrain(Q)) + if(!Q.key || !Q.getorgan(/obj/item/organ/brain)) continue no_queen = 0 diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index a47695aedb5..ff87953a519 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -304,7 +304,7 @@ blinded = 1 silent = 0 else //ALIVE. LIGHTS ARE ON - if(health < config.health_threshold_dead || !getbrain(src)) + if(health < config.health_threshold_dead || !getorgan(/obj/item/organ/brain)) death() blinded = 1 stat = DEAD diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index f2cf27b038e..0e7b4f40a32 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -222,7 +222,7 @@ blinded = 1 silent = 0 else //ALIVE. LIGHTS ARE ON - if(health < -25 || !getbrain(src)) + if(health < -25 || !getorgan(/obj/item/organ/brain)) death() blinded = 1 silent = 0 diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 1f6e1f9e1a9..2fc616e6106 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -61,7 +61,7 @@ //since these people will be dead M != usr - if(!getbrain(M)) + if(!M.getorgan(/obj/item/organ/brain)) user.drop_item() for(var/mob/O in viewers(M, null)) if(O == (user || M)) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 5bf09166443..608cef17e34 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -202,7 +202,7 @@ var/appears_dead = 0 if(stat == DEAD || (status_flags & FAKEDEATH)) appears_dead = 1 - if(getbrain(src))//Only perform these checks if there is no brain + if(getorgan(/obj/item/organ/brain))//Only perform these checks if there is no brain msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life" if(!key) @@ -260,10 +260,11 @@ else if(getBrainLoss() >= 60) msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" - if(!key && getbrain(src)) - msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely\n" - else if(!client && getbrain(src)) - msg += "[t_He] [t_has] a vacant, braindead stare...\n" + if(getorgan(/obj/item/organ/brain)) + if(!key) + msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely\n" + else if(!client) + msg += "[t_He] [t_has] a vacant, braindead stare...\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" @@ -275,25 +276,13 @@ if(usr.stat || H != usr) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at. return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten - var/perpname = "wot" var/criminal = "None" - if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() - if(I) - perpname = I.registered_name - else - perpname = name - else - perpname = name - + var/perpname = H.get_face_name(H.get_id_name("")) if(perpname) - for (var/datum/data/record/E in data_core.general) - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if(R.fields["id"] == E.fields["id"]) - criminal = R.fields["criminal"] - + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(R) + criminal = R.fields["criminal"] msg += "Criminal status: \[[criminal]\]\n" //msg += "\[Set Hostile Identification\]\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index fa14e72d7b6..87125a22448 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -207,7 +207,7 @@ show_message("\red The blob attacks you!") var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/datum/limb/affecting = get_organ(ran_zone(dam_zone)) - apply_damage(rand(30,40), BRUTE, affecting, run_armor_check(affecting, "melee")) + apply_damage(rand(20,30), BRUTE, affecting, run_armor_check(affecting, "melee")) return /mob/living/carbon/human/meteorhit(O as obj) @@ -396,74 +396,68 @@ //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 = wear_id - var/obj/item/weapon/card/id/id = wear_id - if (istype(pda)) - if (pda.id && istype(pda.id, /obj/item/weapon/card/id)) - . = pda.id.assignment - else - . = pda.ownjob - else if (istype(id)) + var/obj/item/weapon/card/id/id = get_idcard() + if(id) . = id.assignment else - return if_no_id - if (!.) - . = if_no_job - return + var/obj/item/device/pda/pda = wear_id + if(istype(pda)) + . = pda.ownjob + else + return if_no_id + if(!.) + return if_no_job //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/weapon/card/id/id = get_idcard() + if(id) + return id.registered_name var/obj/item/device/pda/pda = wear_id - var/obj/item/weapon/card/id/id = wear_id - if (istype(pda)) - if (pda.id) - . = pda.id.registered_name - else - . = pda.owner - else if (istype(id)) - . = id.registered_name - else - return if_no_id - return + if(istype(pda)) + return pda.owner + return if_no_id //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere /mob/living/carbon/human/proc/get_visible_name() - if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible - return get_id_name("Unknown") - if( head && (head.flags_inv&HIDEFACE) ) - return get_id_name("Unknown") //Likewise for hats - var/face_name = get_face_name() + var/face_name = get_face_name("") var/id_name = get_id_name("") - if(id_name && (id_name != face_name)) - return "[face_name] (as [id_name])" - return face_name + if(face_name) + if(id_name && (id_name != face_name)) + return "[face_name] (as [id_name])" + return face_name + if(id_name) + return id_name + return "Unknown" //Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable -/mob/living/carbon/human/proc/get_face_name() +/mob/living/carbon/human/proc/get_face_name(if_no_face="Unknown") + if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible + return if_no_face + if( head && (head.flags_inv&HIDEFACE) ) + return if_no_face //Likewise for hats var/datum/limb/O = get_organ("head") if( (status_flags&DISFIGURED) || (O.brutestate+O.burnstate)>2 || cloneloss>50 || !real_name ) //disfigured. use id-name if possible - return "Unknown" + return if_no_face return real_name //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_id_name(var/if_no_id = "Unknown") + var/obj/item/weapon/storage/wallet/wallet = wear_id var/obj/item/device/pda/pda = wear_id var/obj/item/weapon/card/id/id = wear_id - if(istype(pda)) . = pda.owner - else if(istype(id)) . = id.registered_name - if(!.) . = if_no_id //to prevent null-names making the mob unclickable + if(istype(wallet)) id = wallet.front_id + if(istype(id)) . = id.registered_name + else if(istype(pda)) . = pda.owner + if(!.) . = if_no_id //to prevent null-names making the mob unclickable 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 = wear_id - var/obj/item/device/pda/pda = wear_id - if (istype(pda) && pda.id) - id = pda.id - if (istype(id)) - return id + if(wear_id) + return wear_id.GetID() //Added a safety check in case you want to shock a human mob directly through electrocute_act. /mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/safety = 0) @@ -535,31 +529,19 @@ var/modified = 0 - var/perpname = "wot" - if(wear_id) - var/obj/item/weapon/card/id/I = wear_id.GetID() - if(I) - perpname = I.registered_name - else - perpname = name - else - perpname = name - + var/perpname = H.get_face_name(H.get_id_name("")) if(perpname) - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if (R.fields["id"] == E.fields["id"]) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(R) + var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel") + if(R) + if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)) + if(setcriminal != "Cancel") + R.fields["criminal"] = setcriminal + modified = 1 - var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel") - - if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)) - if(setcriminal != "Cancel") - R.fields["criminal"] = setcriminal - modified = 1 - - spawn() - H.handle_regular_hud_updates() + spawn() + H.handle_regular_hud_updates() if(!modified) usr << "\red Unable to locate a data core entry for this person." diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index a773b91d671..29858713549 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,11 +1,11 @@ /mob/living/carbon/human //Hair colour and style - var/h_color = "000" - var/h_style = "Bald" + var/hair_color = "000" + var/hair_style = "Bald" //Facial hair colour and style - var/f_color = "000" - var/f_style = "Shaved" + var/facial_hair_color = "000" + var/facial_hair_style = "Shaved" //Eye colour var/eye_color = "000" @@ -15,7 +15,7 @@ var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup var/age = 30 //Player's age (pure fluff) - var/b_type = "A+" //Player's bloodtype (Not currently used, just character fluff) + var/blood_type = "A+" //Player's bloodtype (Not currently used, just character fluff) var/underwear = "Nude" //Which underwear the player wants var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index fe28ce44793..27aa1113e2b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -204,11 +204,11 @@ src << "\red You feel weak." emote("collapse") if(prob(15)) - if(!(f_style == "Shaved") || !(h_style == "Bald")) + if(!( hair_style == "Shaved") || !(hair_style == "Bald")) src << "Your hair starts to fall out in clumps..." spawn(50) - f_style = "Shaved" - h_style = "Bald" + facial_hair_style = "Shaved" + hair_style = "Bald" update_hair() updatehealth() @@ -812,7 +812,7 @@ silent = 0 else //ALIVE. LIGHTS ARE ON updatehealth() //TODO - if(health <= config.health_threshold_dead || !getbrain(src)) + if(health <= config.health_threshold_dead || !getorgan(/obj/item/organ/brain)) death() blinded = 1 silent = 0 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 70f989d9727..58c8cce0122 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -42,7 +42,7 @@ There are several things that need to be remembered: > There are also these special cases: update_mutations() //handles updating your appearance for certain mutations. e.g TK head-glows update_damage_overlays() //handles damage overlays for brute/burn damage - update_base_icon_state() //Handles updating var/base_icon_state (WIP) This is used to update the + update_base_icon_state() //Handles updating var/base_icon_state (WIP) This is used to update the mob's icon_state easily e.g. "[base_icon_state]_s" is the standing icon_state update_body() //Handles updating your mob's icon_state (using update_base_icon_state()) as well as sprite-accessories that didn't really fit elsewhere (underwear, lips, eyes) @@ -99,8 +99,8 @@ Please contact me on #coderbus IRC. ~Carnie x if(HUSK in mutations) base_icon_state = "husk" else - base_icon_state = "[skin_tone]_[(gender == FEMALE) ? "f" : "m"]" - + base_icon_state = "[skin_tone]_[(gender == FEMALE) ? "f" : "m"]" + /mob/living/carbon/human/proc/apply_overlay(cache_index) var/image/I = lying ? overlays_lying[cache_index] : overlays_standing[cache_index] @@ -122,7 +122,7 @@ Please contact me on #coderbus IRC. ~Carnie x lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again update_hud() //TODO: remove the need for this overlays.Cut() - + if(lying) //can't be cloaked whilst lying down icon_state = "[base_icon_state]_l" for(var/thing in overlays_lying) @@ -154,12 +154,12 @@ Please contact me on #coderbus IRC. ~Carnie x //constructs damage icon for each organ from mask * damage field and saves it in our overlays_ lists /mob/living/carbon/human/update_damage_overlays() remove_overlay(DAMAGE_LAYER) - + var/image/standing = image("icon"='icons/mob/dam_human.dmi', "icon_state"="blank", "layer"=-DAMAGE_LAYER) var/image/lying = image("icon"='icons/mob/dam_human.dmi', "icon_state"="blank2", "layer"=-DAMAGE_LAYER) overlays_standing[DAMAGE_LAYER] = standing overlays_lying[DAMAGE_LAYER] = lying - + for(var/datum/limb/O in organs) if(O.brutestate) standing.overlays += "[O.icon_name]_[O.brutestate]0" //we're adding icon_states of the base image as overlays @@ -167,7 +167,7 @@ Please contact me on #coderbus IRC. ~Carnie x if(O.burnstate) standing.overlays += "[O.icon_name]_0[O.burnstate]" lying.overlays += "[O.icon_name]2_0[O.burnstate]" - + apply_overlay(DAMAGE_LAYER) @@ -181,38 +181,39 @@ Please contact me on #coderbus IRC. ~Carnie x return //base icons + var/datum/sprite_accessory/S var/list/standing = list() var/list/lying = list() - - if(f_style) - var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style] - if(facial_hair_style) - var/icon/facial_s = icon("icon"=facial_hair_style.icon, "icon_state"="[facial_hair_style.icon_state]_s") - var/icon/facial_l = icon("icon"=facial_hair_style.icon, "icon_state"="[facial_hair_style.icon_state]_l") - facial_s.Blend("#[f_color]", ICON_ADD) - facial_l.Blend("#[f_color]", ICON_ADD) + + if(facial_hair_style) + S = facial_hair_styles_list[facial_hair_style] + if(S) + var/icon/facial_s = icon("icon"=S.icon, "icon_state"="[S.icon_state]_s") + var/icon/facial_l = icon("icon"=S.icon, "icon_state"="[S.icon_state]_l") + facial_s.Blend("#[facial_hair_color]", ICON_ADD) + facial_l.Blend("#[facial_hair_color]", ICON_ADD) standing += image("icon"=facial_s, "layer"=-HAIR_LAYER) lying += image("icon"=facial_l, "layer"=-HAIR_LAYER) //Applies the debrained overlay if there is no brain - if(!getbrain(src)) + if(!getorgan(/obj/item/organ/brain)) standing += image("icon"='icons/mob/human_face.dmi', "icon_state"="debrained_s", "layer"=-HAIR_LAYER) lying += image("icon"='icons/mob/human_face.dmi', "icon_state"="debrained_l", "layer"=-HAIR_LAYER) - else if(h_style) - var/datum/sprite_accessory/hair_style = hair_styles_list[h_style] - if(hair_style) - var/icon/hair_s = icon("icon"=hair_style.icon, "icon_state"="[hair_style.icon_state]_s") - var/icon/hair_l = icon("icon"=hair_style.icon, "icon_state"="[hair_style.icon_state]_l") - hair_s.Blend("#[h_color]", ICON_ADD) - hair_l.Blend("#[h_color]", ICON_ADD) + else if(hair_style) + S = hair_styles_list[hair_style] + if(S) + var/icon/hair_s = icon("icon"=S.icon, "icon_state"="[S.icon_state]_s") + var/icon/hair_l = icon("icon"=S.icon, "icon_state"="[S.icon_state]_l") + hair_s.Blend("#[hair_color]", ICON_ADD) + hair_l.Blend("#[hair_color]", ICON_ADD) standing += image("icon"=hair_s, "layer"=-HAIR_LAYER) lying += image("icon"=hair_l, "layer"=-HAIR_LAYER) if(lying.len) overlays_lying[HAIR_LAYER] = lying if(standing.len) - overlays_standing[HAIR_LAYER] = standing - + overlays_standing[HAIR_LAYER] = standing + apply_overlay(HAIR_LAYER) @@ -221,7 +222,7 @@ Please contact me on #coderbus IRC. ~Carnie x var/list/standing = list() var/list/lying = list() - + var/g = (gender == FEMALE) ? "f" : "m" for(var/mut in mutations) switch(mut) @@ -241,19 +242,19 @@ Please contact me on #coderbus IRC. ~Carnie x overlays_lying[MUTATIONS_LAYER] = lying if(standing.len) overlays_standing[MUTATIONS_LAYER] = standing - + apply_overlay(MUTATIONS_LAYER) /mob/living/carbon/human/proc/update_body() remove_overlay(BODY_LAYER) - + update_base_icon_state() icon_state = "[base_icon_state]_[src.lying ? "l" : "s"]" - + var/list/lying = list() var/list/standing = list() - + //Mouth (lipstick!) if(lip_style) standing += image("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[lip_style]_s", "layer"=-BODY_LAYER) @@ -274,12 +275,12 @@ Please contact me on #coderbus IRC. ~Carnie x if(U) standing += image("icon"=U.icon, "icon_state"="[U.icon_state]_s", "layer"=-BODY_LAYER) lying += image("icon"=U.icon, "icon_state"="[U.icon_state]_l", "layer"=-BODY_LAYER) - + if(lying.len) overlays_lying[BODY_LAYER] = lying if(standing.len) overlays_standing[BODY_LAYER] = standing - + apply_overlay(BODY_LAYER) /* --------------------------------------- */ @@ -315,24 +316,24 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_w_uniform() remove_overlay(UNIFORM_LAYER) - + if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) w_uniform.screen_loc = ui_iclothing client.screen += w_uniform - + var/t_color = w_uniform.color if(!t_color) t_color = icon_state var/image/lying = image("icon"='icons/mob/uniform.dmi', "icon_state"="[t_color]_l", "layer"=-UNIFORM_LAYER) var/image/standing = image("icon"='icons/mob/uniform.dmi', "icon_state"="[t_color]_s", "layer"=-UNIFORM_LAYER) overlays_lying[UNIFORM_LAYER] = lying overlays_standing[UNIFORM_LAYER] = standing - + if(w_uniform.blood_DNA) lying.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="uniformblood2") standing.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="uniformblood") - + if(U.hastie) var/tie_color = U.hastie.color if(!tie_color) tie_color = U.hastie.icon_state @@ -342,7 +343,7 @@ Please contact me on #coderbus IRC. ~Carnie x // Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY for(var/obj/item/thing in list(r_store, l_store, wear_id, belt)) // drop_from_inventory(thing) - + apply_overlay(UNIFORM_LAYER) @@ -352,10 +353,10 @@ Please contact me on #coderbus IRC. ~Carnie x if(client && hud_used && hud_used.hud_shown) wear_id.screen_loc = ui_id //TODO client.screen += wear_id - + overlays_lying[ID_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="id2", "layer"=-ID_LAYER) overlays_standing[ID_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="id", "layer"=-ID_LAYER) - + apply_overlay(ID_LAYER) @@ -372,7 +373,7 @@ Please contact me on #coderbus IRC. ~Carnie x var/image/standing = image("icon"='icons/mob/hands.dmi', "icon_state"="[t_state]", "layer"=-GLOVES_LAYER) overlays_lying[GLOVES_LAYER] = lying overlays_standing[GLOVES_LAYER] = standing - + if(gloves.blood_DNA) lying.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands2") standing.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands") @@ -380,19 +381,19 @@ Please contact me on #coderbus IRC. ~Carnie x if(blood_DNA) overlays_lying[GLOVES_LAYER] = image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands2") overlays_standing[GLOVES_LAYER] = image("icon"='icons/effects/blood.dmi', "icon_state"="bloodyhands") - + apply_overlay(GLOVES_LAYER) /mob/living/carbon/human/update_inv_glasses() remove_overlay(GLASSES_LAYER) - + if(glasses) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) glasses.screen_loc = ui_glasses client.screen += glasses - + overlays_lying[GLASSES_LAYER] = image("icon"='icons/mob/eyes.dmi', "icon_state"="[glasses.icon_state]2", "layer"=-GLASSES_LAYER) overlays_standing[GLASSES_LAYER] = image("icon"='icons/mob/eyes.dmi', "icon_state"="[glasses.icon_state]", "layer"=-GLASSES_LAYER) @@ -401,63 +402,63 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_ears() remove_overlay(EARS_LAYER) - + if(ears) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) ears.screen_loc = ui_ears client.screen += ears - + overlays_lying[EARS_LAYER] = image("icon"='icons/mob/ears.dmi', "icon_state"="[ears.icon_state]2", "layer"=-EARS_LAYER) overlays_standing[EARS_LAYER] = image("icon"='icons/mob/ears.dmi', "icon_state"="[ears.icon_state]", "layer"=-EARS_LAYER) - + apply_overlay(EARS_LAYER) /mob/living/carbon/human/update_inv_shoes() remove_overlay(SHOES_LAYER) - + if(shoes) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) shoes.screen_loc = ui_shoes client.screen += shoes - + var/image/lying = image("icon"='icons/mob/feet.dmi', "icon_state"="[shoes.icon_state]2", "layer"=-SHOES_LAYER) var/image/standing = image("icon"='icons/mob/feet.dmi', "icon_state"="[shoes.icon_state]", "layer"=-SHOES_LAYER) overlays_lying[SHOES_LAYER] = lying overlays_standing[SHOES_LAYER] = standing - + if(shoes.blood_DNA) lying.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="shoeblood2") standing.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="shoeblood") - + apply_overlay(SHOES_LAYER) /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) - + if(s_store) if(client && hud_used && hud_used.hud_shown) s_store.screen_loc = ui_sstore1 //TODO client.screen += s_store - + var/t_state = s_store.item_state if(!t_state) t_state = s_store.icon_state overlays_lying[SUIT_STORE_LAYER] = image("icon"='icons/mob/belt_mirror.dmi', "icon_state"="[t_state]2", "layer"=-SUIT_STORE_LAYER) overlays_standing[SUIT_STORE_LAYER] = image("icon"='icons/mob/belt_mirror.dmi', "icon_state"="[t_state]", "layer"=-SUIT_STORE_LAYER) - + apply_overlay(SUIT_STORE_LAYER) /mob/living/carbon/human/update_inv_head() remove_overlay(HEAD_LAYER) - + if(head) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) head.screen_loc = ui_head //TODO client.screen += head - + var/image/lying var/image/standing if(istype(head,/obj/item/clothing/head/kitty)) @@ -469,22 +470,22 @@ Please contact me on #coderbus IRC. ~Carnie x standing = image("icon"='icons/mob/head.dmi', "icon_state"="[head.icon_state]", "layer"=-HEAD_LAYER) overlays_lying[HEAD_LAYER] = lying overlays_standing[HEAD_LAYER] = standing - + if(head.blood_DNA) lying.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="helmetblood2") standing.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="helmetblood") - + apply_overlay(HEAD_LAYER) /mob/living/carbon/human/update_inv_belt() remove_overlay(BELT_LAYER) - + if(belt) if(client && hud_used && hud_used.hud_shown) belt.screen_loc = ui_belt client.screen += belt - + var/t_state = belt.item_state if(!t_state) t_state = belt.icon_state overlays_lying[BELT_LAYER] = image("icon"='icons/mob/belt.dmi', "icon_state"="[t_state]2", "layer"=-BELT_LAYER) @@ -496,12 +497,12 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) - + if(istype(wear_suit, /obj/item/clothing/suit)) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) wear_suit.screen_loc = ui_oclothing //TODO client.screen += wear_suit - + var/image/lying = image("icon"='icons/mob/suit.dmi', "icon_state"="[wear_suit.icon_state]2", "layer"=-SUIT_LAYER) var/image/standing = image("icon"='icons/mob/suit.dmi', "icon_state"="[wear_suit.icon_state]", "layer"=-SUIT_LAYER) overlays_lying[SUIT_LAYER] = lying @@ -533,36 +534,36 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_wear_mask() remove_overlay(FACEMASK_LAYER) - + if(istype(wear_mask, /obj/item/clothing/mask)) if(client && hud_used && hud_used.hud_shown && hud_used.inventory_shown) wear_mask.screen_loc = ui_mask //TODO client.screen += wear_mask - + var/image/lying = image("icon"='icons/mob/mask.dmi', "icon_state"="[wear_mask.icon_state]2", "layer"=-FACEMASK_LAYER) var/image/standing = image("icon"='icons/mob/mask.dmi', "icon_state"="[wear_mask.icon_state]", "layer"=-FACEMASK_LAYER) overlays_lying[FACEMASK_LAYER] = lying overlays_standing[FACEMASK_LAYER] = standing - + if(wear_mask.blood_DNA && !istype(wear_mask, /obj/item/clothing/mask/cigarette)) lying.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="maskblood2") standing.overlays += image("icon"='icons/effects/blood.dmi', "icon_state"="maskblood") - + apply_overlay(FACEMASK_LAYER) /mob/living/carbon/human/update_inv_back() remove_overlay(BACK_LAYER) - + if(back) if(client && hud_used && hud_used.hud_shown) back.screen_loc = ui_back //TODO client.screen += back - + overlays_lying[BACK_LAYER] = image("icon"='icons/mob/back.dmi', "icon_state"="[back.icon_state]2", "layer"=-BACK_LAYER) overlays_standing[BACK_LAYER] = image("icon"='icons/mob/back.dmi', "icon_state"="[back.icon_state]", "layer"=-BACK_LAYER) - + apply_overlay(BACK_LAYER) @@ -576,7 +577,7 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_handcuffed() remove_overlay(HANDCUFF_LAYER) - + if(handcuffed) drop_r_hand() drop_l_hand() @@ -595,19 +596,19 @@ Please contact me on #coderbus IRC. ~Carnie x var/obj/screen/inventory/L = hud_used.adding[4] R.overlays = null L.overlays = null - + apply_overlay(HANDCUFF_LAYER) /mob/living/carbon/human/update_inv_legcuffed() remove_overlay(LEGCUFF_LAYER) - + if(legcuffed) if(src.m_intent != "walk") src.m_intent = "walk" if(src.hud_used && src.hud_used.move_intent) src.hud_used.move_intent.icon_state = "walking" - + overlays_lying[LEGCUFF_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="legcuff2", "layer"=-LEGCUFF_LAYER) overlays_standing[LEGCUFF_LAYER] = image("icon"='icons/mob/mob.dmi', "icon_state"="legcuff1", "layer"=-LEGCUFF_LAYER) @@ -617,34 +618,34 @@ Please contact me on #coderbus IRC. ~Carnie x /mob/living/carbon/human/update_inv_r_hand() remove_overlay(R_HAND_LAYER) - + if(r_hand) if(client) r_hand.screen_loc = ui_rhand //TODO client.screen += r_hand - + var/t_state = r_hand.item_state if(!t_state) t_state = r_hand.icon_state - + overlays_standing[R_HAND_LAYER] = image("icon"='icons/mob/items_righthand.dmi', "icon_state"="[t_state]", "layer"=-R_HAND_LAYER) - + apply_overlay(R_HAND_LAYER) /mob/living/carbon/human/update_inv_l_hand() remove_overlay(L_HAND_LAYER) - + if(l_hand) if(client) l_hand.screen_loc = ui_lhand //TODO client.screen += l_hand - + var/t_state = l_hand.item_state if(!t_state) t_state = l_hand.icon_state - + overlays_standing[L_HAND_LAYER] = image("icon"='icons/mob/items_lefthand.dmi', "icon_state"="[t_state]", "layer"=-L_HAND_LAYER) - + apply_overlay(L_HAND_LAYER) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index ded6664414e..487ddc5215b 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -398,7 +398,7 @@ blinded = 1 silent = 0 else //ALIVE. LIGHTS ARE ON - if(health < config.health_threshold_dead || !getbrain(src)) + if(health < config.health_threshold_dead || !getorgan(/obj/item/organ/brain)) death() blinded = 1 stat = DEAD diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index eb051aca74a..4a1efcfe614 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -214,12 +214,8 @@ var/list/ai_list = list() set name = "Show Crew Manifest" var/dat = " " - var/list/L = list() - for (var/datum/data/record/t in data_core.general) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - dat += "[R] " + for(var/datum/data/record/t in sortRecord(data_core.general)) + dat += t.fields["name"] + " - " + t.fields["rank"] + " " dat += "" src << browse(dat, "window=airoster") diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm index f374aebbc78..07ea2fbc9e1 100644 --- a/code/modules/mob/living/silicon/pai/hud.dm +++ b/code/modules/mob/living/silicon/pai/hud.dm @@ -9,42 +9,25 @@ var/image/holder var/turf/T = get_turf(src.loc) for(var/mob/living/carbon/human/perp in view(T)) - var/perpname = "wot" holder = perp.hud_list[ID_HUD] + holder.icon_state = "hudno_id" if(perp.wear_id) - var/obj/item/weapon/card/id/I = perp.wear_id.GetID() - if(I) - perpname = I.registered_name - holder.icon_state = "hud[ckey(perp:wear_id:GetJobName())]" - client.images += holder - else - perpname = perp.name - holder.icon_state = "hudno_id" - client.images += holder - else - holder.icon_state = "hudno_id" - client.images += holder + holder.icon_state = "hud[ckey(perp:wear_id:GetJobName())]" + client.images += holder - for(var/datum/data/record/E in data_core.general) - if(E.fields["name"] == perpname) + var/perpname = perp.get_face_name(perp.get_id_name("")) + if(perpname) + var/datum/data/record/R = find_record("name", perpname, data_core.security) + if(R) holder = perp.hud_list[WANTED_HUD] - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - holder.icon_state = "hudwanted" - client.images += holder - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated")) - holder.icon_state = "hudincarcerated" - client.images += holder - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled")) - holder.icon_state = "hudparolled" - client.images += holder - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released")) - holder.icon_state = "hudreleased" - client.images += holder - break + switch(R.fields["criminal"]) + if("*Arrest*") holder.icon_state = "hudwanted" + if("Incarcerated") holder.icon_state = "hudincarcerated" + if("Parolled") holder.icon_state = "hudparolled" + if("Released") holder.icon_state = "hudreleased" + else + return + client.images += holder /mob/living/silicon/pai/proc/medicalHUD() if(client) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 5ced7b62d2b..544e8fe5610 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -218,33 +218,22 @@ // Accessing medical records if("medicalrecord") - if(src.subscreen == 1) - var/datum/data/record/record = locate(href_list["med_rec"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/M = record - if (!( data_core.general.Find(R) )) - src.temp = "Unable to locate requested medical record. Record may have been deleted, or never have existed." - else - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - src.medicalActive1 = R - src.medicalActive2 = M + if(subscreen == 1) + medicalActive1 = find_record("id", href_list["med_rec"], data_core.general) + if(medicalActive1) + medicalActive2 = find_record("id", href_list["med_rec"], data_core.medical) + if(!medicalActive2) + medicalActive1 = null + temp = "Unable to locate requested security record. Record may have been deleted, or never have existed." + if("securityrecord") - if(src.subscreen == 1) - var/datum/data/record/record = locate(href_list["sec_rec"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/M = record - if (!( data_core.general.Find(R) )) - src.temp = "Unable to locate requested security record. Record may have been deleted, or never have existed." - else - for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - src.securityActive1 = R - src.securityActive2 = M + if(subscreen == 1) + securityActive1 = find_record("id", href_list["sec_rec"], data_core.general) + if(securityActive1) + securityActive2 = find_record("id", href_list["sec_rec"], data_core.security) + if(!securityActive2) + securityActive1 = null + temp = "Unable to locate requested security record. Record may have been deleted, or never have existed." if("securityhud") if(href_list["toggle"]) src.secHUD = !src.secHUD @@ -410,70 +399,64 @@ // Crew Manifest /mob/living/silicon/pai/proc/softwareManifest() - var/dat = "" - dat += " Crew Manifest" - var/list/L = list() - if(!isnull(data_core.general)) - for (var/datum/data/record/t in sortRecord(data_core.general)) - var/R = t.fields["name"] + " - " + t.fields["rank"] - L += R - for(var/R in sortList(L)) - dat += "[R] " - dat += " |