Merge Upstream 01.11.2024 #1632
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
* fix: two small mapmanip followup issues * also qdel edge helper markers * return init hints instead
Co-authored-by: Adrer <[email protected]>
* adds antaghud icon * TGUI bundle build dont push changes i didnt stage challenge 2025 (IMPOSSIBLE) * Adds organ repair passive * Description fix * Runs prettier * Fixes desc 2 * Fix revert * Remove vamp text * Fix some CI + Partial refactor * Fixes CI * Fixes gamemodes I messed with * Moves these procs over * Description fix again * Add back limit requiring drainees to have ckeys * Adds terminator icon * Update code/datums/status_effects/buffs.dm Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/modules/surgery/organs/augments_internal.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * More lewv review * Clamps the EMP severity * Fixes "surveilance" typos * The TODO is gone and can't hurt me anymore * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/game/objects/items/weapons/pneumaticCannon.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/game/objects/items/weapons/stunbaton.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * More lewc reviews * Update code/modules/antagonists/_common/antag_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/_common/antag_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_datum.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Fixes some camera bug issues + lewc reviews * Update code/modules/antagonists/mind_flayer/powers/flayer_passives.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Updates a comment and fixes whitespace * Autodocs flayerprod * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * qdel things we dont need anymore + typing an argument of add_abillity * Remove debug log * Update code/modules/antagonists/mind_flayer/flayer_power.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * Slightly buffs, and fixes GC issues of tether * I no longer feel i am a mindflayer * Fixes formatting of greeting * Better greeting * Worlds shittiest sprite * Don't need this TODO anymore * Fixes double description * Changes the wording on the borg laws * and bundle too * The cannon uses shrapnel now * Initial style changes * Ratios for brain damage * Adds a chemical to test for flayerism * Fixes the brain damage ratios * Abilities are purchasable again * Updates TGUI properly * im sorry linter * Steam smoke * Hi bundle * Re-abstracts this proc post syndi orgs * Fixes gamemode logic post cling round removal * I WONT FORGET IT THIS TIME * Fix name of steam ability * I'm a fool * Fixes processed passives + removes debug message * Fixes updating abilities inside UI * Better description for quicksilver form * First part lewc review * Remove debug thingy * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> * Fixes defines + GCs weapon spells * We don't need this * Eyes GC properly * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * adds better logging to the assimilate * Adds parenthesis Co-authored-by: Luc <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> * TGUI Bundle Rebuild * Fixes and Reworks TGUI * Cleaner JS and Fixes * adds anti-snitching clause to borg laws * changes the span for the borg messages * No holoparasites * Puts baton silence in line with glare * Fixes total_swarms_gathered * Nuke old trait * Gun no longer not stuck * Rejuv clears delayed knockdown * Some weapon ability fixes * Makes radio enable timers not counterintuitive * Fixes beepsky runtimes * Makes naming more consistent * Adds one-click-antag * Adds the mind flayer toggle (doesn't technically work) * Adds flayers to check_antagonist * Gives IDs to the status effects * Also this one * Makes retracting work again if it's in your offhand * Fixes pacification tech levels * Grapple is a weapon ability now, nullifcation retracts implants * Fixed descriptions * Adds some pizzaz to torque enhancer * This actually needs to be like this * Moves a helper proc over to a helper proc file * Extra admin visibility * Nukes the wacky flayer mob * Makes silicon administrative access more sane * Terminator form better description * Makes rejuv set stamina to 0 * Various price increases * AAAAAAAAAAAAA * Better feedback + logging on cyborg subversion * Swarm purchase display (temp fix) * Makes mindflayer sounds more silent * UI improvements * Various mindflayer fixes * Typo * More fixes * Fixes innates from being stupid * Forgot to add this check earlier * Oh this is how you add things to the protolathe * Changes some description and upgrade messages * Allows you to drain people beyond your limit * Fixes some weapon upgrade issues * Fix CI * Fixes some draining issues * More UI Tweaks and QoL * Fixes most of the issues * text * Fixes * Adds a radio jamming option to intruder * Gives obfusciation to jammer ability * Small passive cleanup * Fixes Search and Adds Ability Stages to UI * Adds freebie abilities * Restructuring chain and adding blackbox * Tgui polish * Small fix for traceroute * Fixes one click antag * Increases EMP resistance cost * Changes the pneumatic cannon into a shotgun * Slightly lower static * Fixed innate building rendering in upgrades * Fixes icon and description * Consistency * Punctuation fix. * Quick reboot + terminator form synergy * Adds safety deleting * Fix level for torque * Fixes a bad bug * Update code/game/gamemodes/objective.dm Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> * Aaaaaaaaaaa * Makes torque a martial art and some martial arts safeties * Replaces vortex arm with barrier * Fix paths * Adds torque knockdown * Part 1 lewc review * HIIIII SQUIDWARD I'M IN YOUR BRANCH NOW * Removes flak cannon * Flayer respects mindshielding now on vamp+cling * Fixes EMP resist * More fixes * DGL review * Contra review * Clean up weapon powers * Various tweaks * Borg hand slight improvements * Parent call needs to be after this * Fixes stuff * Adds a new proc that is called when a spell is purchased * NEW SPRITES WOOOO * Traceroute update * Slightly lower traceroute cost * Formatting * Oops * Wow this could've been bad * Overclock small buff * Reduces cost of 1st level EMP immunity * Lewc review * TGUI Bundle Rebuild * Fix barricades * Lewc review * Okay FINE qwerty I'll change this * Traceroute thingy * I am an idiot * First part * Lewc review * Forgor this one * Last bits * Update code/game/objects/items/control_wand.dm Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm Co-authored-by: Luc <[email protected]> Signed-off-by: DGamerL <[email protected]> * Null * Static-ness * Update code/game/gamemodes/changeling/traitor_chan.dm Signed-off-by: DGamerL <[email protected]> * Update code/__DEFINES/mindflayer_defines.dm Signed-off-by: DGamerL <[email protected]> * Last bits --------- Signed-off-by: DGamerL <[email protected]> Signed-off-by: BiancaWilkson <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Qwertytoforty <[email protected]>
* how did we miss this * paper prevention * optimise prime
* how did we miss this * paper prevention * optimise prime * wow
…7190) * Cargo requests delete when requester cryo's * Update code/modules/supply/supply_order.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Chap <[email protected]> --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: DGamerL <[email protected]>
m-dzianishchyts
added
the
📃 Требуется изменение WIKI
github-actions
bot
added
🗺️ Изменение Карты
AyIong
approved these changes
Nov 1, 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.
Что этот PR делает
Мергес апстрим.
Changelog
🆑 Paradise SS13
add: Добавлен новый КПБ антагонист - Mindflayer. Вампир/генокрад на манер КПБ. Подробности тут.
fix: ИИ больше не видит через скрытые камеры и камеры на синди базе.
fix: Заказы в консоли карго больше не застревают, если заказчик ушел в крио.
/:cl: