From c9c046913f16aeb54b4efd614e29d3016304b1f1 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 19 Apr 2017 19:34:38 +0100 Subject: [PATCH 1/2] Changes tape coloring + slight rework --- code/__defines/misc.dm | 5 +++ code/game/objects/items/weapons/policetape.dm | 29 +++++++++--------- icons/policetape.dmi | Bin 4497 -> 6077 bytes 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 09f5e81ca0..f85ac5e7d4 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -69,6 +69,11 @@ #define COLOR_PALE_RED_GRAY "#CC9090" #define COLOR_PALE_PURPLE_GRAY "#BDA2BA" #define COLOR_PURPLE_GRAY "#A2819E" +#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_DEEP_SKY_BLUE "#00e1ff" + + + // Shuttles. diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index a9f2a15dea..9b4cb3ca9b 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -2,12 +2,12 @@ /obj/item/taperoll name = "tape roll" icon = 'icons/policetape.dmi' - icon_state = "rollstart" + icon_state = "tape" w_class = ITEMSIZE_SMALL var/turf/start var/turf/end var/tape_type = /obj/item/tape - var/icon_base + var/icon_base = "tape" var/apply_tape = FALSE @@ -33,7 +33,7 @@ var/list/tape_roll_applications = list() var/lifted = 0 var/crumpled = 0 var/tape_dir = 0 - var/icon_base + var/icon_base = "tape" /obj/item/tape/update_icon() //Possible directional bitflags: 0 (AIRLOCK), 1 (NORTH), 2 (SOUTH), 4 (EAST), 8 (WEST), 3 (VERTICAL), 12 (HORIZONTAL) @@ -60,22 +60,20 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/police name = "police tape" desc = "A roll of police tape used to block off crime scenes from the public." - icon_state = "police" tape_type = /obj/item/tape/police - icon_base = "police" + color = COLOR_RED_LIGHT /obj/item/tape/police name = "police tape" desc = "A length of police tape. Do not cross." req_access = list(access_security) - icon_base = "police" + color = COLOR_RED_LIGHT /obj/item/taperoll/engineering name = "engineering tape" desc = "A roll of engineering tape used to block off working areas from the public." - icon_state = "engineering" tape_type = /obj/item/tape/engineering - icon_base = "engineering" + color = COLOR_YELLOW /obj/item/taperoll/engineering/applied apply_tape = TRUE @@ -84,28 +82,31 @@ var/list/tape_roll_applications = list() name = "engineering tape" desc = "A length of engineering tape. Better not cross it." req_one_access = list(access_engine,access_atmospherics) - icon_base = "engineering" + color = COLOR_YELLOW /obj/item/taperoll/atmos name = "atmospherics tape" desc = "A roll of atmospherics tape used to block off working areas from the public." - icon_state = "atmos" tape_type = /obj/item/tape/atmos - icon_base = "atmos" + color = COLOR_DEEP_SKY_BLUE /obj/item/tape/atmos name = "atmospherics tape" desc = "A length of atmospherics tape. Better not cross it." req_one_access = list(access_engine,access_atmospherics) - icon_base = "atmos" + color = COLOR_DEEP_SKY_BLUE /obj/item/taperoll/update_icon() overlays.Cut() + var/image/overlay = image(icon = src.icon) + overlay.appearance_flags = RESET_COLOR if(ismob(loc)) if(!start) - overlays += "start" + overlay.icon_state = "start" else - overlays += "stop" + overlay.icon_state = "stop" + overlays += overlay + /obj/item/taperoll/dropped(mob/user) update_icon() diff --git a/icons/policetape.dmi b/icons/policetape.dmi index bc469f2eabce4bc4fa1d903603223eba6efeed8f..5dde02f1b520a80bcc7e0f713071f885f23c92d9 100644 GIT binary patch literal 6077 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 bh=WX*IHKbsrF`gndiZ`*+fb`g6B+Y=fzRkW delta 4461 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 Date: Sat, 22 Apr 2017 01:02:46 +0100 Subject: [PATCH 2/2] Changelog --- html/changelogs/Yoshax-Tape.yml | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Yoshax-Tape.yml diff --git a/html/changelogs/Yoshax-Tape.yml b/html/changelogs/Yoshax-Tape.yml new file mode 100644 index 0000000000..ffc7f56037 --- /dev/null +++ b/html/changelogs/Yoshax-Tape.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Yoshax + +# 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: + - tweak: "Tape color is different now. Security tape is red rather than yellow, Engineering tape remains yellow and Atmos tape is a lighter cyan rather than blue." \ No newline at end of file