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.

Sign up for GitHub

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: cool drip ebeishii to everyone #6431

Open
wants to merge 3 commits into
base: master220
Choose a base branch
from
+33 −2
Open

add: cool drip ebeishii to everyone #6431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0006fa6
dddedededededede
Etrnlmelancholy Jan 24, 2025
291707f
soviet onion
Etrnlmelancholy Jan 24, 2025
b516020
Apply suggestions from code review
PlayerUnknown14 Jan 25, 2025
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
2 changes: 1 addition & 1 deletion code/game/machinery/vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@
"НЕТ, ПОЖАЛУЙСТА, ВИЛЛИ, НЕ ДЕЛАЙ МНЕ БОЛЬНО-*БЗЗЗЗ*"
)

products = list(/obj/item/clothing/shoes/black = 10,/obj/item/clothing/shoes/brown = 10,/obj/item/clothing/shoes/blue = 10,/obj/item/clothing/shoes/green = 10,/obj/item/clothing/shoes/yellow = 10,/obj/item/clothing/shoes/purple = 10,/obj/item/clothing/shoes/red = 10,/obj/item/clothing/shoes/white = 10,/obj/item/clothing/shoes/sandal=10)
products = list(/obj/item/clothing/shoes/black = 10,/obj/item/clothing/shoes/brown = 10,/obj/item/clothing/shoes/blue = 10,/obj/item/clothing/shoes/green = 10,/obj/item/clothing/shoes/yellow = 10,/obj/item/clothing/shoes/purple = 10,/obj/item/clothing/shoes/red = 10,/obj/item/clothing/shoes/white = 10,/obj/item/clothing/shoes/sandal=10,/obj/item/clothing/shoes/convers/red = 10,/obj/item/clothing/shoes/convers = 10)
contraband = list(/obj/item/clothing/shoes/orange = 5)
premium = list(/obj/item/clothing/shoes/rainbow = 1)
refill_canister = /obj/item/vending_refill/shoedispenser
Expand Down
4 changes: 3 additions & 1 deletion code/modules/client/preference/loadout/loadout_shoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@
..()
var/list/boots = list(/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/white)
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/convers,
/obj/item/clothing/shoes/convers/red)
gear_tweaks += new /datum/gear_tweak/path(boots, src, TRUE)

/datum/gear/shoes/jackcross
Expand Down
29 changes: 29 additions & 0 deletions code/modules/clothing/shoes/colour.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,32 @@

return ..()


/obj/item/clothing/shoes/convers
name = "black convers"
desc = "Пара высоких чёрных кроссовок сделанных по последнему писку моды. Выглядят просто отпадно."
PlayerUnknown14 marked this conversation as resolved.
Show resolved Hide resolved
ru_names = list(
NOMINATIVE = "чёрные высокие кеды",
GENITIVE = "чёрных высоких кедов",
DATIVE = "чёрным высоким кедам",
ACCUSATIVE = "чёрные высокие кеды",
INSTRUMENTAL = "чёрными высокими кедами",
PREPOSITIONAL = "чёрных высоких кедах"
)
icon_state = "blackconvers"
item_state = "blackconvers"

/obj/item/clothing/shoes/convers/red
name = "red convers"
Etrnlmelancholy marked this conversation as resolved.
Show resolved Hide resolved
desc = "Пара высоких красных кроссовок, сделанных по последнему писку моды. Выглядят просто отпадно."
PlayerUnknown14 marked this conversation as resolved.
Show resolved Hide resolved
ru_names = list(
NOMINATIVE = "красные высокие кеды",
GENITIVE = "красных высоких кедов",
DATIVE = "красным высоким кедам",
ACCUSATIVE = "красные высокие кеды",
INSTRUMENTAL = "красными высокими кедами",
PREPOSITIONAL = "красных высоких кедах"
)
icon_state = "redconvers"
item_state = "redconvers"

Binary file modified icons/mob/clothing/feet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/monkey/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/unathi/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/feet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
View file
Open in desktop
Binary file not shown.
Loading