From a4e25a111c024e8654d973929f618e2ff1ffb764 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 21 Nov 2022 18:06:16 +0100 Subject: [PATCH] Fixes the Grauwolf and Francisca projectiles not using their overmap projectile icon. (#15144) Co-authored-by: Matt Atlas --- .../ship_weaponry/weaponry/francisca.dm | 1 + .../ship_weaponry/weaponry/grauwolf.dm | 1 + html/changelogs/mattatlas-overmapiconfix.yml | 41 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 html/changelogs/mattatlas-overmapiconfix.yml diff --git a/code/modules/overmap/ship_weaponry/weaponry/francisca.dm b/code/modules/overmap/ship_weaponry/weaponry/francisca.dm index b69bee3b43a..8d158368527 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/francisca.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/francisca.dm @@ -18,6 +18,7 @@ desc = "A box of FMJ bullets for use in a Francisca rotary gun." icon = 'icons/obj/guns/ship/ship_ammo_rotary.dmi' icon_state = "box_fmj" + overmap_icon_state = "cannon_salvo" impact_type = SHIP_AMMO_IMPACT_FMJ ammunition_flags = SHIP_AMMO_FLAG_INFLAMMABLE|SHIP_AMMO_FLAG_VERY_HEAVY|SHIP_AMMO_FLAG_INFLAMMABLE caliber = SHIP_CALIBER_40MM diff --git a/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm b/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm index dde9feac032..226a41e3d54 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/grauwolf.dm @@ -17,6 +17,7 @@ desc = "A bundle of high-explosive flak shells." icon = 'icons/obj/guns/ship/ship_ammo_flakbox.dmi' icon_state = "bundle_he" + overmap_icon_state = "flak" caliber = SHIP_CALIBER_90MM ammunition_behaviour = SHIP_AMMO_BEHAVIOUR_DUMBFIRE projectile_type_override = /obj/item/projectile/ship_ammo/grauwolf diff --git a/html/changelogs/mattatlas-overmapiconfix.yml b/html/changelogs/mattatlas-overmapiconfix.yml new file mode 100644 index 00000000000..a13888c3ecb --- /dev/null +++ b/html/changelogs/mattatlas-overmapiconfix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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: + - bugfix: "Grauwolf and Francisca projectiles now actually use their icon on the overmap."