diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 33f610605c8..7ec0af10571 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -142,12 +142,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r /obj/machinery/newscaster/attack_hand(mob/user as mob) if(!src.ispowered || src.isbroken) return - if(istype(user, /mob/living/carbon/human) ) - var/mob/living/carbon/human/human_user = user + if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) ) + var/mob/living/human_or_robot_user = user var/dat dat = text("Newscaster

Newscaster Unit #[src.unit_no]

") - src.scan_user(human_user) //Newscaster scans you + src.scan_user(human_or_robot_user) //Newscaster scans you switch(screen) if(0) @@ -160,7 +160,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+= "
Submit new Feed story" dat+= "
Print newspaper" dat+= "
Re-scan User" - dat+= "

Exit" + dat+= "

Exit" if(src.securityCaster) var/wanted_already = 0 for(var/obj/machinery/newscaster/N in allCasters) @@ -363,8 +363,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - human_user << browse(dat, "window=newscaster_main;size=400x600") - onclose(human_user, "newscaster_main") + human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") + onclose(human_or_robot_user, "newscaster_main") /*if(src.isbroken) //debugging shit return @@ -377,7 +377,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r /obj/machinery/newscaster/Topic(href, href_list) if(..()) return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) + if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.machine = src if(href_list["set_channel_name"]) src.channel_name = strip_html(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")) @@ -752,7 +752,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) obj/item/weapon/newspaper/Topic(href, href_list) var/mob/living/U = usr ..() - if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ) ) + if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) )) U.machine = src if(href_list["next_page"]) if(curr_page==src.pages+1) @@ -801,21 +801,26 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob) ////////////////////////////////////helper procs -/obj/machinery/newscaster/proc/scan_user(mob/living/carbon/human/human_user as mob) - if(human_user.wear_id) //Newscaster scans you - if(istype(human_user.wear_id, /obj/item/device/pda) ) //autorecognition, woo! - var/obj/item/device/pda/P = human_user.wear_id - if(P.id) - src.scanned_user = "[P.id.registered_name] ([P.id.assignment])" +/obj/machinery/newscaster/proc/scan_user(mob/living/user as mob) + if(istype(user,/mob/living/carbon/human)) //User is a human + var/mob/living/carbon/human/human_user = user + if(human_user.wear_id) //Newscaster scans you + if(istype(human_user.wear_id, /obj/item/device/pda) ) //autorecognition, woo! + var/obj/item/device/pda/P = human_user.wear_id + if(P.id) + src.scanned_user = "[P.id.registered_name] ([P.id.assignment])" + else + src.scanned_user = "Unknown" + else if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) + var/obj/item/weapon/card/id/ID = human_user.wear_id + src.scanned_user ="[ID.registered_name] ([ID.assignment])" else - src.scanned_user = "Unknown" - else if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) - var/obj/item/weapon/card/id/ID = human_user.wear_id - src.scanned_user ="[ID.registered_name] ([ID.assignment])" + src.scanned_user ="Unknown" else src.scanned_user ="Unknown" else - src.scanned_user ="Unknown" + var/mob/living/silicon/ai_user = user + src.scanned_user = "[ai_user.name] ([ai_user.job])" /obj/machinery/newscaster/proc/print_paper() diff --git a/html/changelog.html b/html/changelog.html index dc49df2180f..48219289587 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,14 @@ should be listed in the changelog upon commit tho. Thanks. --> +
+

Sunday, June 10th - The day Agouri had to study for his 4th semester finals but instead was a faggot and didn't do jackshit

+

Agouri updated:

+ +
+

Saturday, June 9th

Errorage updated:

diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi deleted file mode 100644 index 2dbaedd6397..00000000000 Binary files a/icons/obj/vehicles.dmi and /dev/null differ diff --git a/icons/vehicles/vehicles.dmi b/icons/vehicles/vehicles.dmi new file mode 100644 index 00000000000..5650366b18e Binary files /dev/null and b/icons/vehicles/vehicles.dmi differ