Closed
Conversation
Collaborator
|
Так там же вроде одна пушка на выбор, не? |
Collaborator
|
этот коммит у тебя улетел в #73, т.к надо разные бренчи под PR создавать, а не в одном все варить |
Author
|
та я ебал гит за его ветки, хоть в разных местах создавал, но все равно подтянулся в одно, а про пушек сам видишь по коду, что у него там мосинка и т.д. так еще и летал |
IsNotAcceptable
pushed a commit
to IsNotAcceptable/VIBE-PROJECT
that referenced
this pull request
Mar 22, 2026
…7#48)" (BohdanNovikov0207#72) (BohdanNovikov0207#104) * Reapply "Port WWDP's Alert Level Locks for gunsafes (BohdanNovikov0207#48)" (BohdanNovikov0207#72) This reverts commit 83bc10b2c28a6d81a8b35b9df319be1299eada9d. * cleanup and more prediction --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
BohdanNovikov0207
pushed a commit
that referenced
this pull request
Mar 22, 2026
* s * ст * cargo mini * debuff and point * leee * fart------ * Kill sprinting. (#6) * trauma mod (#11) * trauma mod --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * fix * Reapply "Port WWDP's Alert Level Locks for gunsafes (#48)" (#72) (#104) * Reapply "Port WWDP's Alert Level Locks for gunsafes (#48)" (#72) This reverts commit 83bc10b2c28a6d81a8b35b9df319be1299eada9d. * cleanup and more prediction --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * ru * Update station alert level terminology in Russian locale Signed-off-by: Serj <184727191+IsNotAcceptable@users.noreply.github.com> --------- Signed-off-by: Serj <184727191+IsNotAcceptable@users.noreply.github.com> Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
IsNotAcceptable
pushed a commit
to IsNotAcceptable/VIBE-PROJECT
that referenced
this pull request
Apr 11, 2026
…ndamage Auto emotes on damage system
BohdanNovikov0207
pushed a commit
that referenced
this pull request
Apr 11, 2026
* Merge pull request #4 from KillanGenifer/goals [CORVAX PORT] Station goals * Merge pull request #5 from KillanGenifer/cyrilliccrayons [CORVAX PORT] Cyrillic crayons * Merge pull request #14 from corus-station/abductor-accent Glorp Accent * Merge pull request #34 from JrInventor05Next/adminabuse [NEXT PORT] Мелочи для админов by Vonsant * Merge pull request #72 from KillanGenifer/autoemoteondamage Auto emotes on damage system * chore: Automatically update REUSE headers * IFF upgrade and remote shuttle system (#116) * PR : IFF improves and remote shuttle system * chore: Automatically update REUSE headers * [PORT] Передача предметов в руки (Simple-Station#264) * take files from original PR * it works somehow? * rebase everything to corvaxgoob * resolving conflict * IPC and skeleton fix * chore: Automatically update REUSE headers * Anonymous radios (Simple-Station#290) * added anonymous radios * check for short names to prevent crashing * yaml * custom instructions for alert level in PDA (#334) Also it add TryGetString for alert name * Shadowkin eyes (Simple-Station#460) * Shadowkin Eyes Workaround Later * Locale * Changes * Locale(reposition) * Фикс подстанции Т.Р.А.Н.З.И.Т. (Simple-Station#461) * Фикс подстанции (ТРАНЗИТ) из комплекта БСХ Было 2 проблемы в прототипе: 1. Если тронуть слайдер мощности подстанции, то её значения слетали до родительской базовой подстанции 2. Ёмкость подстанции также имела родительское значение обыкновенной подстанции, что для ТРАНЗИТа сущие копейки. В связи с механикой PowerNet любые электрогенераторы, даже если могут выдать 20 МВт, не могут достигнуть этих значений из-за медленного разгона фактической мощности. Поэтому нужна большая ёмкость подстанции, чтоб перед запуском БСХ генераторы успели набрать фактическую мощность. * Crash YAML test fix --------- Co-authored-by: HOME-PC\admin <test@awd.wd> * Heretic robes sprites (Simple-Station#542) * ogo * Re-sprite programs icons (#601) * Remove medsec (Simple-Station#633) * Изменение смеха для женщин тенекинов (Simple-Station#643) * Update speech_emote_sounds.yml * Update speech_emote_sounds.yml * [Add][Port]Pathfinding decals (Simple-Station#654) * FloorSign * Pathfinding decals, take 2 (#2914) * better decals yup * chore: Automatically update REUSE headers --------- Co-authored-by: funkystationbot <funky@funkystation.org> * fix * pereezd --------- Co-authored-by: willow <willowzeta632146@proton.me> Co-authored-by: funkystationbot <funky@funkystation.org> * Госты могут просматривать интерфейсы (Simple-Station#675) * Переработка консоли заказа грузов (Simple-Station#698) * metaEB * Update speech_emote_sounds.yml (Simple-Station#702) * Dragon-faction (Simple-Station#707) * Toolbelt QOL (#6373) * Eta tuff * ooops * hmmmm * okay fuck you * why are you this way * Okay! * small Heretic Icons Resprite (#6368) cool (cherry picked from commit b327212) * fix rsi 1 * fix 2 * ! * фиксы и порт с бакмена (#98) * fix footprints * port sponsorsystem from backmen * fix ~~orehum~~ backmen pass * return martial artist --------- Co-authored-by: KillanGenifer <157119956+KillanGenifer@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: nukkuminen <90336027+oldschoolotaku@users.noreply.github.com> Co-authored-by: JrInventor05Next <205915704+JrInventor05Next@users.noreply.github.com> Co-authored-by: Elusive <elusivedrake@gmail.com> Co-authored-by: Naxel <46362288+Naxel11@users.noreply.github.com> Co-authored-by: HOME-PC\admin <test@awd.wd> Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com> Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Co-authored-by: RomiGur <gurilevroman@gmail.com> Co-authored-by: Mefedronov <49251114+Metasux@users.noreply.github.com> Co-authored-by: ArZarLordOfMango <96249677+ArZarLordOfMango@users.noreply.github.com> Co-authored-by: willow <willowzeta632146@proton.me> Co-authored-by: funkystationbot <funky@funkystation.org> Co-authored-by: BeanyBoi69 <92493635+BeanyBoi69@users.noreply.github.com> Co-authored-by: RedTerror <37833085+RedTerrorDark@users.noreply.github.com> Co-authored-by: Andrey <54708336+BadRyuner@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
У бармена теперь только 1 дробовик вместо черного рынка оружий
TODO
Media
Changelog
🆑