Merge Upstream 07.01.2024 #894
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
* start * now based on percentage of Brain Health * minor case of major brain damblage * 4 * move a bit around + adding stumble * i really do not like these * i was in a silly goofy mood Co-authored-by: DGamerL <[email protected]> * more jittery * Span fix Co-authored-by: Luc <[email protected]> --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
* Update steal_items.dm * Examine More * Revert "Examine More" This reverts commit fdf9a1d.
* Adds the Technocracy Advanced Cloning System Kit * no bad no cheap illegals * as funny as it would be for admins to receive fries are done * Apply suggestions from code review Co-authored-by: GDN <[email protected]> * Update code/game/objects/structures/grey_autocloner.dm Co-authored-by: GDN <[email protected]> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: 1080pCat <[email protected]> * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]> * requested changes * Update code/game/objects/structures/grey_autocloner.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: GDN <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Fix duplicate tracking beacon issue emoved the possibility of having both an AI tracking beacon and a standard one, ensuring that the "tracking" can no longer appear twice in the "robotic control console". Whenever someone add a different tracking to a mech, the old one is returned upon the player hand while the new one is within the mech. * Update code/game/mecha/mecha.dm Co-authored-by: S34N <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: S34N <[email protected]>
…are guaranteed to get injured. (ParadiseSS13#23533) * everyone gets more injured always! * this is why i leave myself notes * no escaping the beating * jail for 1000 years Co-authored-by: Nathan Winters <[email protected]> * gone * cleans uo the default_damage procs a bit --------- Co-authored-by: Nathan Winters <[email protected]>
…#23580) * Fix issue with Reactive Repulse Armor affecting spectators Ensure that Reactive Repulse Armor does not affect spectators by adding a check for ghost entities during repulsion action. Fixes ParadiseSS13#23574 * Fix camera mobs getting thrown too --------- Co-authored-by: Pierre-Louis <[email protected]>
…s ghost window highlight spam (ParadiseSS13#23586) * A commit * Make it louder * Golem flash cooldown
* caek * caek 2
…S13#23596) * Add immunity to ash storm for possessed objects Fixes oversight ParadiseSS13#23110 by adding immunity to ash storm for possessed objects, addressing the bug where possessed objects, including possessed swords, were not immune to ash storm. * Make possessed sword immune but not objects * Code improvment. Both possessed sword and objects now immune * Ash immunity on children inherited "sword" subtype only Oopsie * Fix --------- Co-authored-by: Pierre-Louis <[email protected]>
* bomberjackets * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * minor changes to armour and allowed items * secbomber description change * more allowed item tweaks --------- Co-authored-by: Henri215 <[email protected]>
* We have fun here sir. * thanks grunt * Extra failsafe
* adds soap crates * qwert suggestions
…eSS13#23609) Added a check for non-clonable species DNA (body) before checking for brain existence to prevent cloning of non-clonable species. Hence fixes #ParadiseSS13#22675 Co-authored-by: Pierre-Louis <[email protected]>
* The Green Terror marches on * Update code/datums/spells/construct_spells.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/gamemodes/cult/cult_structures.dm Co-authored-by: Henri215 <[email protected]> * Updated Icons * one extra i forgor --------- Co-authored-by: Henri215 <[email protected]>
…ack_trace (ParadiseSS13#23648) * amazing * okay
…3649) * pulse demons can now ai click doors without runtiming * requ changes
…eSS13#23658) * bam * okay, not this one
* half-done, saving... * stage for conflicts * addin that paper for later use * stage * remove copy * added vent in old freezer * Fixing that paper. * that damn lattice * Batch of fixes: - Added APC to captain bedroom, because CI check want it. - Changed xenobio test chamber to "special containment" and renamed related things so it now fit theme, admins can make events of "containment" or related (or store cling there) - Added missing APC to abandoned library, so now maintenance is powered. - Moved Vent in old laser tag room, so it dont cause FAIL on check. * FIX "d" variable error - i hope it will work * Changes: - Laser tag room is gone, now its just some ordinary maintenance area. * Added fungus and web to previous edit. * Removed sheet bag * Added missing APC * Removed duplicated APC. * changes requested from henri * Goodbye tsunguska, welcome bull- i mean stuff. * SPAAACIIING * Did 95% of requested changes by S34N - i am still confused about this first botany door, oryginaly it dont have access on it. * Did 80% requested by Aylong220 - Discussion was on discord about changes, cannot do some of them. * that APC
* nice * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Co-authored-by: dearmochi <[email protected]> * Update mod_control.dm * fixes and modsuit fix * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]> * think i did it right * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> * Update code/__DEFINES/mob_defines.dm Co-authored-by: Contrabang <[email protected]> * Update atoms.dm --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: dearmochi <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Contrabang <[email protected]>
…propriate, alongside a small sprite cleanup (ParadiseSS13#23652) * TODO: ERT HARDSUITS * Drask and Taj * Unathi, Vox and Vulp * Last things * Hats off to you * Fixes a dumb drask corset issue
…3172) * The fix * Contraaaaaa * Fixes CI * Fixes the pads + cases * Uplink datums * Update code/datums/mind.dm Co-authored-by: Burzah <[email protected]> * Update code/__HELPERS/unsorted.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/research/designs/medical_designs.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/research/designs/medical_designs.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/research/designs/medical_designs.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/research/designs/medical_designs.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/surgery/implant_removal.dm Co-authored-by: Contrabang <[email protected]> * Outfits now use a proper variable name * Fixes surgery (oops) * More .dme changes * Renames the folder * Fixes bad merge * Contra review * Update code/game/objects/items/weapons/dice.dm Co-authored-by: Contrabang <[email protected]> * Fixes CI fail --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: S34N <[email protected]>
* makes noslips work * trait part * THE REST * it didnt conflict too much actually * this was intended, whoops lol * no more processing * consistency * lewc review * Apply suggestions from code review --------- Co-authored-by: S34N <[email protected]>
* Sprites and little refactor * idk what i am doing Maybe refactor * Sort the boxes * Matches path * Script and maps * Okay... that was a strange decision. * bathroom parts box * More boxes * Henri review changes * Update toy.dmi * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Ryan <[email protected]> * Update storage.dmi * Update boxes.dmi * True conflict solve I hope --------- Co-authored-by: Ryan <[email protected]>
* Abductor Objectives Abductor Objectives * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Thanks Co-authored-by: Contrabang <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Shit Co-authored-by: Contrabang <[email protected]> * Update abductee_objectives.dm Changes the execution objective to not be assisted manslaughter * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Fixed Co-authored-by: DGamerL <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Most of these are just taking them word for word as theyre a port but this would be clearer Co-authored-by: DGamerL <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm The "he is" is more to hammer down the point of one person but this woks too. Co-authored-by: DGamerL <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Co-authored-by: DGamerL <[email protected]> * Update abductee_objectives.dm * Update abductee_objectives.dm * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Co-authored-by: Luc <[email protected]> * Update code/game/gamemodes/miniantags/abduction/abductee_objectives.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Contrabang <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
* blackbox logging for biohazards * guh it warned for the others but not this one * Update code/__DEFINES/misc_defines.dm Co-authored-by: Contrabang <[email protected]> * define / lewc --------- Co-authored-by: Contrabang <[email protected]>
…o ParadiseSS13-master
github-actions
bot
added
🗺️ Изменение Карты
AyIong
added
the
Do Not Merge
github-actions
bot
added
Кибериада
|
Фиксииии Xylipizdish |
Legendaxe
removed
the
Do Not Merge
|
вульпы не должны есть шоколад это харам |
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 делает
Мерж оффов, довольно большой.
Было всего 2 конфликта, все они связаны с
_charОба пофикшены
Changelog
🆑 ParadiseSS13 (Оффы)
add: Добавлен двойной осмотр с ТГ, после осмотра осмотрите предмет ещё раз, вдруг там есть более подробная информация
add: Добавлен набор Technocracy Advanced Cloning System в аплинк серых.
add: Новые бомберы (зимние куртки) для отделов: ботаника, мед, химия, коронер, РнД и робо.
add: Добавлено 2 новых ящика с мылом.
add: Портированы новые цели для бубукторов: buddy, final death, forbidden number, mispronouncing, one person, blindness, illness, game reality, instructor, writer, actor, imminent doom и proof abductee с MonkeyStation, Fulp, TG и скайрата.
tweak: [АДМИН] РИГи заменены на МОДы в меню выбора экипировки.
tweak: Переработаны эфекты повреждённого мозга.
tweak: Антаги пойманные контрактником, больше не будут сидеть 10 минут в синди-тюрьме.
tweak: Пойманные контрактерами теперь будут страдать.
tweak: Уменьшен спам уведомлениями для гостов.
tweak: Добавлен иммунитет к шторму на лаве для проклятых вещей (тех в которых могут быть госты)
tweak: Endoskeleton теперь не влазит в рюкзак.
tweak: Заклинание
Instant summonsбольше не работает на ядерный диск и не создаёт его.tweak: Слиперы теперь могут вводить химикаты не только полу-трупам.
tweak: Ксено больше не может создать яйца бэйби-вотчера.
tweak: Пальто ГП может держать вещи, такие как пистолеты и батоны.
tweak: Вульпы теперь могут хавать шоколад (Ну пиздец)
soundadd: Добавлен новый звук для гост-ролей.
imageadd: Респрайт бомберов (зимних курток): обычных, синди, сб, инженерских и атмосовских, карго и шахты.
fix: В мех больше нельзя всунуть 2 трекера.
fix: Реактивная репульс броня больше не воздействует на гостов.
fix: Клоунский торт теперь можно нарезать.
fix: Демоны/люди использующие jaunt/blood crawl больше не будут падать в чазмы.
fix: Не клонируемые расы больше не клонируются.
fix: Пульс-демон может кликать на аирлоки как ИИ.
fix: Прочие мелкие фиксы.
del: КПБ больше не теряют волосы когда мрут.
del: Удалена цель на кражу ИИ.
/:cl: