From aa575b446a60b4b2abe9a8f90b311829babc34c9 Mon Sep 17 00:00:00 2001 From: Segrain Date: Mon, 8 Dec 2014 03:57:02 +0300 Subject: [PATCH 1/4] Fix for #7260. --- code/modules/mob/living/silicon/robot/robot.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f2aa919eb0..38e0c0df6a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1322,9 +1322,9 @@ var/list/robot_verbs_default = list( if(!connected_ai) return switch(notifytype) - if(1) //New Cyborg - connected_ai << "

NOTICE - New cyborg connection detected: [name]
" + if(1) //New Robot + connected_ai << "

NOTICE - New [lowertext(braintype)] connection detected: [name]
" if(2) //New Module - connected_ai << "

NOTICE - Cyborg module change detected: [name] has loaded the [module.name] module.
" + connected_ai << "

NOTICE - [braintype] module change detected: [name] has loaded the [module.name].
" if(3) //New Name - connected_ai << "

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
" + connected_ai << "

NOTICE - [braintype] reclassification detected: [oldname] is now designated as [newname].
" \ No newline at end of file From 639c61721b64ef239b87b3afd80d1934e32bb7b3 Mon Sep 17 00:00:00 2001 From: Segrain Date: Mon, 8 Dec 2014 03:58:42 +0300 Subject: [PATCH 2/4] Fix for #7261. --- code/game/objects/effects/decals/contraband.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 68f60816fa..7a55a1a7e5 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -35,14 +35,15 @@ obj/structure/sign/poster var/ruined = 0 obj/structure/sign/poster/New(var/serial) + serial_number = serial var/designtype if (poster_type) designtype = text2path(poster_type) else if(serial_number == loc) - serial_number = rand(1, poster_designs.len) //This is for the mappers that want individual posters without having to use rolled posters. + serial_number = rand(1, poster_designs.len) //This is for the mappers that want individual posters without having to use rolled posters. designtype = poster_designs[serial_number] - + var/datum/poster/design=new designtype() name += " - [design.name]" desc += " [design.desc]" From e0ab31756d5905cf7ae7b2ee0cc5d564467b6bbe Mon Sep 17 00:00:00 2001 From: Segrain Date: Mon, 8 Dec 2014 04:01:00 +0300 Subject: [PATCH 3/4] Fix for double definition. --- .../modules/mob/living/silicon/pai/examine.dm | 39 ++++++++----------- code/modules/mob/living/silicon/pai/pai.dm | 22 +---------- 2 files changed, 17 insertions(+), 44 deletions(-) diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 7565c35844..109e4ce43f 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -1,26 +1,19 @@ -/mob/living/silicon/pai/examine(mob/user) //removed as it was pointless...moved to the pai-card instead. - /*..(user) +/mob/living/silicon/pai/examine(mob/user) + ..(user, infix = ", personal AI") var/msg = "" - if (src.stat == DEAD) - msg += "It appears to be offline.\n" - else - msg += "" - if (src.getBruteLoss()) - if (src.getBruteLoss() < 30) - msg += "It looks slightly dented.\n" - else - msg += "Its casing appears cracked and broken!\n" - if (src.getFireLoss()) - if (src.getFireLoss() < 30) - msg += "It looks slightly charred!\n" - else - msg += "Its casing is melted and heat-warped!\n" - if (src.stat == UNCONSCIOUS) - msg += "It doesn't seem to be responding and its text-output is lagging.\n" - msg += "" - msg += "*---------*" + switch(src.stat) + if(CONSCIOUS) + if(!src.client) msg += "\nIt appears to be in stand-by mode." //afk + if(UNCONSCIOUS) msg += "\nIt doesn't seem to be responding." + if(DEAD) msg += "\nIt looks completely unsalvageable." + msg += "\n*---------*" - user << msg - */ - return \ No newline at end of file + if(print_flavor_text()) msg += "\n[print_flavor_text()]\n" + + if (pose) + if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 ) + pose = addtext(pose,".") //Makes sure all emotes end with a period. + msg += "\nIt is [pose]" + + user << msg \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index d8bf9706fd..0fc0d5e132 100755 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -415,26 +415,6 @@ else src << "You are too small to pull that." -/mob/living/silicon/pai/examine(mob/user) - ..(user) - - var/msg = "" - switch(src.stat) - if(CONSCIOUS) - if(!src.client) msg += "\nIt appears to be in stand-by mode." //afk - if(UNCONSCIOUS) msg += "\nIt doesn't seem to be responding." - if(DEAD) msg += "\nIt looks completely unsalvageable." - msg += "\n*---------*" - - if(print_flavor_text()) msg += "\n[print_flavor_text()]\n" - - if (pose) - if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 ) - pose = addtext(pose,".") //Makes sure all emotes end with a period. - msg += "\nIt is [pose]" - - user << msg - // No binary for pAIs. /mob/living/silicon/pai/binarycheck() - return 0 + return 0 \ No newline at end of file From 7f1b5f0603533e0bf7cbcbd9edc47e77d033e272 Mon Sep 17 00:00:00 2001 From: Segrain Date: Mon, 8 Dec 2014 11:20:46 +0300 Subject: [PATCH 4/4] Fix for #7285. --- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 6071c4054f..6a25b46444 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1048,10 +1048,10 @@ var/global/list/obj/item/device/pda/PDAs = list() // Do nothing /obj/item/device/pda/proc/new_message_from_pda(var/obj/item/device/pda/sending_device, var/message) - new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message) + new_message(sending_device, sending_device.owner, sending_device.ownjob, message) /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message) - var/reception_message = "\icon[src] Message from [sender] ([sender_job]), \"[message]\" (Reply)" + var/reception_message = "\icon[src] Message from [sender] ([sender_job]), \"[message]\" (Reply)" new_info(news_silent, newstone, reception_message) log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")