Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Хеллоуинские декорации #109

Merged
merged 4 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions tff_modular/modules/halloween-decor/halloween-craft.dm
Original file line number Diff line number Diff line change
@@ -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)
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)
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)
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)
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)
reqs = list(/obj/item/paper = 2, /obj/item/stack/sticky_tape = 1)
category = CAT_ENTERTAINMENT

/datum/crafting_recipe/papier_spider
name = "Spider Papier Mache"
result = /obj/item/decoration/halloween/spider
time = 6 SECONDS
tool_behaviors = list(TOOL_WIRECUTTER)
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)
reqs = list(/obj/item/paper = 5, /obj/item/stack/cable_coil = 3)
category = CAT_ENTERTAINMENT
46 changes: 46 additions & 0 deletions tff_modular/modules/halloween-decor/halloween-decor.dm
Original file line number Diff line number Diff line change
@@ -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"
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7774,6 +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-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"
Expand Down