From 24f18d413163549c79cb5f94c214532686eb5ac6 Mon Sep 17 00:00:00 2001 From: delingar Date: Wed, 11 Oct 2023 13:14:44 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=85=D0=B5=D0=BB=D0=BB=D0=BE=D1=83=D0=B8=D0=BD=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D0=B4=D0=B5=D0=BA=D0=BE=D1=80=20=D1=81=20?= =?UTF-8?q?220.=20=D0=9F=D0=B0=D0=BF=D1=8C=D0=B5-=D0=BC=D0=B0=D1=88=D0=B5?= =?UTF-8?q?=20=D0=B8=20=D0=BC=D0=B8=D1=88=D1=83=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../halloween-decor/halloween-craft.dm | 55 ++++++++++++++++++ .../halloween-decor/halloween-decor.dm | 46 +++++++++++++++ .../halloween-decor/halloween-decor.dmi | Bin 0 -> 1856 bytes tgstation.dme | 2 + 4 files changed, 103 insertions(+) create mode 100644 tff_modular/modules/halloween-decor/halloween-craft.dm create mode 100644 tff_modular/modules/halloween-decor/halloween-decor.dm create mode 100644 tff_modular/modules/halloween-decor/halloween-decor.dmi diff --git a/tff_modular/modules/halloween-decor/halloween-craft.dm b/tff_modular/modules/halloween-decor/halloween-craft.dm new file mode 100644 index 00000000000..ae745755aa9 --- /dev/null +++ b/tff_modular/modules/halloween-decor/halloween-craft.dm @@ -0,0 +1,55 @@ +/datum/crafting_recipe/papier_pumpkin + name = "Pumpkin Papier Mache" + result = /obj/item/decoration/halloween/pumpkin + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange) + reqs = list(/obj/item/paper = 3, /obj/item/stack/sticky_tape = 2) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/papier_cauldron + name = "Cauldron Papier Mache" + result = /obj/item/decoration/halloween/cauldron + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 4, /obj/item/stack/sticky_tape = 4) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/papier_skeleton + name = "Skeleton Papier Mache" + result = /obj/item/decoration/halloween/skeleton + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 2, /obj/item/stack/sticky_tape = 2) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/papier_skull + name = "Skull Papier Mache" + result = /obj/item/decoration/halloween/skull + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 3, /obj/item/stack/sticky_tape = 3) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/papier_ghost + name = "Ghost Papier Mache" + result = /obj/item/decoration/halloween/ghost + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 2, /obj/item/stack/sticky_tape = 1) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/papier_spider + name = "Cauldron Papier Mache" + result = /obj/item/decoration/halloween/spider + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 5, /obj/item/stack/sticky_tape = 5) + category = CAT_ENTERTAINMENT + +/datum/crafting_recipe/tinsel_halloween + name = "Halloween Tinsel" + result = /obj/item/decoration/tinsel/halloween + time = 6 SECONDS + tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange, /obj/item/toy/crayon/black) + reqs = list(/obj/item/paper = 5, /obj/item/stack/cable_coil = 3) + category = CAT_ENTERTAINMENT diff --git a/tff_modular/modules/halloween-decor/halloween-decor.dm b/tff_modular/modules/halloween-decor/halloween-decor.dm new file mode 100644 index 00000000000..8afa244d31b --- /dev/null +++ b/tff_modular/modules/halloween-decor/halloween-decor.dm @@ -0,0 +1,46 @@ +// Предмет - инициализатор категории. Не должен появится на сервере. Если вдруг появился, пишите в лс delingar +/obj/item/decoration/ + name = "papier mache" + desc = "OOPS! Something went wrong. Report to delingar in Discord." + icon = 'tff_modular\modules\halloween-decor\halloween-decor.dmi' + icon_state = "debug" + inhand_icon_state = null + throwforce = 0 + throw_speed = 3 + throw_range = 2 + force = 0 + +/obj/item/decoration/halloween/pumpkin + name = "Paper Pumpkin" + desc = "Orange papier mache, looks like pumpkin. Happy Halloween!" + icon_state = "pumpkin" + +/obj/item/decoration/halloween/cauldron + name = "Paper Cauldron" + desc = "Black papier mache, looks like witch's cauldron. Not real cauldron. Happy Halloween!" + icon_state = "cauldron" + +/obj/item/decoration/halloween/skeleton + name = "Paper Skeleton" + desc = "White papier mache, that looks like small skeleton. There's no real bones, hungry vulp. Happy Halloween!" + icon_state = "skeleton" + +/obj/item/decoration/halloween/skull + name = "Paper Skull" + desc = "White-black papier mache, that looks like skull. Don't worry, it's not real. Happy Halloween!" + icon_state = "skull" + +/obj/item/decoration/halloween/ghost + name = "Paper Ghost" + desc = "White-black papier mache, looks like ghost. Hide your holy water, chaplain, it's not real! Happy Halloween!" + icon_state = "ghost" + +/obj/item/decoration/halloween/spider + name = "Paper Spider" + desc = "Black papier mache, that looks like small spider. It's not real, don't try to get spider's skills! Happy Halloween!" + icon_state = "spider" + +/obj/item/decoration/tinsel/halloween + name = "Halloween Tinsel" + desc = "Black-orange tinsel to make your party more spooky. Happy Halloween!" + icon_state = "tinsel" diff --git a/tff_modular/modules/halloween-decor/halloween-decor.dmi b/tff_modular/modules/halloween-decor/halloween-decor.dmi new file mode 100644 index 0000000000000000000000000000000000000000..803763e321bbde8391212f980d1c26d9db7e5c42 GIT binary patch literal 1856 zcmV-G2fz4jIY0kq0PgPY-dO-7C@d{4Gan!(rKz^T!^c@7 z0CX(?Ej2oV004pl09F71U=9oa|NovpKW7&bg)=N`9TtfY3y~fcju{ed9~hG%7^wmP z!U+e74hxqB1)UQRp&S;D7ZQ;j7OoHrvmO@69~iM25~U;^#TOAWS@TQ)0004WQchC< zK<3zH00023dQ@0+L}hbha%pgMX>V=-0C=2@k;@9gFc3x8$ybDSD@AL!Zp0#8*nfy- zY=))}G84tWH(GEd#>K$Bhr``WuJ-k@Y1QG>$QyXVX;eE^6>BN(XxPTGEv2x4o#mwv zYlaxJISg};V2WR}078yqZm(-{S2mHq#^}(g*Iy(`kw`Mfp zlbV5Z=)PN3q~P@9g^P0a<7BSt_VE766Wzpd>9^dg1ONa9qDe$SRA_d zsSAc+3C!&JC25kb#C9?-{r;bBcP9ZtNFXO&n*PQEksM*^`Exo17+}(*Ngqsq3?9Au zgqr=A{+~Y&5zIc#P;ViKqG;%FtmHjDXY1MAYEBaO*ORp8e|>%JCy3)L<;{mMn=fz< zt`_rd2vU*st*|+fsofmq*SQZMj?=8!oCvddBaYP1SpqioFO#Ur3+xbSS+qkSeaRXQQY|2z!v+>z@(85&@_xvp&I`?Egd&f=Q6bxRmH$QZ6JCrz4X>#Ii)H z?hsLdS3%)S0!n}-6L6XK0cN$oB4}qJ!IPIDOLEO9AqAd=lqDb(9xznkRe&3~W}(D5 zrZFV|^2Zd_G86zX06c`GpkqSH3?sq^x>rHODL_f!h(Q^nr@6;Y06hgA03>EVj6#gg zQk1gPVBM>LY%v1h1b~<)U;mYeV1HqzQ&6X&5doa?Iu=c#&MM2S2tW~0{M~bq#Y?3U z!_k`oz6KVJe=zW~_0E zb|2JDfc>6!4X|-qpgR_q14!ENrT9ir2&93~04R3?*t-Fg!`63-MU<#1z|sdGZgw}q z22e(O6F^b)0k$;1Th}CSw*(+~euRi}YUmM2%0a>J#Ks(GfLpk&cl^5rCg}l?y)y}- zE#%uM;=@=WK=0vJ$G|#&3ia2oEx?@t!0k3c!l&5_ae=1l^mUrLW4^H+u~LU4Z_DkVp6e@AN0Q*5CCN@&}oy$_oGnfa6Ncc_nuLk`*-skt+b~D)AbY z(9J@<`sw^Pu7ZsVz#jo9qEDq05(p50p(Go7z%fmvV{H9ATPxm<3_*$dMUo_kst`bA$s=MbQqeu;iUitJ}*T0 zwBXAUAHcc^Lic%KeIWq5=IzJ#26(O1Bbf`}%liNT`?vw##edSINgrQ-kyNEW*QGlC zoun%Lxh}){e|&)Y2ZYtCf{KJCwNNAJk;K&j4kRq8g&ITp2Lq_Cb=e0{)^*tj@bwP> z;EMX`okjoyfGhIVI}v~ZFx>yu0M!V{DYnB z0Zyu&0nQrW<>mbHVgQ^2`Ue11RXf0wF#xyoveN>*7yyV6&_4hGs*@f7tN|(pfWuJ( zKo@{7gt7h?0)R09H~_!^00%(7e-J>WlL)$5+yESEfbM1301WjX72m|*&UG2_YRWf3 zIJ5QH0(cDQ9|&-7lwkme4uHS^IKZl1!*tkAdL`pk7MEi5!qQlXXn9tR Date: Wed, 11 Oct 2023 13:51:54 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=85=D0=B5=D0=BB=D0=BB=D0=BE=D1=83=D0=B8=D0=BD=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D0=B4=D0=B5=D0=BA=D0=BE=D1=80=20=D1=81=20?= =?UTF-8?q?220.=20=D0=9F=D0=B0=D0=BF=D1=8C=D0=B5-=D0=BC=D0=B0=D1=88=D0=B5?= =?UTF-8?q?=20=D0=B8=20=D0=BC=D0=B8=D1=88=D1=83=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/halloween-decor/halloween-craft.dm | 14 +++++++------- .../modules/halloween-decor/halloween-decor.dm | 2 +- tgstation.dme | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tff_modular/modules/halloween-decor/halloween-craft.dm b/tff_modular/modules/halloween-decor/halloween-craft.dm index ae745755aa9..0d53fe6a462 100644 --- a/tff_modular/modules/halloween-decor/halloween-craft.dm +++ b/tff_modular/modules/halloween-decor/halloween-craft.dm @@ -2,7 +2,7 @@ name = "Pumpkin Papier Mache" result = /obj/item/decoration/halloween/pumpkin time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 3, /obj/item/stack/sticky_tape = 2) category = CAT_ENTERTAINMENT @@ -10,7 +10,7 @@ name = "Cauldron Papier Mache" result = /obj/item/decoration/halloween/cauldron time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 4, /obj/item/stack/sticky_tape = 4) category = CAT_ENTERTAINMENT @@ -18,7 +18,7 @@ name = "Skeleton Papier Mache" result = /obj/item/decoration/halloween/skeleton time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 2, /obj/item/stack/sticky_tape = 2) category = CAT_ENTERTAINMENT @@ -26,7 +26,7 @@ name = "Skull Papier Mache" result = /obj/item/decoration/halloween/skull time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 3, /obj/item/stack/sticky_tape = 3) category = CAT_ENTERTAINMENT @@ -34,7 +34,7 @@ name = "Ghost Papier Mache" result = /obj/item/decoration/halloween/ghost time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 2, /obj/item/stack/sticky_tape = 1) category = CAT_ENTERTAINMENT @@ -42,7 +42,7 @@ name = "Cauldron Papier Mache" result = /obj/item/decoration/halloween/spider time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 5, /obj/item/stack/sticky_tape = 5) category = CAT_ENTERTAINMENT @@ -50,6 +50,6 @@ name = "Halloween Tinsel" result = /obj/item/decoration/tinsel/halloween time = 6 SECONDS - tool_behaviors = list(TOOL_WIRECUTTER, /obj/item/toy/crayon/orange, /obj/item/toy/crayon/black) + tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/paper = 5, /obj/item/stack/cable_coil = 3) category = CAT_ENTERTAINMENT diff --git a/tff_modular/modules/halloween-decor/halloween-decor.dm b/tff_modular/modules/halloween-decor/halloween-decor.dm index 8afa244d31b..338f5f44af1 100644 --- a/tff_modular/modules/halloween-decor/halloween-decor.dm +++ b/tff_modular/modules/halloween-decor/halloween-decor.dm @@ -2,7 +2,7 @@ /obj/item/decoration/ name = "papier mache" desc = "OOPS! Something went wrong. Report to delingar in Discord." - icon = 'tff_modular\modules\halloween-decor\halloween-decor.dmi' + icon = 'tff_modular/modules/halloween-decor/halloween-decor.dmi' icon_state = "debug" inhand_icon_state = null throwforce = 0 diff --git a/tgstation.dme b/tgstation.dme index fa6162c0018..4e3e1e6bfb6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7774,7 +7774,7 @@ #include "tff_modular\modules\emotes\code\laugh_datums.dm" #include "tff_modular\modules\emotes\code\scream_datums.dm" #include "tff_modular\modules\hair\code\hair.dm" -#include "tff_moudlar\modules\halloween-decor\halloween-decor.dm" +#include "tff_modular\modules\halloween-decor\halloween-decor.dm" #include "tff_modular\modules\halloween-decor\halloween-craft.dm" #include "tff_modular\modules\mcr_nerf_revert\code\mcr_override.dm" #include "tff_modular\modules\modular_automapper\automapper.dm" From a6e5a04150595b3d044cc76f0b6248c6ff36483d Mon Sep 17 00:00:00 2001 From: delingar Date: Wed, 11 Oct 2023 14:10:33 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9E=D1=87=D0=B5=D0=BF=D1=8F=D1=82=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tff_modular/modules/halloween-decor/halloween-craft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/modules/halloween-decor/halloween-craft.dm b/tff_modular/modules/halloween-decor/halloween-craft.dm index 0d53fe6a462..75f3abb3357 100644 --- a/tff_modular/modules/halloween-decor/halloween-craft.dm +++ b/tff_modular/modules/halloween-decor/halloween-craft.dm @@ -39,7 +39,7 @@ category = CAT_ENTERTAINMENT /datum/crafting_recipe/papier_spider - name = "Cauldron Papier Mache" + name = "Spider Papier Mache" result = /obj/item/decoration/halloween/spider time = 6 SECONDS tool_behaviors = list(TOOL_WIRECUTTER) From 8d755b3e7f1a4bffcca2a09c76a31bca8bbec9c4 Mon Sep 17 00:00:00 2001 From: Yaroslav Nurkov <78199449+AnywayFarus@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:43:52 +0300 Subject: [PATCH 4/4] Update tgstation.dme --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 4e3e1e6bfb6..006c2049ec3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7774,8 +7774,8 @@ #include "tff_modular\modules\emotes\code\laugh_datums.dm" #include "tff_modular\modules\emotes\code\scream_datums.dm" #include "tff_modular\modules\hair\code\hair.dm" -#include "tff_modular\modules\halloween-decor\halloween-decor.dm" #include "tff_modular\modules\halloween-decor\halloween-craft.dm" +#include "tff_modular\modules\halloween-decor\halloween-decor.dm" #include "tff_modular\modules\mcr_nerf_revert\code\mcr_override.dm" #include "tff_modular\modules\modular_automapper\automapper.dm" #include "tff_modular\modules\nabbers\code\_nabbers.dm"