From d3dccd4388a30436e8a2e0581e37be7b84977dfb Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 May 2012 22:29:31 +0300 Subject: [PATCH 01/39] Making photocopiers copy photos properly. They did not copy big image --- code/WorkInProgress/Ported/Bureaucracy/copier.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/WorkInProgress/Ported/Bureaucracy/copier.dm b/code/WorkInProgress/Ported/Bureaucracy/copier.dm index 897681cd7d0..0e6911c6b6e 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/copier.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/copier.dm @@ -134,6 +134,7 @@ P.name = template.name P.desc = template.desc P.icon = template.icon + P.img = template.img sleep(30) job_num_copies -= 1 From 26b8eb33fd56e9126593132aa27c40b89c3e1344 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 12 May 2012 23:25:35 +0300 Subject: [PATCH 02/39] Minor stuff for photos Making copiers copy them properly New photos will appear in your hand, rather than on the ground --- code/WorkInProgress/Ported/Bureaucracy/copier.dm | 2 +- code/game/objects/items/weapons/cameras.dm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/Ported/Bureaucracy/copier.dm b/code/WorkInProgress/Ported/Bureaucracy/copier.dm index 0e6911c6b6e..8808e605ffa 100644 --- a/code/WorkInProgress/Ported/Bureaucracy/copier.dm +++ b/code/WorkInProgress/Ported/Bureaucracy/copier.dm @@ -134,7 +134,7 @@ P.name = template.name P.desc = template.desc P.icon = template.icon - P.img = template.img + P.img = template:img sleep(30) job_num_copies -= 1 diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm index a4f12d5b597..6dc9aad252f 100644 --- a/code/game/objects/items/weapons/cameras.dm +++ b/code/game/objects/items/weapons/cameras.dm @@ -193,7 +193,10 @@ y_c-- x_c = x_c - 3 - var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) ) + var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() + P.loc = usr.loc + if(!user.get_inactive_hand()) + usr.put_in_inactive_hand(P) var/icon/small_img = icon(temp) var/icon/ic = icon('items.dmi',"photo") small_img.Scale(8,8) From 564390774f38f00fc9435776b7ff851410b6d9f3 Mon Sep 17 00:00:00 2001 From: caelaislinn Date: Mon, 25 Jun 2012 22:49:47 +1000 Subject: [PATCH 03/39] fix for "Energy radiating from the /datum/artifact_effect" Signed-off-by: caelaislinn --- code/modules/research/artifact_effect.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/artifact_effect.dm b/code/modules/research/artifact_effect.dm index 5a084b44133..4dc58e69230 100644 --- a/code/modules/research/artifact_effect.dm +++ b/code/modules/research/artifact_effect.dm @@ -228,7 +228,7 @@ for (var/mob/living/carbon/M in range(src.aurarange,originator)) if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue - if(prob(10)) M << "\red Energy radiating from the [src] is making you feel numb." + if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb." if(prob(20)) M << "\red Your body goes numb for a moment." M.stunned += 2 From 622ce3080387c574cd82f0e618b170983c305727 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 26 Jun 2012 00:01:26 +0100 Subject: [PATCH 04/39] =?UTF-8?q?TG:=20=E2=80=A2Fixed=20silicon=20mobs=20n?= =?UTF-8?q?ot=20being=20able=20to=20access=20newscaster.=20It=20was=20a=20?= =?UTF-8?q?linkage=20error=20on=20my=20part,=20newscaster=20system=20was?= =?UTF-8?q?=20made=20to=20handle=20ais=20but,=20at=20some=20points,=20excl?= =?UTF-8?q?uded=20them.=20Anyway,=20fixed.=20Revision:=20r3779=20Author:?= =?UTF-8?q?=20=09=20polyxenitopalidou?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/machinery/newscaster.dm | 60 ++++++++++++++++-------------- code/game/objects/stacks/glass.dm | 2 + icons/obj/vehicles.dmi | Bin 4193 -> 0 bytes icons/vehicles/vehicles.dmi | Bin 0 -> 11735 bytes 4 files changed, 35 insertions(+), 27 deletions(-) delete mode 100644 icons/obj/vehicles.dmi create mode 100644 icons/vehicles/vehicles.dmi diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 151b75843be..ece8f6f8b55 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) @@ -174,7 +174,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="
The newscaster recognises you as: [src.scanned_user]" if(1) dat+= "Station Feed Channels
" - if(channel_list.len) + if( isemptylist(src.channel_list) ) dat+="No active channels found..." else for(var/datum/feed_channel/CHANNEL in src.channel_list) @@ -255,7 +255,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else - if(!viewing_channel.messages.len) + if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) @@ -267,7 +267,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
" dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it." dat+="
Select Feed channel to get Stories from:
" - if(!channel_list.len) + if(isemptylist(src.channel_list)) dat+="No feed channels found active...
" else for(var/datum/feed_channel/CHANNEL in src.channel_list) @@ -278,7 +278,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed" dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
" - if(channel_list.len) + if(isemptylist(src.channel_list)) dat+="No feed channels found active...
" else for(var/datum/feed_channel/CHANNEL in src.channel_list) @@ -290,7 +290,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" - if( !viewing_channel.messages.len ) + if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) @@ -304,7 +304,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.

" else - if( !viewing_channel.messages.len ) + if( isemptylist(src.viewing_channel.messages) ) dat+="No feed messages found in channel...
" else for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) @@ -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", "")) @@ -444,6 +444,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r FC.messages += newMsg // To avoid further confusion, this one for adds the message to all existing newscasters' channel_list's channels. break // Another for to go through newscasters is not needed. Due to the nature of submit_new_CHANNEL, every reference src.screen=4 // to a channel in ANY newscaster is the same. Editing one will edit them all. + for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) NEWSCASTER.newsAlert(src.channel_name) @@ -685,7 +686,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) if(0) //Cover dat+="
The Griffon
" dat+="
Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" - if(!news_content.len) + if(isemptylist(src.news_content)) if(src.important_message) dat+="Contents:
    **Important Security Announcement** \[page [src.pages+2]\]
" else @@ -712,7 +713,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) if(C.censored) dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." else - if(!C.messages.len) + if(isemptylist(C.messages)) dat+="No Feed stories stem from this channel..." else dat+="