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

10-09 merge fixes #98

Merged
merged 2 commits into from
Sep 16, 2023
Merged

10-09 merge fixes #98

merged 2 commits into from
Sep 16, 2023

Conversation

Iajret
Copy link
Collaborator

@Iajret Iajret commented Sep 11, 2023

О Pull Request

Два фикса наших модулей после последнего обновления:

  • Обновил джурню и кило
  • Изменил размер текстурок ГБСов до 32 на 32, чтобы они не скейлились и не ломались

Как это может улучшит/повлиять на игровой процесс/ролевую игру

Ну набберы красивее станут там, я хз.

Доказательства тестирования

галочка в тестах

Changelog

Не имеет значения

@AnywayFarus
Copy link
Contributor

looks nice to me

@AnywayFarus AnywayFarus merged commit 832b06a into Fluffy-Frontier:master Sep 16, 2023
2 checks passed
Iajret pushed a commit that referenced this pull request Jan 10, 2024
…ntent, hear ye guncargo naysayers and weep (#98)

* this is just like thumper from half life 2

* clothing stuff

* and then she tested code all over the place

* fixes everything

* makes the thumper take longer

* but not too much longer

* right i didnt actually do that part

* some desc stuff

* makes the gps beacon small

* Update modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/company_imports/code/armament_datums/kahraman_industries.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/kahraman_equipment/code/clothing/clothing.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/kahraman_equipment/code/clothing/clothing.dm

Co-authored-by: Bloop <[email protected]>

* fixes bolding

* fixes the ore thumper proximity check

* fixes the desc to better reflect how the thumper works

* fixes it on recent master

* Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/kahraman_equipment/code/ore_thumper.dm

Co-authored-by: Bloop <[email protected]>

* gives the protective mod digisprites

* slightly increases the amount of plants that the mat printer can hold

* makes the thumper's power needs more apparent

---------

Co-authored-by: Bloop <[email protected]>
Iajret pushed a commit that referenced this pull request Jan 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants