This repository has been archived by the owner on Jul 14, 2023. It is now read-only.
Fixes everything TrustMe #96
Open
Conversation
This file contains 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
* рай корпоративного чвк. * инклюды * говнокод. * хуйня. * ну вы понимаете, здесь тоже матерное слово. * фулл авто гоус бррррр * ря. Да ну блять * Айконтейты
* аеа * лода * vezha
* Merge pull request Baystation12#32306 from SierraKomodo/drone-transfer-toggle Maintenance drones can be immune to z-transfer deaths (cherry picked from commit 2759ade) * Merge pull request Baystation12#32297 from JoeyNosegay/dev Skrell Cultural Updates (cherry picked from commit 2b25235) * Merge pull request Baystation12#32289 from SomeAngryMiner/racksandsuits resprites racks, firesuits, bombsuits and diving helmets (cherry picked from commit 9d98c9c) * Merge pull request Baystation12#32258 from SomeAngryMiner/armors Redesigns security armors and their respective attachments (cherry picked from commit 188a542) # Conflicts: # icons/mob/onmob/onmob_head.dmi # icons/obj/clothing/obj_head.dmi # maps/torch/icons/mob/onmob_head_solgov.dmi # maps/torch/icons/obj/obj_head_solgov.dmi * Merge pull request Baystation12#32264 from SierraKomodo/med-scan-colors Apply color coding to medical body scanner output (cherry picked from commit f7dbd31) # Conflicts: # code/__defines/colors.dm * Merge pull request Baystation12#32266 from SomeAngryMiner/sleepersandjustsleepers New sleeper and body scanner sprites (cherry picked from commit abfe03e) * Merge pull request Baystation12#32260 from Fre3bie/grab_things Changes to hostage shielding and grab/pulling (cherry picked from commit 39c6ad8) * Merge pull request Baystation12#32248 from SomeAngryMiner/launchers Minor Xenoarchaeology additions (cherry picked from commit 581e828) # Conflicts: # icons/obj/storage.dmi * Merge pull request Baystation12#32239 from SierraKomodo/autoinjectors Empty autoinjectors and reagent colored tags (cherry picked from commit 693ddd6) * Merge pull request Baystation12#32252 from SomeAngryMiner/augmentfixes Augment design cleanup (cherry picked from commit 6f7e513) * Merge pull request Baystation12#32282 from Spookerton/spkrtn/cng/cheese-moment cheese is now fresh, aged, and blue cheese (cherry picked from commit 5a8f7b5) * Merge pull request Baystation12#32213 from Imienny1/MakeDufflebagsGreatAgain Make dufflebags worth using (cherry picked from commit 9729abe) # Conflicts: # code/game/objects/items/weapons/storage/backpack.dm * Merge pull request Baystation12#32324 from Spookerton/spkrtn/cng/frizza adds fruit pizza (cherry picked from commit 2267b6f) # Conflicts: # code/datums/supplypacks/galley.dm * Merge pull request Baystation12#32275 from SomeAngryMiner/ghettoguns Makeshift weapon QoL and Additions (cherry picked from commit d8b279a) * я забыла спрайты х2 я забыла спрайты Co-authored-by: Mucker <[email protected]> Co-authored-by: Spookerton <[email protected]> Co-authored-by: Sierra Brown <[email protected]>
* Новый язык ожидает Вас! * Изменения в файле ДМИ * Вновь изменения в ДМИ... * Update lirris.dm Co-authored-by: евиё <[email protected]>
…ых курточек для гражданских! (Proxima-Project#208) * RE01 Время летит... * Попытка исправить файл с акс * RE Некий нехороший человек положил туда один пренеприятнейший файл, а страдать после этого мне. * REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE * Re?
* иконки * жабы мои жабы
* Потраченные десять часов жизни * Обновление!!! * Исправление ошибок и недочётов * Исправления карты
* fucking boosters * блять, сука, пиздец. * Revert "fucking boosters" This reverts commit 3e98ad5. * ???
* блять, сука, пиздец. * админабуз * asdasdas
…oject#231) * я починил мечи, теперь я кузнец * фикс мечей, делаем их больше. прям как мой хуй
* Потраченные десять часов жизни * Обновление!!! * Исправление ошибок и недочётов * Исправления карты * Небольшое накопительное обновление * Дополнение * Изменения в доступности значков пилота * Изменение названия полевой униформы ЭК
* блять, сука, пиздец. * Merge pull request Proxima-Project#2 from HaCsO/movement Feature: glide-movement (cherry picked from commit b75414f) * Merge pull request Proxima-Project#3 from HaCsO/movement Fix: some govno in map files (cherry picked from commit da6a9a5) Co-authored-by: actuallynotajoke <[email protected]>
|
Ооо, хороший мелкофикс |
|
Это очень оригинальное решение проблемы. Мы подумаем касательно мержа этого пра. Необходима дискуссия на внутреннем совете резомби. |
|
ты охуел |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.