Skip to content

Commit

Permalink
Декор и сладости к Масленице (#13839)
Browse files Browse the repository at this point in the history
* Первая фаза

* Обновил кодировку

* инворлд шапки

* Добавлены инворлд иконки для связки бубликов
  • Loading branch information
DarthSidiousPalpatine authored Mar 1, 2025
1 parent 5f8000a commit bb627c0
Show file tree
Hide file tree
Showing 11 changed files with 88 additions and 0 deletions.
49 changes: 49 additions & 0 deletions code/modules/holidays/maslenitsa/clothing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/obj/item/clothing/neck/bundle_of_bubliks
name = "bundle of bubliks"
desc = "Бублики на верёвке."
icon_state = "baranki_7"
item_state = "baranki_7"
item_state_world = "baranki_world"

var/bubliksAmount = 7

item_action_types = list(/datum/action/item_action/hands_free/pickBublik)

/obj/item/clothing/neck/bundle_of_bubliks/update_world_icon()
update_icon()

/obj/item/clothing/neck/bundle_of_bubliks/update_icon()
if((flags_2 & IN_INVENTORY || flags_2 & IN_STORAGE))
icon_state = "baranki_[bubliksAmount]"
else
icon_state = "baranki_[bubliksAmount]_world"

item_state = "baranki_[bubliksAmount]"

/datum/action/item_action/hands_free/pickBublik
name = "Pick a Bublik"

/datum/action/item_action/hands_free/pickBublik/Activate()
var/obj/item/clothing/neck/bundle_of_bubliks/Bundle = target
var/mob/user = usr

var/obj/item/weapon/reagent_containers/food/snacks/bublik/Bublik = new(Bundle)

if(ishuman(user))
user.put_in_hands(Bublik)
else
Bublik.forceMove(get_turf(Bundle))

Bundle.bubliksAmount--
if(!Bundle.bubliksAmount)
qdel(Bundle)

Bundle.update_icon()

/obj/item/clothing/head/jesterhat
name = "Jester's hat"
desc = "Да, я с виду шут, но в душе король!"
icon_state = "jester"
item_state_world = "jester_world"
flags = HEADCOVERSEYES | BLOCKHAIR
body_parts_covered = HEAD
7 changes: 7 additions & 0 deletions code/modules/holidays/maslenitsa/decorations.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Tinsels
/obj/item/decoration/tinsel/maslenitsa
desc = "Ярмарка в самом разгаре!"
icon = 'icons/holidays/maslenitsa/tinsel.dmi'
icon_state = "1"
variations = 4
random = TRUE
29 changes: 29 additions & 0 deletions code/modules/holidays/maslenitsa/food.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/obj/item/weapon/reagent_containers/food/snacks/candycock
name = "candy cock"
desc = "Леденец в форме петуха."
icon = 'icons/holidays/maslenitsa/food.dmi'
icon_state = "candycock"
item_state_world = "candycock_world"
filling_color = "#fa4800"
bitesize = 2
list_reagents = list("sugar" = 10)

/obj/item/weapon/reagent_containers/food/snacks/pancake
name = "pancake"
desc = "Не путать с блинами!"
icon = 'icons/holidays/maslenitsa/food.dmi'
icon_state = "oladushek"
item_state_world = "oladushek_world"
filling_color = "#fabc60"
bitesize = 2
list_reagents = list("nutriment" = 4)

/obj/item/weapon/reagent_containers/food/snacks/bublik
name = "bublik"
desc = "Дырка продаётся отдельно!"
icon = 'icons/holidays/maslenitsa/food.dmi'
icon_state = "bublik"
item_state_world = "bublik_world"
filling_color = "#fabc60"
bitesize = 2
list_reagents = list("nutriment" = 3)
Binary file added icons/holidays/maslenitsa/food.dmi
Binary file not shown.
Binary file added icons/holidays/maslenitsa/tinsel.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/neck.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/obj/food.dmi
Binary file not shown.
3 changes: 3 additions & 0 deletions taucetistation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1750,6 +1750,9 @@
#include "code\modules\holiday\months\october.dm"
#include "code\modules\holiday\months\september.dm"
#include "code\modules\holidays\halloween\decorations.dm"
#include "code\modules\holidays\maslenitsa\clothing.dm"
#include "code\modules\holidays\maslenitsa\decorations.dm"
#include "code\modules\holidays\maslenitsa\food.dm"
#include "code\modules\holidays\new_year\clothing.dm"
#include "code\modules\holidays\new_year\decorations.dm"
#include "code\modules\holidays\new_year\food.dm"
Expand Down

0 comments on commit bb627c0

Please sign in to comment.