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

Add: Новые предметы группы Саундхэнд и барабаны. #890

Merged
merged 5 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
60 changes: 60 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,63 @@
name = "капюшон Вай"
icon_state = "vi_arcane"
item_state = "vi_arcane"

/obj/item/clothing/suit/soundhand_black_jacket
name = "черная куртка группы Саундхэнд."
desc = "Легендарная черная куртка группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_black_jacket"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_black_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/soundhand_black_jacket/soundhand_black_jacket_tag
name = "черная куртка с тэгом группы Саундхэнд."
desc = "Легендарная черная куртка с тэгом группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_black_jacket_teg"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_black_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/soundhand_olive_jacket
name = "оливковая куртка группы Саундхэнд."
desc = "Легендарная оливковая куртка группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_olive_jacket"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_olive_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/soundhand_olive_jacket/soundhand_olive_jacket_tag
name = "оливковая куртка с тэгом группы Саундхэнд."
desc = "Легендарная оливковая куртка с тэгом группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_olive_jacket_teg"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_olive_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/soundhand_brown_jacket
name = "коричневая куртка группы Саундхэнд."
desc = "Легендарная коричневая куртка группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_brown_jacket"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_brown_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/soundhand_brown_jacket/soundhand_brown_jacket_tag
name = "коричневая куртка с тэгом группы Саундхэнд."
desc = "Легендарная коричневая куртка с тэгом группы Саундхэнд."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "soundhand_brown_jacket_teg"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
item_state = "soundhand_brown_jacket"
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'
Binary file modified modular_ss220/clothing/icons/inhands/left_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/inhands/right_hand.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
25 changes: 25 additions & 0 deletions modular_ss220/food/code/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,28 @@
required_reagents = list("sambuka" = 3, "triple_citrus" = 1, "irishcream" = 1)
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/reagent/consumable/ethanol/soundhand
name = "soundhand"
id = "soundhand"
description = "Коктейль из нескольких алкогольных напитков с запахом ягод и легким слоем перца на стакане."
color = "#C18A7B"
alcohol_perc = 0.5
drink_icon = "soundhand"
drinking_glass_icon = 'modular_ss220/food/icons/drinks.dmi'
drink_name = "Саундхэнд"
drink_desc = "Коктейль из нескольких алкогольных напитков с запахом ягод и легким слоем перца на стакане."
taste_description = "дребезжащие в ритме металлические струны."

/datum/reagent/consumable/ethanol/soundhand/on_mob_life(mob/living/M)
. = ..()
if(prob(10))
M.emote("airguitar")
Kar4es marked this conversation as resolved.
Show resolved Hide resolved

/datum/chemical_reaction/soundhand
name = "Soundhand"
id = "soundhand"
result = "soundhand"
required_reagents = list("vodka" = 2, "whiskey" = 1, "berryjuice" = 1, "blackpepper" = 1)
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
Binary file modified modular_ss220/food/icons/drinks.dmi
Binary file not shown.
44 changes: 44 additions & 0 deletions modular_ss220/jukebox/code/jukebox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -543,3 +543,47 @@
for(var/mob/living/M in rangers)
if(prob(5+(allowed(M)*4)) && (M.mobility_flags & MOBILITY_MOVE))
dance(M)

//Drum
Kar4es marked this conversation as resolved.
Show resolved Hide resolved
/obj/machinery/jukebox/drum_red
name = "\improper красный барабан"
desc = "Крутые барабаны от какой-то группы."
icon = 'modular_ss220/jukebox/icons/jukebox.dmi'
icon_state = "drum_red"

/obj/machinery/jukebox/drum_red/update_icon_state()
if(stat & BROKEN)
icon_state = "[initial(icon_state)]_broken"
return
icon_state = "[initial(icon_state)]"

if(active)
icon_state = "[initial(icon_state)]-active"
else if(anchored)
icon_state = "[initial(icon_state)]_anchored"

/obj/machinery/jukebox/drum_red/attackby(obj/item/O, mob/user, params)
if(active || (resistance_flags & INDESTRUCTIBLE))
return

if(!iswrench(O))
return ..()

if(!anchored && !isinspace())
to_chat(user, span_notice("You secure [src] to the floor."))
anchored = TRUE
update_icon()
else if(anchored)
to_chat(user, span_notice("You unsecure and disconnect [src]."))
anchored = FALSE
update_icon()
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
Kar4es marked this conversation as resolved.
Show resolved Hide resolved

/obj/machinery/jukebox/drum_red/drum_yellow
name = "\improper желтый барабан"
icon_state = "drum_yello"

/obj/machinery/jukebox/drum_red/drum_blue
name = "\improper синий барабан"
icon_state = "drum_blue"

Binary file modified modular_ss220/jukebox/icons/jukebox.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions modular_ss220/objects/_objects.dme
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
#include "code/weapons.dm"
#include "code/key.dm"
#include "code/musician.dm"
#include "code/flag.dm"
7 changes: 7 additions & 0 deletions modular_ss220/objects/code/flag.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/obj/item/flag/soundhand
name = "флаг группы Саундхэнд"
desc = "Флаг легендарной группы Саундхэнд. Вероятно были созданы исключительно для сжигания и эффекта восхищения от крутости."
icon = 'modular_ss220/objects/icons/flag.dmi'
icon_state = "flag_group"
lefthand_file = 'modular_ss220/objects/icons/inhands/flags_lefthand.dmi'
righthand_file = 'modular_ss220/objects/icons/inhands/flags_righthand.dmi'
Binary file added modular_ss220/objects/icons/flag.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading