diff --git a/aurorastation.dme b/aurorastation.dme index 84cfb892b73..87320edaab9 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2340,6 +2340,7 @@ #include "code\modules\effects\map_effects\marker\airlock_docking.dm" #include "code\modules\effects\map_effects\marker\airlock_helper.dm" #include "code\modules\effects\map_effects\marker\airlock_shuttle.dm" +#include "code\modules\effects\map_effects\marker\door_paint.dm" #include "code\modules\effects\map_effects\marker\large_tank.dm" #include "code\modules\effects\map_effects\marker\mapmanip.dm" #include "code\modules\effects\maze_generation\maze_generator.dm" diff --git a/code/game/objects/structures/machinery/doors/airlock.dm b/code/game/objects/structures/machinery/doors/airlock.dm index 5d6afcd57e2..1bfe35140dd 100644 --- a/code/game/objects/structures/machinery/doors/airlock.dm +++ b/code/game/objects/structures/machinery/doors/airlock.dm @@ -118,8 +118,6 @@ var/door_frame_color = COLOR_GRAY20 /// Color. The color of the stripe detail. var/stripe_color = null - /// Color. The color of the symbol detail. - var/symbol_color = null /// Color. The color of the window. var/window_color = null /// String (One of `MATERIAL_*`). The material used for the door's window if `glass` is set. Used to set `window_material` during init. diff --git a/code/modules/effects/map_effects/marker/door_paint.dm b/code/modules/effects/map_effects/marker/door_paint.dm new file mode 100644 index 00000000000..6fade44d595 --- /dev/null +++ b/code/modules/effects/map_effects/marker/door_paint.dm @@ -0,0 +1,172 @@ + +// ----------------------------------- main defs + +/// +/obj/effect/map_effect/marker/door_paint + var/fill_color = null + var/stripe_color = null + var/frame_color = null + +/obj/effect/map_effect/marker/door_paint/Initialize(mapload, ...) + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/effect/map_effect/marker/door_paint/LateInitialize() + for(var/thing in loc) + var/obj/structure/machinery/door/airlock/door = thing + if(!istype(door)) + continue + door.paintable = AIRLOCK_PAINTABLE_MAIN | AIRLOCK_PAINTABLE_STRIPE + if(fill_color) + door.door_color = fill_color + if(stripe_color) + door.stripe_color = stripe_color + if(frame_color) + door.door_frame_color = frame_color + door.update_icon() + +// ----------------------------------- main defs + +/obj/effect/map_effect/marker/door_paint/fill + icon_state = "marker_door_paint_fill" + +/obj/effect/map_effect/marker/door_paint/fill/LateInitialize() + fill_color = color + . = ..() + +/obj/effect/map_effect/marker/door_paint/stripe + icon_state = "marker_door_paint_stripe" + +/obj/effect/map_effect/marker/door_paint/stripe/LateInitialize() + stripe_color = color + . = ..() + +/obj/effect/map_effect/marker/door_paint/frame + icon_state = "marker_door_paint_frame" + +/obj/effect/map_effect/marker/door_paint/frame/LateInitialize() + frame_color = color + . = ..() + +// ----------------------------------- department subtypes + +// to be filled with department color defines, if they were ever to be decided + +// ----------------------------------- color fill subtypes + +/obj/effect/map_effect/marker/door_paint/fill/black + color = COLOR_GRAY20 + +/obj/effect/map_effect/marker/door_paint/fill/blue + color = COLOR_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/paleblue + color = COLOR_PALE_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/dark_blue + color = COLOR_DARK_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/dark_green + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/green + color = COLOR_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/lime + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/yellow + color = COLOR_BROWN + +/obj/effect/map_effect/marker/door_paint/fill/beige + color = COLOR_BEIGE + +/obj/effect/map_effect/marker/door_paint/fill/red + color = COLOR_RED_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/pink + color = COLOR_PALE_RED_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/purple + color = COLOR_PURPLE_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/mauve + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/map_effect/marker/door_paint/fill/orange + color = COLOR_DARK_ORANGE + +/obj/effect/map_effect/marker/door_paint/fill/brown + color = COLOR_DARK_BROWN + +/obj/effect/map_effect/marker/door_paint/fill/white + color = COLOR_GRAY70 + +/obj/effect/map_effect/marker/door_paint/fill/grey + color = COLOR_GRAY + +// ----------------------------------- color stripe subtypes + +/obj/effect/map_effect/marker/door_paint/stripe/gold + color = COLOR_GOLD + +/obj/effect/map_effect/marker/door_paint/stripe/black + color = COLOR_GRAY20 + +/obj/effect/map_effect/marker/door_paint/stripe/blue + color = COLOR_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/paleblue + color = COLOR_PALE_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/dark_blue + color = COLOR_DARK_BLUE_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/dark_green + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/green + color = COLOR_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/lime + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/yellow + color = COLOR_BROWN + +/obj/effect/map_effect/marker/door_paint/stripe/beige + color = COLOR_BEIGE + +/obj/effect/map_effect/marker/door_paint/stripe/red + color = COLOR_RED_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/pink + color = COLOR_PALE_RED_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/purple + color = COLOR_PURPLE_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/mauve + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/map_effect/marker/door_paint/stripe/orange + color = COLOR_DARK_ORANGE + +/obj/effect/map_effect/marker/door_paint/stripe/brown + color = COLOR_DARK_BROWN + +/obj/effect/map_effect/marker/door_paint/stripe/white + color = COLOR_GRAY70 + +/obj/effect/map_effect/marker/door_paint/stripe/grey + color = COLOR_GRAY + +// ----------------------------------- color frame subtypes + +/obj/effect/map_effect/marker/door_paint/frame/scc + color = /turf/simulated/wall/shuttle/scc::color + +/obj/effect/map_effect/marker/door_paint/frame/brown + color = /turf/simulated/wall/shuttle/brown::color + +// ----------------------------------- fin diff --git a/html/changelogs/DreamySkrell-door-paint-marker.yml b/html/changelogs/DreamySkrell-door-paint-marker.yml new file mode 100644 index 00000000000..2c3ba5b18ee --- /dev/null +++ b/html/changelogs/DreamySkrell-door-paint-marker.yml @@ -0,0 +1,58 @@ +################################ +# 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: DreamySkrell + +# 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: "Door paint markers." diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi index 5a3ff46925b..35948b19781 100644 Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ