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

Новый декор. #12655

Closed
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
625d2c9
Осталось сделать вазочку.
DarthSidiousPalpatine Dec 30, 2023
e41fd4a
Готовченко
DarthSidiousPalpatine Dec 30, 2023
c8aeb09
Update stickers.dm
DarthSidiousPalpatine Dec 30, 2023
daff75c
Merge branch 'master' into новый-декор
volas Dec 31, 2023
74ce0f2
Готово
DarthSidiousPalpatine Dec 31, 2023
a4c5a1f
Merge branch 'новый-декор' of https://github.com/DarthSidiousPalpatin…
DarthSidiousPalpatine Dec 31, 2023
3a5c93e
a
DarthSidiousPalpatine Dec 31, 2023
d715015
Update decorations.dm
DarthSidiousPalpatine Dec 31, 2023
4cdbf6f
Update boxstation.dmm
DarthSidiousPalpatine Jan 1, 2024
ec913a0
обновил календарь
DarthSidiousPalpatine Jan 1, 2024
9f75967
a
DarthSidiousPalpatine Jan 1, 2024
b3cd2e3
Update contraband.dmi
DarthSidiousPalpatine Jan 1, 2024
16c3a31
ф
DarthSidiousPalpatine Jan 2, 2024
8027e13
ф
DarthSidiousPalpatine Jan 2, 2024
21e12e7
ф
DarthSidiousPalpatine Jan 2, 2024
bf9049a
ф
DarthSidiousPalpatine Jan 6, 2024
e13e5b3
Update stickers.dm
DarthSidiousPalpatine Jan 6, 2024
d27ac03
обновил
DarthSidiousPalpatine Jan 7, 2024
e2e5010
Мне кажется, стало лучше.
DarthSidiousPalpatine Jan 8, 2024
84b1495
ф
DarthSidiousPalpatine Jan 8, 2024
c7f5a4b
Update lib_items.dm
DarthSidiousPalpatine Jan 8, 2024
9cb11c0
добавил глобус, пофиксил фиксы.
DarthSidiousPalpatine Jan 9, 2024
830dcd1
Update kitchen.dmi
DarthSidiousPalpatine Jan 16, 2024
1bd7831
Merge remote-tracking branch 'upstream/master' into новый-декор
DarthSidiousPalpatine Jan 17, 2024
eaef6a7
а
DarthSidiousPalpatine Jan 17, 2024
9fe853f
Вырезал
DarthSidiousPalpatine Jan 17, 2024
a171abf
aa
DarthSidiousPalpatine Jan 17, 2024
75ed40a
Update taucetistation.dme
DarthSidiousPalpatine Jan 17, 2024
f5562ea
Merge branch 'master' into новый-декор
DarthSidiousPalpatine Jan 17, 2024
0fbed22
ф
DarthSidiousPalpatine Jan 18, 2024
5c3f56c
а
DarthSidiousPalpatine Jan 19, 2024
22892e8
Готово
DarthSidiousPalpatine Jan 19, 2024
f6cc7c3
Update items.dmi
DarthSidiousPalpatine Jan 19, 2024
9631271
Update items.dmi
DarthSidiousPalpatine Jan 23, 2024
c1c9e6c
Update items.dmi
DarthSidiousPalpatine Jan 29, 2024
6d17a89
Update items.dmi
DarthSidiousPalpatine Jan 29, 2024
87f7fb2
Update lib_items.dm
DarthSidiousPalpatine Jan 29, 2024
f34c6e4
Update items.dmi
DarthSidiousPalpatine Jan 29, 2024
e72b57f
a
DarthSidiousPalpatine Jan 30, 2024
87978cd
ф
DarthSidiousPalpatine Jan 30, 2024
074492f
a
DarthSidiousPalpatine Jan 30, 2024
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
24 changes: 24 additions & 0 deletions code/game/machinery/kitchen/kitchen_machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@

/obj/machinery/kitchen_machine/microwave
name = "microwave"
cases = list("микроволновка", "микроволновки", "микроволновке", "микроволновку", "микроволновкой", "микроволновке")
desc = "A microwave, perfect for reheating things with radiation."
icon = 'icons/obj/kitchen.dmi'
icon_state = "mw"
Expand All @@ -467,6 +468,29 @@
component_parts += new /obj/item/stack/cable_coil/red(null, 2)
RefreshParts()

/obj/machinery/kitchen_machine/microwave/einstein_electronics
desc = "Микроволновка фирмы Einstein Electronics."
icon_state = "microwave_grey"

glow_icon_state = "microwave"

/obj/machinery/kitchen_machine/microwave/einstein_electronics/atom_init()
. = ..()
icon_state = "microwave_[pick(list("red", "grey", "black", "white"))]"
off_icon = icon_state
on_icon = icon_state
broken_icon = "[icon_state]_br"
dirty_icon = "[icon_state]_di"
open_icon = "[icon_state]_o"

/obj/machinery/kitchen_machine/microwave/einstein_electronics/start()
. = ..()
set_light(2, 0.5, "#ffaa66")

/obj/machinery/kitchen_machine/microwave/einstein_electronics/abort()
. = ..()
set_light(0,0)

/obj/machinery/kitchen_machine/oven
name = "oven"
desc = "Cookies are ready, dear."
Expand Down
20 changes: 19 additions & 1 deletion code/game/objects/effects/decals/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,27 @@
random_basetype = /obj/structure/sign/poster

/obj/structure/sign/poster/calendar
name = "2223 calendar"
name = "2224 calendar"
DarthSidiousPalpatine marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "calendar"
desc = "Календарь на 2224-й год."

/obj/structure/sign/poster/calendar/examine(mob/user)
. = ..()
to_chat(user, "<span class='notice'>Сегодня: [global.current_date_string]</span>")

/obj/structure/sign/poster/calendar_old
name = "2223 calendar"
icon_state = "calendar_old"
desc = "Календарь на 2223-й год."
var/old_date

/obj/structure/sign/poster/calendar_old/atom_init()
. = ..()
old_date = "[rand(1,31)].[rand(1,12)].2223"

/obj/structure/sign/poster/calendar_old/examine(mob/user)
. = ..()
to_chat(user, "<span class='notice'>Сегодня: [old_date]</span>")

/obj/structure/sign/poster/sivtsev
name = "sivtsev table"
Expand Down
Loading
Loading