-
-
Notifications
You must be signed in to change notification settings - Fork 423
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Декор и сладости к Масленице (#13839)
* Первая фаза * Обновил кодировку * инворлд шапки * Добавлены инворлд иконки для связки бубликов
- Loading branch information
1 parent
5f8000a
commit bb627c0
Showing
11 changed files
with
88 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters