[pull] master from BeeStation:master #1284
Closed
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
github-actions
bot
added
Administration
tools
sprites
TGUI-Changes
mapping
sound
labels
* fixes artifact holding using robo access * removes oopsie extra arti windoor
* sprite-adjustments * sci-icon-fix * engieskirts_conflict-resolver * Work damnit * fix-attempt-two
* apprentice * type check
* Refactors and fixes sound_player (#64443) idk if this is considered a refactor since its not creating a new component, so remove my refactor label if you believe so. Overhauls how sound_player works, and makes it actually work. * Re-adds clown PDA virus honk (tg/71035) * Update code/modules/modular_computers/computers/item/tablet.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Move into subtype * Make its own proc --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
* Update emote.dm * actually updates it to work with IPCs now. * new boop
…ny (#8548) * let-there-be-color * suggested-changes
* Fix gatling gun * fixes cooldown * one last fix to block exploit * fulfills request, improves code while doing so * variable conflict * fix linter
* Make it unknown again * weird blindness grammar * fixed some of my fucked up grammar, some additional desc changes * Update code/datums/mutations/touch.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/datums/mutations/sight.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/datums/mutations/sight.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> * Update code/datums/mutations/telekinesis.dm Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com> --------- Co-authored-by: PowerfulBacon <26465327+PowerfulBacon@users.noreply.github.com>
* Initial commit /atom/proc/plasma_ignition() added for use by all atoms made of plasma which can be burned Applied to loose plasma sheets, plasma airlocks, plasma walls and false walls, plasma statues and plasma doors. * Improves qdel logic Particularly for things leaving debris behind * Consistency in reactions All affected objects explode when shot with lasers, exposed to flame, or attacked with a hot object. * now includes cigarettes * unnecessary src. * Adjusts reagent plasma part 1 Also adds admin alerts to synthesis of Blackpowder and Phlogiston. * Powdered plasma is now very volatile Expanded on admin alerts and logging to include the last fingerprint if there is no user. * update documentation * plasma coin + minor tweaks reduced cig power adds a minimum threshold to plasma_ignite. Under threshold just makes a fire on the turf. Adds fire sound to plasma ignition. * now including rigged lights * and power cells too now They can still have explosions for reasons other than plasma though. * unnecessary prior change * some random whitespace I added and it's gone now. * updates explosion names * Fixes the conflict caused by renaming files * Remove redundant proc * removes redundant moles checks And also fixes an oversight in girder placement * Capitalizes reaction names Consistency is good. * Update airlock_types.dm
* halves glowshroom hp WHY CAN THEY HAVE UP TO 100HP?!! WHY?!! * Rounding Synthex said decimals in integrity was bad so here we are * Actually works now woops
* Buffs the Malfunctioning AI turrets. * thanks ben Co-authored-by: Benjamin <benbreslich@live.com> * Added updated description and fixed formatting * Add mention about electrode in the upgrade desc * Changes stun proj. from electrode to disabler shot * Actually fixed it now * wrong file silly me aha --------- Co-authored-by: Benjamin <benbreslich@live.com>
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )