From 98c05cb473b704d1b77b1b16f1a685b5ad9d1173 Mon Sep 17 00:00:00 2001 From: Mek Date: Tue, 21 Jun 2022 22:51:46 -0400 Subject: [PATCH 1/3] Cowbot-requested changes --- code/modules/research/nanites/nanite_programs/weapon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/nanites/nanite_programs/weapon.dm b/code/modules/research/nanites/nanite_programs/weapon.dm index 810f59fa3da4..6026a98fe204 100644 --- a/code/modules/research/nanites/nanite_programs/weapon.dm +++ b/code/modules/research/nanites/nanite_programs/weapon.dm @@ -91,11 +91,11 @@ return host_mob.visible_message(span_warning("[host_mob] starts emitting a high-pitched buzzing, and [host_mob.p_their()] skin begins to glow..."),\ span_userdanger("You start emitting a high-pitched buzzing, and your skin begins to glow...")) - addtimer(CALLBACK(src, .proc/boom), clamp((nanites.nanite_volume * 0.35), 25, 150)) + addtimer(CALLBACK(src, .proc/boom), 300) //You have 30 seconds to live /datum/nanite_program/triggered/explosive/proc/boom() var/nanite_amount = nanites.nanite_volume - var/dev_range = FLOOR(nanite_amount/200, 1) - 1 + host_mob.adjustBruteLoss(nanite_amount/2.5) //Instead of gibbing we'll just do an asston of damage var/heavy_range = FLOOR(nanite_amount/100, 1) - 1 var/light_range = FLOOR(nanite_amount/50, 1) - 1 explosion(host_mob, dev_range, heavy_range, light_range) From b4f2564559acbd1fc39ac3cfdfb2a4f40aa1dfcf Mon Sep 17 00:00:00 2001 From: Mqiib <43766432+Mqiib@users.noreply.github.com> Date: Wed, 22 Jun 2022 02:08:57 -0400 Subject: [PATCH 2/3] Update code/modules/research/nanites/nanite_programs/weapon.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/research/nanites/nanite_programs/weapon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/weapon.dm b/code/modules/research/nanites/nanite_programs/weapon.dm index 6026a98fe204..b4bff89e2fcc 100644 --- a/code/modules/research/nanites/nanite_programs/weapon.dm +++ b/code/modules/research/nanites/nanite_programs/weapon.dm @@ -91,7 +91,7 @@ return host_mob.visible_message(span_warning("[host_mob] starts emitting a high-pitched buzzing, and [host_mob.p_their()] skin begins to glow..."),\ span_userdanger("You start emitting a high-pitched buzzing, and your skin begins to glow...")) - addtimer(CALLBACK(src, .proc/boom), 300) //You have 30 seconds to live + addtimer(CALLBACK(src, .proc/boom), 30 SECONDS) //You have 30 seconds to live /datum/nanite_program/triggered/explosive/proc/boom() var/nanite_amount = nanites.nanite_volume From 0fd4e524e04bfeb7d1a15106cd2f92fa34cf98c6 Mon Sep 17 00:00:00 2001 From: Mek Date: Wed, 22 Jun 2022 02:11:30 -0400 Subject: [PATCH 3/3] oops i forgot this --- code/modules/research/nanites/nanite_programs/weapon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/nanites/nanite_programs/weapon.dm b/code/modules/research/nanites/nanite_programs/weapon.dm index 6026a98fe204..528b30b263c5 100644 --- a/code/modules/research/nanites/nanite_programs/weapon.dm +++ b/code/modules/research/nanites/nanite_programs/weapon.dm @@ -98,7 +98,7 @@ host_mob.adjustBruteLoss(nanite_amount/2.5) //Instead of gibbing we'll just do an asston of damage var/heavy_range = FLOOR(nanite_amount/100, 1) - 1 var/light_range = FLOOR(nanite_amount/50, 1) - 1 - explosion(host_mob, dev_range, heavy_range, light_range) + explosion(host_mob, 0, heavy_range, light_range) qdel(nanites) //TODO make it defuse if triggered again