From 334f46fe9200946b9b501625cf0a4d782346de8a Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:57:51 +0300 Subject: [PATCH] Add: Line Decals (#305) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Добавил в модуль декали для ЦК ## Why It's Good For The Game ![image](https://github.com/ss220club/Bandastation/assets/69762909/e232bf54-45c5-4e53-a48d-1623cf8f913f) --- .../aesthetics/_aesthetics.dme | 3 + .../aesthetics/decals/code/floor_decals.dm | 124 ++++++++++++++++++ .../aesthetics/decals/icons/floor_decals.dmi | Bin 0 -> 992 bytes 3 files changed, 127 insertions(+) create mode 100644 modular_bandastation/aesthetics/decals/code/floor_decals.dm create mode 100644 modular_bandastation/aesthetics/decals/icons/floor_decals.dmi diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme index a57c4cc818b1e..5830a370f4333 100644 --- a/modular_bandastation/aesthetics/_aesthetics.dme +++ b/modular_bandastation/aesthetics/_aesthetics.dme @@ -17,6 +17,9 @@ // Camera #include "cameras/code/cameras.dm" +// Decals +#include "decals/code/floor_decals.dm" + // Disposal #include "disposal/code/disposal.dm" diff --git a/modular_bandastation/aesthetics/decals/code/floor_decals.dm b/modular_bandastation/aesthetics/decals/code/floor_decals.dm new file mode 100644 index 0000000000000..78e40b8c4b1c3 --- /dev/null +++ b/modular_bandastation/aesthetics/decals/code/floor_decals.dm @@ -0,0 +1,124 @@ +/obj/effect/turf_decal/line + name = "line decal" + icon = 'modular_bandastation/aesthetics/decals/icons/floor_decals.dmi' + icon_state = "line_corner" + layer = TURF_PLATING_DECAL_LAYER + alpha = 110 + +/// Automatically generates all subtypes for a decal with the given path. +#define LINE_DECAL_SUBTYPE_HELPER(path)\ +##path/line {\ + icon_state = "line";\ +}\ +##path/line/contrasted {\ + icon_state = "line_contrasted";\ +}\ +##path/line/stripes {\ + icon_state = "line_stripes";\ +}\ +##path/line/stripes/contrasted {\ + icon_state = "line_stripes_contrasted";\ +}\ +##path/anticorner {\ + icon_state = "line_anticorner";\ +}\ +##path/anticorner/contrasted {\ + icon_state = "line_anticorner_contrasted";\ +}\ +##path/anticorner/stripes {\ + icon_state = "line_anticorner_stripes";\ +}\ +##path/anticorner/stripes/contrasted {\ + icon_state = "line_anticorner_stripes_contrasted";\ +}\ +##path/opposingcorners {\ + icon_state = "line_opposing_corners";\ +}\ + +/// Blue lines +/obj/effect/turf_decal/line/blue + name = "blue line decal" + color = "#52B4E9" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/blue) + +/// Dark blue lines +/obj/effect/turf_decal/line/dark_blue + name = "dark blue line decal" + color = "#486091" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/dark_blue) + +/// Green lines +/obj/effect/turf_decal/line/green + name = "green line decal" + color = "#9FED58" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/green) + +/// Dark green lines +/obj/effect/turf_decal/line/dark_green + name = "dark green line decal" + color = "#439C1E" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/dark_green) + +/// Yellow lines +/obj/effect/turf_decal/line/yellow + name = "yellow line decal" + color = "#EFB341" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/yellow) + +/// Red lines +/obj/effect/turf_decal/line/red + name = "red line decal" + color = "#DE3A3A" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/red) + +/// Dark red lines +/obj/effect/turf_decal/line/dark_red + name = "dark red line decal" + color = "#B11111" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/dark_red) + +/// Bar lines +/obj/effect/turf_decal/line/bar + name = "bar line decal" + color = "#791500" + alpha = 130 + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/bar) + +/// Purple lines +/obj/effect/turf_decal/line/purple + name = "purple line decal" + color = "#D381C9" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/purple) + +/// Brown lines +/obj/effect/turf_decal/line/brown + name = "brown line decal" + color = "#A46106" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/brown) + +/// Neutral lines +/obj/effect/turf_decal/line/neutral + name = "neutral line decal" + color = "#D4D4D4" + alpha = 50 + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/neutral) + +/// Dark lines +/obj/effect/turf_decal/line/dark + name = "dark line decal" + color = "#0e0f0f" + +LINE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/line/dark) + +#undef LINE_DECAL_SUBTYPE_HELPER diff --git a/modular_bandastation/aesthetics/decals/icons/floor_decals.dmi b/modular_bandastation/aesthetics/decals/icons/floor_decals.dmi new file mode 100644 index 0000000000000000000000000000000000000000..982c61d04358f60a8d3e16fe347e74e78f514e8d GIT binary patch literal 992 zcmV<610Vc}P)$R6BRkYeLDplwNlzP?@cpop-=TL!+#FeJ6vw!5x3&A!uDAjTNX z#;j*^t#0VVXR%sprcQz~LAv099H!Bp$6=oycBboEM+$Bq%QoLY4*G zG@gYp0T;o=AvOpWG=1a$h$^f0?JJIsDMiLGypH-axHfIyJYMDw+fcHk+29$10008d zNkl|0)}m8JHeW#=L83YAb5f_~I)T0U2wQFca14gqb)xRS7eZ`}U>6 z6OgmidIq0{dgOh#HoNfFukB(MPUG4Jv+(}SSeiErJGx1$un#w>gc6xcUKO~f~MhiJCT7?`ItwIiqRw0K)t8ffAX%^0*Jqy&B@DWd0?IXb8qkzFj34@Ok@Apv+)O?KiAs>;SPx{!++D8bBipP>E`Xs`lQ#=Tx zPih_n9)!^+H4g$0!swHl2Z2W+`;?yt6Fyr{T0kT4Cw#SNrshBNr3tgbq+gd47IbKgR!TMDj_^TTFEkTV?%>P3OLL2X z1hjq%fnXp3)RoSYfEEfMfAu7Q1gi6K!8I%th*Pfo5co8KT9!T2Tf8?RTzQ}Jffy$` zKnW7$r-~=SVMoYM6;BTh6In=+G#{||Bs*#!CC^*fQTYfwZF%gdd;~sxc37}zACcd1 ze`e58`3QX2xcdYhm5(@3AYSET5zWV+^6{DPBSkmmV+@x=j^}k#%;JlBib$E}rkcN)cf2lkb)HZ@a1uJ5fvuJ5PxVDFE9uj9DB zmq-24?{)Yw1LJXD2~Rt6ddd8Bid0+JC>*TEz2KDl>v22SUys|tBX8C@G#_{Hejh*Z zKFT^m#hT*4vX0Qvt$Zt@j?nQ`?u#+gI^w7*Psf!1pQ;zig;;~|EdBry`8_6Bs>1pJ O0000