From 5e871f159d3b1847190ffc7406dab1b8b5a6bed1 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Tue, 22 Sep 2015 17:21:59 -0700 Subject: [PATCH 1/7] Allows repair of pAIs with nanopaste --- code/modules/mob/living/silicon/pai/pai.dm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 7594dae17b0..14b4be1d801 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -432,7 +432,22 @@ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(W.force) + if(isType(W, /obj/item/stack/nanopaste)) + if (stat == DEAD) + user << "The [src] is beyond help, at this point." + else if (getBruteLoss() || getFireLoss()) + adjustBruteLoss(-15) + adjustFireLoss(-15) + updatehealth() + use(1) + user.visible_message("[user.name] applied some [W] at [src]'s damaged areas.",\ + "You apply some [W] at [src.name]'s damaged areas.") + else + user << "All [src.name]'s systems are nominal." + + return + + else if(W.force) visible_message("[user.name] attacks [src] with [W]!") src.adjustBruteLoss(W.force) src.updatehealth() From da10b5a795dbed48e3272798f58898ecfd0f3b91 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Tue, 22 Sep 2015 18:42:44 -0700 Subject: [PATCH 2/7] Syntax errors removed --- code/modules/mob/living/silicon/pai/pai.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 14b4be1d801..8684e44050d 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -432,7 +432,8 @@ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(isType(W, /obj/item/stack/nanopaste)) + if(istype(W, /obj/item/stack/nanopaste)) + var/obj/item/stack/nanopaste/N = W if (stat == DEAD) user << "The [src] is beyond help, at this point." else if (getBruteLoss() || getFireLoss()) From 9c64e2f5212b31e5d32df9d5d10ea7b8507ead08 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Tue, 22 Sep 2015 18:45:12 -0700 Subject: [PATCH 3/7] Put the N in the N.use(1) --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 8684e44050d..9ece65d05f0 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -440,7 +440,7 @@ adjustBruteLoss(-15) adjustFireLoss(-15) updatehealth() - use(1) + N.use(1) user.visible_message("[user.name] applied some [W] at [src]'s damaged areas.",\ "You apply some [W] at [src.name]'s damaged areas.") else From 2b4d1d0b5c49a4ed88818aafb219a5ec48eeed7d Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 22 Sep 2015 18:50:49 -0700 Subject: [PATCH 4/7] Removed the spaces Yeah, vim is probably not my best tool of choice here... --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9ece65d05f0..04e8158f282 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -433,7 +433,7 @@ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/stack/nanopaste)) - var/obj/item/stack/nanopaste/N = W + var/obj/item/stack/nanopaste/N = W if (stat == DEAD) user << "The [src] is beyond help, at this point." else if (getBruteLoss() || getFireLoss()) From d9e6382ef96c2f00c599a2d34150900812a84e50 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 22 Sep 2015 18:56:07 -0700 Subject: [PATCH 5/7] Lined up the else statement --- code/modules/mob/living/silicon/pai/pai.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 04e8158f282..23a5b5b7dd0 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -447,7 +447,6 @@ user << "All [src.name]'s systems are nominal." return - else if(W.force) visible_message("[user.name] attacks [src] with [W]!") src.adjustBruteLoss(W.force) From c1db00b5333d333ddfa2c6d8a9a394ba02487bc0 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 22 Sep 2015 18:57:55 -0700 Subject: [PATCH 6/7] Corrected the indentation of the typecast Not my finest moment... --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 23a5b5b7dd0..b9b72fea496 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -433,7 +433,7 @@ //Overriding this will stop a number of headaches down the track. /mob/living/silicon/pai/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/stack/nanopaste)) - var/obj/item/stack/nanopaste/N = W + var/obj/item/stack/nanopaste/N = W if (stat == DEAD) user << "The [src] is beyond help, at this point." else if (getBruteLoss() || getFireLoss()) From dd6b1538243db254f3b6a26b9be284e480b3318f Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 22 Sep 2015 19:11:07 -0700 Subject: [PATCH 7/7] Fixed the beyond repair message's formatting --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index b9b72fea496..8c79ef206a9 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -435,7 +435,7 @@ if(istype(W, /obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/N = W if (stat == DEAD) - user << "The [src] is beyond help, at this point." + user << "\The [src] is beyond help, at this point." else if (getBruteLoss() || getFireLoss()) adjustBruteLoss(-15) adjustFireLoss(-15)