Merge Upstream 09.01.2024 #896
Merged
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
…nto TM (ParadiseSS13#22334) * no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life * some changes /fixes * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Co-authored-by: Contrabang <[email protected]> * more changes * oh right, the murders (uplink price tweaks) * Update code/controllers/subsystem/SSjobs.dm Co-authored-by: Henri215 <[email protected]> * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * compiles * doesnt work but works better * tgui dogs still sleep but I want to sleep * it should finally compile now. Probably. * Update tgui.bundle.js * Sorry IAN, transfer components is shoddy as hell * removes minor uneeded /tgui * also extra line whoops * final stuff * reverting changes I made earlier is hard ok * Weight change, uplink reference * oh right, the hey fucko * Update code/_globalvars/traits.dm Co-authored-by: Henri215 <[email protected]> * Update tgui.bundle.js * pushes * pulls it * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> * more changes, ion rifle blocked on cyb revolution * dipshit remove the debug / tgui pritier and such * tgui * updates tgui again as nanomap was merged * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> * comment / tgui * every day I worry all day * Full TGUI rebuild + prettier * ah fuck * leave a customer feedback at the link below! * tgui momenr * tgui moment * FUCK I am dumb * vertical TGUI * She T's on my GUI till I * Update tgui.bundle.js * Apply suggestions from code review Co-authored-by: Gaxeer <[email protected]> * Update code/modules/supply/supply_pack.dm Co-authored-by: Gaxeer <[email protected]> * IPC can now use robotic hearts / pulse demon hearts and charge * fixes revert not working for hangover / arrivals * tgui moment * hhgreg * fixes that one bug * Every day I worry all day * deconflicted for real this t ime * Update code/datums/station_traits/postive_traits.dm Co-authored-by: Ryan <[email protected]> * ch-ch-ch-changes * Update SSjobs.dm * Update code/modules/supply/supply_pack.dm Co-authored-by: Ryan <[email protected]> * deconflicted but won't pass CI * fixes double dipping on traits * my le consoles, they le no work? * Great Great Asset, Asset, Great Great Asset, Asset... * sorry slime mains * fixes borgs being punished heavier * actually fixes it, I was dense * hopefully fixes borg drunk further * makes it compile? * actually makes it compile god whyyyy --------- Co-authored-by: Luc <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: SteelSlayer <[email protected]> Co-authored-by: Gaxeer <[email protected]>
…o ParadiseSS13-master
github-actions
bot
added
🗺️ Изменение Карты
dj-34
approved these changes
Jan 8, 2024
Legendaxe
approved these changes
Jan 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@Legendaxe не забудь пожалуйста ребилднуть TGUI
Что этот PR делает
Очередной мерж, так быстро потому что станционные трейты подвезли
Почему это хорошо для игры
ТРЕЙТЫ!
Changelog
🆑 ParadiseSS13 (Оффы)
add: Добавлены станционные трейты с TG. Более подробно смотрите тут - https://tgstation13.org/wiki/Station_traits
add: Добавлены Deathrattle импланты. Если кто-то умирает с этим имплантом, другой тип с таким же имплантом услышит это, но не будет знать где именно он умер.
add: КПБ могут заряжаться от сердца пульс-демона или робо-сердца а не просто от батарейки.
/:cl: