upstream merge #601
Merged
upstream merge #601
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
* One simple istype killing many Farragi * Qwerty Suggestion
* Adds additional logging for megaphone use * format change * Formatting change to log_say (review change) * Update code/game/objects/items/devices/megaphone.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
* admin-ai improvements * Update code/modules/admin/misc_admin_procs.dm Co-authored-by: Luc <[email protected]> * brug --------- Co-authored-by: Luc <[email protected]>
* im so not full from electricity grrr * Update code/modules/mob/living/carbon/human/species/machine.dm whitespace fix Co-authored-by: Henri215 <[email protected]> * now its the microbattery dying * Update code/modules/mob/living/carbon/human/species/machine.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Update tarot.dm Allow shuffle through AltClick(), reduce shuffle time. * Update cards.dm Allow AltClick to shuffle the deck. * Updated tarot.dm Removed the tarot shuffle, as it was already inherited from deck's new AltClick shuffle option. * Update cards.dm Lowered cooldown on cards.dm to match tarot.dm * Change tarot.dm and cards.dm Changed shuffling cooldown time from 5 seconds to one second.
* PDA free DLC: New ringtones! * name tweaks
…13#22696) * accessory + helper * elper * okay, less insanity * lewc review
* commented out * deleted bridge mode and targetdirection * Fixes replace tiles bug * Autotile - Damaged floor fix * Break_tile var moved up. SHOULD be final * Update code/modules/mob/living/simple_animal/bot/floorbot.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* The fix * Removes parentheses
* no we do NOT need you getting into the admin room THANK YOU * give it a break
…y points to spawn (ParadiseSS13#21849) * ghost role ruins are guarenteed spawns, ghost ruins no longer cost any points to spawn * exa request
* Reagent Grinder TGUI * Update tgui/packages/tgui/interfaces/ReagentGrinder.js Co-authored-by: Burzah <[email protected]> * Update tgui/packages/tgui/interfaces/ReagentGrinder.js Co-authored-by: Burzah <[email protected]> * Update tgui/packages/tgui/interfaces/ReagentGrinder.js Co-authored-by: Burzah <[email protected]> * Requested changes * Fixed import issues * Added operating component to KitchenMachine.js * Remember to push the bundle * Update tgui/packages/tgui/interfaces/ReagentGrinder.js Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Biogenerator processing change * Updated bundle * Fixes biogenerator processing * Update tgui/packages/tgui/interfaces/KitchenMachine.js Co-authored-by: Contrabang <[email protected]> * Update tgui/packages/tgui/interfaces/KitchenMachine.js Co-authored-by: Contrabang <[email protected]> * Update tgui/packages/tgui/interfaces/KitchenMachine.js Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Use config over sending name along with data * Ran prettier * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Updated description on Operating * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Missing parenthesis * Missing parenthesis * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Adrer <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: Contrabang <[email protected]>
* It just works * Old code my beloathed * I hate old code so much * I'm quite blind * Switch Spacing * One more... * Slightly less codersprite * Mode examine info
* Added Beaker Swapping * Moving repeated code Co-authored-by: Contrabang <[email protected]> * Moving repeated code 2 * Updated text to be "inside" rather that "on top" * proper grammar * removes excitement for placing a beaker --------- Co-authored-by: Contrabang <[email protected]>
* Gives engicart a radial menu * correct names * Update code/game/objects/structures/engicart.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Luc <[email protected]>
…aradiseSS13#22978) * buff door * extra buff
* Fixes firealarms * Fixes reason it did not run on init to begin with thanks to mochi
* hardmode vetus now puts out less sparks than the fourth of july * Update code/datums/helper_datums/teleport.dm Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: Burzah <[email protected]>
…eing on `/atom` (ParadiseSS13#23005) * Ezpz * GDN review * Belts aren't clothing * Update code/modules/clothing/clothing.dm Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Ryan <[email protected]>
* Added Extra Cloth * added SRC to beret Co-authored-by: Burzah <[email protected]> * Empty-Commit --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: S34N <[email protected]>
* Fixed the Fixer's Power Problem * Fixed logic - now turns off all overlays * Removes excessive parenthesis Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* HE IS THE LAW * had to do reduction surgery on the sprite
github-actions
bot
added
🗺️ Изменение Карты
Co-authored-by: S34N <[email protected]>
Co-authored-by: S34N <[email protected]>
|
|
У них сейчас "время мержей", так что мерж апстрима перенесен на утро |
…iseSS13#22609) * Separate DMM conflicts for distinct atom root types. * clarify order of operations
|
А карты кто фиксить буит утром? |
* TGUI Filing Cabinet * Changed window size. * Requested changes and other Prettier formatting * mob/user = usr * User is implied idiot * Wrong branch * Update code/modules/paperwork/filingcabinet.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/paperwork/filingcabinet.dm Co-authored-by: Contrabang <[email protected]> * Comma helps. * Update code/modules/paperwork/filingcabinet.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/paperwork/filingcabinet.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/paperwork/filingcabinet.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Adrer <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: S34N <[email protected]>
Кто рано встает тому и карты фиксить |
|
ну смари сам, у тебя сервак без багов не стартанёт lul |
|
будет как в прошлый раз, лимбо раундстартом |
…n box, and adds a new mapping area (ParadiseSS13#22830) * fixes some funky spots on delta, and a single tile on box * probably like this is better * oops * there we are * Update delta.dmm * why'd that tile conflict * fixed i think --------- Co-authored-by: S34N <[email protected]>
Map fixes Extinguisher sprite fix TGUI re-build
|
|
… branch 'master' of https://github.com/ParadiseSS13/Paradise into ParadiseSS13-master
|
Ну, с богом |
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 делает
Обновляемся до оффов
Почему это хорошо для игры
Изображения изменений
Тестирование