From f202bb673a00bca5ecbc3f3825394e011843c3bf Mon Sep 17 00:00:00 2001 From: OneOneThreeEight Date: Sat, 7 Oct 2017 01:40:59 -0400 Subject: [PATCH] Adds a dispersion effect to the thermal drill (#3527) --- .../projectiles/guns/energy/special.dm | 15 +++++--- html/changelogs/1138-thermaldrills.yml | 37 +++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/1138-thermaldrills.yml diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 3717e9b4977..adb3f80abe1 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -111,6 +111,9 @@ w_class = 3.0 origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4) projectile_type = /obj/item/projectile/energy/phoron + can_turret = 1 + turret_is_lethal = 0 + turret_sprite_set = "net" /obj/item/weapon/gun/energy/beegun name = "\improper NanoTrasen Portable Apiary" @@ -420,13 +423,14 @@ recharge_time = 1 charge_meter = 1 charge_cost = 50 - can_turret = 1 + dispersion = list(0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9) + can_turret = 1 turret_sprite_set = "thermaldrill" firemodes = list( - list(mode_name="2 second burst", burst=10, burst_delay = 1, fire_delay = 20), - list(mode_name="4 second burst", burst=20, burst_delay = 1, fire_delay = 40), - list(mode_name="6 second burst", burst=30, burst_delay = 1, fire_delay = 60) + list(mode_name="2 second burst", burst=10, burst_delay = 1, fire_delay = 20, dispersion = list(0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9)), + list(mode_name="4 second burst", burst=20, burst_delay = 1, fire_delay = 40, dispersion = list(0.0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 0.2, 2.4, 2.6, 2.8, 3.0, 3.2, 3.4, 3.6, 3.8)), + list(mode_name="6 second burst", burst=30, burst_delay = 1, fire_delay = 60, dispersion = list(0.0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3.0, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6.0, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7)) ) action_button_name = "Wield thermal drill" @@ -489,6 +493,7 @@ charge_meter = 1 use_external_power = 1 charge_cost = 25 + dispersion = list(0.0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3.0, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6.0, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7) /obj/item/weapon/gun/energy/vaurca/mountedthermaldrill/special_check(var/mob/user) ..() @@ -558,4 +563,4 @@ sel_mode = 1 fire_delay = 20 accuracy = 40 - muzzle_flash = 10 \ No newline at end of file + muzzle_flash = 10 diff --git a/html/changelogs/1138-thermaldrills.yml b/html/changelogs/1138-thermaldrills.yml new file mode 100644 index 00000000000..38cb7784387 --- /dev/null +++ b/html/changelogs/1138-thermaldrills.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Scheveningen + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - balance: "Adds a dispersion effect to the thermal drill."