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

Апстрим без хирургии 2 #285

Open
wants to merge 503 commits into
base: master
Choose a base branch
from

Conversation

FireNameFN
Copy link
Collaborator

Вырезана хирургия.
Мёржить на ваш страх и риск.

DieselMohawk and others added 30 commits February 2, 2025 20:04
* hypereutactic textures

* adds hypereutactic blade

* adjusts attack speed and damage

* adjust attack speed and adds movement modifier

* Adds structural damage

* Readjusts the attack rate to be 0.8

* Adds Hypereutactic blade to the upliink

* Adds use delay and structural damage, fixes disappearing wielded sprite

* Changes wideAngleAnimation to 180 and range to 2.5

* Adds copyright. Changes range to 2.0

* Required wield

* Changes reflect chance to 100%

* Comments for future todos

* Description update

* Removes duplicate mapping

* removes from uplink

* Reorder and remove indents
* Reimport of .yml files, edit to medidrobe.yml

* Fixed typo for "Richard" in AutoDrobe contrabandInventory

* contrabandInventory Revision

* Add a spare bible to PietyVend (#32363)

Update chapel.yml

* Bible to normal inventory, not contraband

* Balance changes based on maintainer feedback.

* VendoMat change to Proximity Sensor and Borg Arm.

* Revert "VendoMat change to Proximity Sensor and Borg Arm."

This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e.

* PR Rebase, Fixing Reversion

* seeds.yml Bungo Seeds swapped for Tobacco Seeds.

---------

Co-authored-by: Jarmer123 <[email protected]>
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes
* Stores owned by mind instead of body

* Requested changes, traitor uplink fixed

* Store, listings fixed and now use Entity<MindComponent>

* Removed duplicate code

* test change

* test change 2

* back to mind entityuid

* MilonPL requested minor changes

* ScarKy0 requested changes
* add binoculars

* tabs evil

* give one to warden

* buff
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH
Update emergency_plasma.yml

Co-authored-by: jbox1 <[email protected]>
fix oasis evac timer
* Observer personal pointlight

* Bigger light

* combine actions

---------

Co-authored-by: Winkarst <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
* HealingSystem: check blood restoration, staunching

* Milon's suggestions

* beck-thompson's requests
* Added da pills

* Revert "Added da pills"

This reverts commit 3d6b8fce3386107ac4c46543252fc31764a0c1c7.

* Updated to use existing weights, added larger chem variety

* Reweighed charcoal

* Rebalance of certain quantities

* Removed grey matter, weight balancing changes

* corrected comment

* adjusted balance for lead
* remove vector and assets

* reverts vector magazine removal; vector magazines renamed to SMG magazine (.45 magnum)

* remove vector from suspicion loot table

* vector migration set to null
desuwatch and others added 13 commits February 23, 2025 11:17
This reverts commit eef8edf, reversing
changes made to 5e06bc0.
…esearchable_biofab"

This reverts commit 48db55b, reversing
changes made to eef8edf.
…y-ohio-fix"

This reverts commit 7a08a7f, reversing
changes made to 5cda653.
…-hotfix-slots"

This reverts commit e2161be, reversing
changes made to da6e988.
@github-actions github-actions bot added S: Untriaged S: Needs Review ПРу необходим ревью size/M Changes: Sprites Changes: Map Изменяет карты Changes: Localization Изменяет локализацию Changes: UI Changes: Shaders Изменяет шейдеры Changes: Audio labels Feb 23, 2025
@Zna1kin
Copy link

Zna1kin commented Feb 23, 2025

Мержим.

@SonicHDC
Copy link

Ну чтож, хорошая вышла история...

@kosticia
Copy link

блин ну не ну как тогда без НЕКСТ ХИРУРГИЯ КОРВАКС УНИКАЛЬНЫЙ КОНТЕНТ в хабе быть

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes: Localization Изменяет локализацию Changes: Map Изменяет карты Changes: Shaders Изменяет шейдеры Changes: Sprites Changes: UI S: Needs Review ПРу необходим ревью S: Untriaged size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.