From 991dc6a9655ef1daf19fe207d59af4a91bac5c32 Mon Sep 17 00:00:00 2001 From: Yata9arasu Date: Mon, 16 Sep 2024 20:08:34 +0300 Subject: [PATCH 1/2] Elysium under added --- mod_celadon/_storge_icons/_storge_icons.dme | 10 ++++++ .../_storge_icons/icons/mob/el_cloth.dmi | Bin 0 -> 5596 bytes .../_storge_icons/icons/obj/el_cloth.dmi | Bin 0 -> 989 bytes mod_celadon/stuff_elysium/_stuff_elysium.dme | 1 + mod_celadon/stuff_elysium/code/under.dm | 31 ++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 mod_celadon/_storge_icons/icons/mob/el_cloth.dmi create mode 100644 mod_celadon/_storge_icons/icons/obj/el_cloth.dmi create mode 100644 mod_celadon/stuff_elysium/code/under.dm diff --git a/mod_celadon/_storge_icons/_storge_icons.dme b/mod_celadon/_storge_icons/_storge_icons.dme index a979f3b8f234..7a36cddcd423 100644 --- a/mod_celadon/_storge_icons/_storge_icons.dme +++ b/mod_celadon/_storge_icons/_storge_icons.dme @@ -4,3 +4,13 @@ #include "_storge_icons.dm" #endif +// BEGIN_INTERNALS +// END_INTERNALS +// BEGIN_FILE_DIR +#define FILE_DIR . +// END_FILE_DIR +// BEGIN_PREFERENCES +// END_PREFERENCES +// BEGIN_INCLUDE +#include "_storge_icons.dm" +// END_INCLUDE diff --git a/mod_celadon/_storge_icons/icons/mob/el_cloth.dmi b/mod_celadon/_storge_icons/icons/mob/el_cloth.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4fc58a00db5ddce8cd8fe41d1326a71a57b016dc GIT binary patch literal 5596 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 literal 0 HcmV?d00001 diff --git a/mod_celadon/_storge_icons/icons/obj/el_cloth.dmi b/mod_celadon/_storge_icons/icons/obj/el_cloth.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ab0214ec979644f42f7b751a50cfaf86725db401 GIT binary patch literal 989 zcmV<310wv1P)U2RMl*d&HH3tO_UF^w+}yLXvw~4Oct$Vs z^74OwfA8SU*x1;;y}h5GpS88M+s(Yo%gf@_!q>{Vii(Qo*~Zn#w`pN5kB^U+k4&edUHEsTr;Gkq?DADqnlEVgh85`ntF6ShJQp38sh%|0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6# za*U0*I5Sc+(=$pSoZ^zil2jm5DK#fPIVZm)Bi>Mni!&v&s2C_{$iYDx4ge1{K~q-*8esqc0uo6?K~z|U?UvhflRy~7xu#O>B4iQL zi(sK`*j>;VG&ax#j3JlC%m4q^_%%;D?q_B)_bf8NCu1ai369>LzfIz1nq^Yk5(lcnP3Tc-RTb2Gs-OwQ& zQ0l>#^bDHnkaOZ(06^;Nx=$~uf92`&JP@3|+jm_DyGFww1cM;(v1?S$&TZGZaBS%v zfL>pEfq&(DSb;DKqc>4>9YxVmz7odC&25t0#&-zdfUiU`m~j%vp?tw1A9jd`!+4m) zci~Y!Y>^}(^bD_$^gDIx)agG`$~a8U#F2TPzJ^SqX4w-UFIb&QS2Rsk zO{%JC5JH+2`8b6FOrBSoYF5oYHx&j@Sdp`bagi~^Z>srWKsqiM23SS7%DA8u!!Xx1??*q=c;Ap;6r+=uQ^s-H5EFIh800000 LNkvXXu0mjf{<+)i literal 0 HcmV?d00001 diff --git a/mod_celadon/stuff_elysium/_stuff_elysium.dme b/mod_celadon/stuff_elysium/_stuff_elysium.dme index 5e3cb4dc7006..c7e6fc0f9bd1 100644 --- a/mod_celadon/stuff_elysium/_stuff_elysium.dme +++ b/mod_celadon/stuff_elysium/_stuff_elysium.dme @@ -13,6 +13,7 @@ #include "code/shoes.dm" #include "code/belt.dm" #include "code/outfit_ship/elysium.dm" +#include "code/under.dm" #endif diff --git a/mod_celadon/stuff_elysium/code/under.dm b/mod_celadon/stuff_elysium/code/under.dm new file mode 100644 index 000000000000..58a0b02543e2 --- /dev/null +++ b/mod_celadon/stuff_elysium/code/under.dm @@ -0,0 +1,31 @@ +/obj/item/clothing/under/el_cloth_1 + name = "Shirt with shorts" + desc = "Someone who wears this means business." + icon = 'mod_celadon/_storge_icons/icons/obj/el_cloth.dmi' + mob_overlay_icon = 'mod_celadon/_storge_icons/icons/mob/el_cloth.dmi' + icon_state = "el_cloth_1" + item_state = "el_cloth_1" + +/obj/item/clothing/under/el_cloth_2 + name = "Green shirt with shorts" + desc = "A common low quality t-shirt that is common among the inhabitants of the Republic of Elysium that live in rural areas. It has a bright green color." + icon = 'mod_celadon/_storge_icons/icons/obj/el_cloth.dmi' + mob_overlay_icon = 'mod_celadon/_storge_icons/icons/mob/el_cloth.dmi' + icon_state = "el_cloth_2" + item_state = "el_cloth_2" + +/obj/item/clothing/under/el_cloth_3 + name = "White robe with gilet" + desc = "A white robe commonly worn by the inhabitants of Elisium. A leather gilet is visible over it. It's the height of fashion." + icon = 'mod_celadon/_storge_icons/icons/obj/el_cloth.dmi' + mob_overlay_icon = 'mod_celadon/_storge_icons/icons/mob/el_cloth.dmi' + icon_state = "el_cloth_3" + item_state = "el_cloth_3" + +/obj/item/clothing/under/el_cloth_4 + name = "Dropped T-shirt with shorts" + desc = "A common low quality t-shirt, common among the rural inhabitants of the Elysium Republic. It has a slightly faded yellow color. The t-shirt is pulled down, revealing the faded jersey." + icon = 'mod_celadon/_storge_icons/icons/obj/el_cloth.dmi' + mob_overlay_icon = 'mod_celadon/_storge_icons/icons/mob/el_cloth.dmi' + icon_state = "el_cloth_4" + item_state = "el_cloth_4" From c5c7e8257f2de0833ac880403b919b93850138cb Mon Sep 17 00:00:00 2001 From: Yata9arasu Date: Mon, 16 Sep 2024 20:10:44 +0300 Subject: [PATCH 2/2] fukk --- mod_celadon/_storge_icons/_storge_icons.dme | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mod_celadon/_storge_icons/_storge_icons.dme b/mod_celadon/_storge_icons/_storge_icons.dme index 7a36cddcd423..a979f3b8f234 100644 --- a/mod_celadon/_storge_icons/_storge_icons.dme +++ b/mod_celadon/_storge_icons/_storge_icons.dme @@ -4,13 +4,3 @@ #include "_storge_icons.dm" #endif -// BEGIN_INTERNALS -// END_INTERNALS -// BEGIN_FILE_DIR -#define FILE_DIR . -// END_FILE_DIR -// BEGIN_PREFERENCES -// END_PREFERENCES -// BEGIN_INCLUDE -#include "_storge_icons.dm" -// END_INCLUDE