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

Edit: heater into the ration packs #602

Merged
merged 2 commits into from
May 28, 2024
Merged

Edit: heater into the ration packs #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf79a16
Хитер теперь можно положить обратно
MrCat15352 May 28, 2024
9a2a7da
Merge branch 'CeladonSS13:beta-dev' into irp-qol
MrCat15352 May 28, 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
5 changes: 4 additions & 1 deletion code/game/objects/items/storage/ration.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 7
STR.set_holdable(list(/obj/item/reagent_containers/food))
// [CELADON-EDIT] - CELADON_QOL
// STR.set_holdable(list(/obj/item/reagent_containers/food)) // CELADON-EDIT - ORIGINAL
STR.set_holdable(list(/obj/item/reagent_containers/food, /obj/item/ration_heater))
// [/CELADON-EDIT]
STR.locked = TRUE
STR.locked_flavor = "sealed closed"

Expand Down
3 changes: 2 additions & 1 deletion mod_celadon/qol/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ ID мода: CELADON_QOL
- EDIT `code\modules\client\preferences.dm`: `var/datum/loadout_category/LC = GLOB.loadout_categories[gear_tab]` - меняем лодаут

- ADD `html\browser\common.css` -> да-да, ксс файлик шатаем. Добавляем классы на обработку картиночек лодаута
- EDIT `code\game\objects\items\storage\ration.dm` - делаем так чтобы можно хитер положить обратно
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Expand Down Expand Up @@ -117,7 +118,7 @@ ID мода: CELADON_QOL

### Авторы:

RalseiDreemuurr
RalseiDreemuurr, MrCat15352
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
Expand Down
4 changes: 2 additions & 2 deletions mod_celadon/qol/_qol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/modpack/QoL
name = "Quality of Life"
desc = "Добавляет хотфикс кнопок, новую прическу, возвращает мензорские очки. Добавлены баблы для эмоций."
author = "RalseiDreemuurr"
desc = "Добавляет хотфикс кнопок, новую прическу, возвращает мензорские очки. Добавлены баблы для эмоций. Уменьшаем размер разогревочному пакету."
author = "RalseiDreemuurr, MrCat15352"

1 change: 1 addition & 0 deletions mod_celadon/qol/_qol.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
#include "code/hotkeyfix.dm"
#include "code/hair.dm"
#include "code/glasses.dm"
#include "code/food_and_drinks.dm"

#endif
3 changes: 3 additions & 0 deletions mod_celadon/qol/code/food_and_drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Меняем разогревочной штуке размер с большого на маленький. Долой раскиданые хитеры по судну!
/obj/item/ration_heater
w_class = WEIGHT_CLASS_SMALL
Loading