From 14bf0f064c6ac218ca3379e821473fb547981d5c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 24 Jun 2014 10:59:08 +0930 Subject: [PATCH 1/6] Removed ability for drones to talk on Binary. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 485ff99e3b..a20ebf2e21 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -104,15 +104,8 @@ if(copytext(message,1,2) == "*") return emote(copytext(message,2)) else if(length(message) >= 2) - if(copytext(message, 1 ,3) == ":b" || copytext(message, 1 ,3) == ":B") - if(!is_component_functioning("comms")) - src << "\red Your binary communications component isn't functional." - return - - robot_talk(trim(copytext(message,3))) - - else if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":D") + if(copytext(message, 1 ,3) == ":d" || copytext(message, 1 ,3) == ":D") if(!is_component_functioning("radio")) src << "\red Your radio transmitter isn't functional." From ef277f1e6b5209e5f22a30d5e75bb4df93b2092f Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 24 Jun 2014 10:59:57 +0930 Subject: [PATCH 2/6] Added extra bit of info to drone spawn. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index a20ebf2e21..26af79a56e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -323,7 +323,7 @@ src << "
You are a maintenance drone, a tiny-brained robotic repair machine." src << "You have no individual will, no personality, and no drives or urges other than your laws." src << "Use :b to talk to your fellow synthetics, :d to talk to other drones, and say to speak silently to your nearby fellows." - src << "Remember, you are lawed against interference with the crew." + src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI." src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets." src << "If a crewmember has noticed you, you are probably breaking your third law." From e27cdb3620527e2b3b699ac257145d93dbab32b1 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 24 Jun 2014 11:11:55 +0930 Subject: [PATCH 3/6] Fixes #5323 --- code/modules/mob/living/silicon/robot/drone/drone.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 26af79a56e..08758ae8ce 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -60,7 +60,6 @@ //Some tidying-up. flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" - updatename() updateicon() //Redefining some robot procs... From 4cc0d6b6ee866f4716edd9d035e3ec5a23473007 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 24 Jun 2014 11:35:08 +0930 Subject: [PATCH 4/6] Fixes #5339 --- code/modules/paperwork/paper_bundle.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index da9a3e150e..0143b595ad 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -61,7 +61,10 @@ usr << browse("", "window=[name]") //Closes the dialog P = src[page] P.attackby(W, user) + + update_icon() + attack_self(usr) //Update the browsed page. add_fingerprint(usr) return From 24730cfd9facb586226f563fd6ef2479efe6e72d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Tue, 24 Jun 2014 14:11:08 +0930 Subject: [PATCH 5/6] Drones now have plasma cutters instead of emags. --- code/modules/mob/living/silicon/robot/robot_modules.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5e73996377..5ebaf5df7c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -306,8 +306,8 @@ src.modules += new /obj/item/weapon/matter_decompiler(src) src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src) - src.emag = new /obj/item/weapon/card/emag(src) - src.emag.name = "Cryptographic Sequencer" + src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src) + src.emag.name = "Plasma Cutter" for(var/T in stacktypes) var/obj/item/stack/sheet/W = new T(src) From 3ab7e510d5cd3251df147ebc6998666ef3708c91 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 25 Jun 2014 14:34:28 +0930 Subject: [PATCH 6/6] Removed reference to :b in drone spawn text. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 08758ae8ce..55270907ac 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -321,7 +321,7 @@ full_law_reset() src << "
You are a maintenance drone, a tiny-brained robotic repair machine." src << "You have no individual will, no personality, and no drives or urges other than your laws." - src << "Use :b to talk to your fellow synthetics, :d to talk to other drones, and say to speak silently to your nearby fellows." + src << "Use :d to talk to other drones and say to speak silently to your nearby fellows." src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI." src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets." src << "If a crewmember has noticed you, you are probably breaking your third law."