diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 02e7c15963b..07d153d782e 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -249,8 +249,8 @@ var/global/datum/controller/occupations/job_master //Give'em glasses if they are nearsighted if(H.disabilities & 1) var/equipped = H.equip_if_possible(new /obj/item/clothing/glasses/regular(H), H.slot_glasses) - if(equipped) - var/obj/item/clothing/glasses/G = H.slot_glasses + if(!equipped) + var/obj/item/clothing/glasses/G = H.glasses G.prescription = 1 H.update_clothing() return 1 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 4d8bcf1d272..25542971d90 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -872,8 +872,9 @@ /client/proc/radioalert() set category = "Fun" set name = "Create Radio Alert" - var/message = input("Choose a message! (Don't forget the \"says, \" or similar at the start.)", "Message") as message|null + var/message = input("Choose a message! (Don't forget the \"says, \" or similar at the start.)", "Message") as text|null var/from = input("From whom? (Who's saying this?)", "From") as text|null - var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null) - a.autosay(message,from) - del(a) + if(message && from) + var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null) + a.autosay(message,from) + del(a) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 0a80926cc0b..fb9733c7071 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -868,14 +868,17 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that src << "[O] at [T.x],[T.y],[T.z] has a non-list fingerprints variable!" else src << "[O] in [O.loc] at [T.x],[T.y],[T.z] has a non-list fingerprints variable!" - else + else if (O.fingerprints.len) for(var/i, i <= O.fingerprints.len, i++) if(length(O.fingerprints[i]) != 69) var/turf/T = get_turf(O) - if(istype(O.loc,/turf)) - src << "[O] at [T.x],[T.y],[T.z] has a fingerprints variable of incorrect length!" + if(isnull(T)) + src << "[O] at [O.loc] has a fingerprints variable of incorrect length! (TURF NOT FOUND)." else - src << "[O] in [O.loc] at [T.x],[T.y],[T.z] has a fingerprints variable of incorrect length!" + if(istype(O.loc,/turf)) + src << "[O] at [T.x],[T.y],[T.z] has a fingerprints variable of incorrect length!" + else + src << "[O] in [O.loc] at [T.x],[T.y],[T.z] has a fingerprints variable of incorrect length!" break world << "\red SCAN COMPLETE."