From 1ac0fd86482bf7d268a78554eb3b3ef45ad85e88 Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 31 Aug 2019 12:58:19 -0600 Subject: [PATCH 1/5] Reduces Phaser Charge Time to sub-30 seconds --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 7a0b26d176..3d021093c1 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -730,7 +730,7 @@ icon_state = "r357" ammo_type = /obj/item/ammo_casing/a44/rubber -//Expedition pistol +//Expedition Frontier Phaser /obj/item/weapon/gun/energy/frontier name = "frontier phaser" desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization." @@ -761,10 +761,10 @@ user.visible_message("[user] opens \the [src] and starts pumping the handle.", \ "You open \the [src] and start pumping the handle.") while(recharging) - if(!do_after(user, 10, src)) + if(!do_after(user, 10, src, ignore_movement = TRUE)) break playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) - if(power_supply.give(60) < 60) + if(power_supply.give(90) < 90) break recharging = 0 @@ -835,7 +835,7 @@ return ..() -//Expeditionary Holdout Phaser +//Expeditionary Holdout Phaser Pistol /obj/item/weapon/gun/energy/frontier/locked/holdout name = "holdout frontier phaser" desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." From 86a4b20a361318d0b5619e2252598924b4eecab8 Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 31 Aug 2019 14:31:18 -0600 Subject: [PATCH 2/5] Updated values as per Novacat's Review --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 3d021093c1..249a1e7717 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -746,6 +746,7 @@ unacidable = 1 var/recharging = 0 + var/phase_power = 75 projectile_type = /obj/item/projectile/beam firemodes = list( @@ -764,7 +765,7 @@ if(!do_after(user, 10, src, ignore_movement = TRUE)) break playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) - if(power_supply.give(90) < 90) + if(power_supply.give(phase_power) < phase_power) break recharging = 0 @@ -842,6 +843,7 @@ icon = 'icons/obj/gun_vr.dmi' icon_state = "holdoutkill" item_state = null + var/phase_power = 100 w_class = ITEMSIZE_SMALL charge_cost = 600 From a51070d19246cf285db1f9c5a9adc37569961a9e Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 31 Aug 2019 14:34:00 -0600 Subject: [PATCH 3/5] Fix var/phase_power defined twice --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 249a1e7717..33848e5778 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -843,7 +843,7 @@ icon = 'icons/obj/gun_vr.dmi' icon_state = "holdoutkill" item_state = null - var/phase_power = 100 + phase_power = 100 w_class = ITEMSIZE_SMALL charge_cost = 600 From ae2086b288062b09bb63e2927ca2e0e1e0541e6f Mon Sep 17 00:00:00 2001 From: Rykka Date: Sat, 31 Aug 2019 15:01:00 -0600 Subject: [PATCH 4/5] Updates as per review. --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 33848e5778..9f1d550427 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -762,7 +762,7 @@ user.visible_message("[user] opens \the [src] and starts pumping the handle.", \ "You open \the [src] and start pumping the handle.") while(recharging) - if(!do_after(user, 10, src, ignore_movement = TRUE)) + if(!do_after(user, 10, src,)) break playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) if(power_supply.give(phase_power) < phase_power) From ca6c7956616ec0b585222419e9091c80949b90fc Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 31 Aug 2019 17:07:30 -0400 Subject: [PATCH 5/5] Update custom_guns_vr.dm --- code/modules/vore/fluffstuff/custom_guns_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 9f1d550427..f99910a123 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -762,7 +762,7 @@ user.visible_message("[user] opens \the [src] and starts pumping the handle.", \ "You open \the [src] and start pumping the handle.") while(recharging) - if(!do_after(user, 10, src,)) + if(!do_after(user, 10, src)) break playsound(get_turf(src),'sound/items/change_drill.ogg',25,1) if(power_supply.give(phase_power) < phase_power)