From 22a0e6cc0430a79737bfd8c9b32abfa68e53cbfd Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 19 Jun 2023 21:54:49 +0200 Subject: [PATCH] Fixes banners being offset. (#16492) * Fixes banners being offset. * lol --------- Co-authored-by: Matt Atlas --- code/game/objects/structures/flags_banners.dm | 8 +++- html/changelogs/mattatlas-flagfix.yml | 41 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/mattatlas-flagfix.yml diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index d09505bc372..da0e27b62c8 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -38,7 +38,7 @@ flag_path = item_flag_path else flag_path = icon_state - if(!deploy) + if(deploy) switch(dir) if(NORTH) pixel_y = 32 @@ -68,12 +68,16 @@ switch(F2.dir) if(NORTH) F2.pixel_x = 32 + F2.pixel_y = 32 if(SOUTH) F2.pixel_x = 32 + F2.pixel_y = -32 if(EAST) F2.pixel_y = -32 + F2.pixel_x = 32 if(WEST) F2.pixel_y = 32 + F2.pixel_x = -32 F2.linked_flag = src F2.name = name F2.desc = desc @@ -138,7 +142,7 @@ user.visible_message(SPAN_NOTICE("\The [user] fastens \the [src] to \the [A]."), SPAN_NOTICE("You fasten \the [src] to \the [A].")) user.drop_from_inventory(src) - new flag_structure(user.loc, placement_dir, item_flag_path = flag_path) + new flag_structure(user.loc, placement_dir, deploy = TRUE, item_flag_path = flag_path) qdel(src) diff --git a/html/changelogs/mattatlas-flagfix.yml b/html/changelogs/mattatlas-flagfix.yml new file mode 100644 index 00000000000..a60f741eb1f --- /dev/null +++ b/html/changelogs/mattatlas-flagfix.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: "Fixes banner flags being randomly offset."