Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sol ship gun addition and tweaks #20094

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3113,6 +3113,7 @@
#include "code\modules\overmap\ship_weaponry\weaponry\grauwolf_probe.dm"
#include "code\modules\overmap\ship_weaponry\weaponry\lammergeier.dm"
#include "code\modules\overmap\ship_weaponry\weaponry\leviathan.dm"
#include "code\modules\overmap\ship_weaponry\weaponry\light_coilgun.dm"
#include "code\modules\overmap\ship_weaponry\weaponry\longbow.dm"
#include "code\modules\overmap\ship_weaponry\weaponry\longbow_ammo.dm"
#include "code\modules\overmap\ships\identification.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/overmap/ship_weaponry/weaponry/blaster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
var/mob/M = target
M.visible_message(SPAN_DANGER("<font size=5>\The [src] disintegrates [M]'s chest and blasts them into pieces!</font>"))
if(isturf(target) || isobj(target))
explosion(target, 2, 5, 7)
explosion(target, 2, 3, 4)

/obj/machinery/ammunition_loader/blaster
name = "mining blaster loader"
38 changes: 38 additions & 0 deletions code/modules/overmap/ship_weaponry/weaponry/light_coilgun.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/machinery/ship_weapon/coilgun/light
name = "M302A7 piledriver light coilgun"
desc = "A miniaturized version of the Solarian Navy’s coilgun platform, the M302A7 is the latest version of a weapon class that has served with honor since the Interstellar War. A semiautomatic, magazine-loaded design, it excels at applying pressure to enemy shields and hulls."
desc_extended = "Pressed for a smaller version of a coilgun to fit onto escort craft, the Alliance contracted what was then Necropolis Industries to design and manufacture the Navy’s first coilgun for corvette use in the mid-2200s. The M2307 is a post-Interstellar War modernization of earlier models that had been steadily improved upon over time. Though phased out of use in some battlegroups in favor of the M455A1 light coilgun, it remains a common sight in many fleets."
icon = 'icons/obj/machinery/ship_guns/sol_light_coilgun.dmi'
icon_state = "weapon_base"
max_ammo = 8
projectile_type = /obj/projectile/ship_ammo/coilgun/light

heavy_firing_sound = 'sound/weapons/railgun.ogg'
firing_effects = FIRING_EFFECT_FLAG_EXTREMELY_LOUD
screenshake_type = SHIP_GUN_SCREENSHAKE_ALL_MOBS
caliber = SHIP_CALIBER_COILGUN

/obj/item/ship_ammunition/coilgun/light
name = "light tungsten rod pack"
name_override = "light tungsten rod"
desc = "A pack of rods used as ammunition for a light coilgun."
icon = 'icons/obj/ammo.dmi'
icon_state = "trodpack-2"
caliber = SHIP_CALIBER_COILGUN
overmap_icon_state = "light_pulse"
impact_type = SHIP_AMMO_IMPACT_AP

/obj/projectile/ship_ammo/coilgun/light
name = "low-power tungsten rod"
icon_state = "heavy"
damage = 10000
armor_penetration = 1000
penetrating = 1

/obj/projectile/ship_ammo/coilgun/light/on_hit(atom/target, blocked, def_zone, is_landmark_hit)
. = ..()
if(ismob(target))
var/mob/M = target
M.visible_message(SPAN_DANGER("<font size=5>\The [src] blows [M]'s chest apart and punches straight through!</font>"))
if(isturf(target) || isobj(target))
explosion(target, 1, 3, 4)
60 changes: 60 additions & 0 deletions html/changelogs/TheDanseMacabre-light-coilgun.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: Kintsugi

# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added a new type of coilgun for use on Solarian ships, the light coilgun, replacing the grauwolf on the SSRM recon corvette and SFA remnant corvette."
- balance: "The SSRM recon corvette has had its francisca replaced with a goshawk autocannon."
- balance: "Nerfed the mining blaster's projectiles."
Binary file not shown.
Loading
Loading