Upstream 19.08.2024 #56
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
changed all the firelocks to glass firelocks
* Fixed bug with missing gas not getting reset * Fix bug with MutateInt not using min/max in prob calculation * Add divison by zero check * Fix styling
Co-authored-by: PJBot <[email protected]>
added a bunch of air alarms and fixed stuff
…ell Window Shutters (#31136)
* fix some salvage spawner oversights * adjust carp rates * more tweaks and some additions
* bagel update * variantize * fix nitrogen room air explosion * dumb
…-backed servers (#31154) Fixed IP bans causing server errors with SQLite DB
* Fixed typo: access --> accessed * Fixed typo: 'access restricted' --> 'access-restricted' * Fixed typo: added 'be' * Fixed typo: added 'a' * Fixed typo: 'Asssistants' --> 'Assistants' * Fixed typo: 'overpressure' --> 'overpressurize' * Fixed typo: 'outisde' --> 'outside' * Fixed typo: added a comma * Fixed typo: added a comma * Fixed typo: 'aformentioned' --> 'aforementioned' * Fixed typo: added a comma * Fixed typo: added a comma * Fixed typo: 'radition' --> 'radiation' * Fixed typo: 'turing' --> 'turning' * Fixed typo: 'appropiate' --> 'appropriate' * Fixed typo: added 'the' * Fixed typo: added a dot to ellipsis * Fixed typo: 'aswell' --> 'as well' * Fixed typo: 'permanant' --> 'permanent' * Fixed typo: 'flammmable' --> 'flammable' * Fixed typo: 'recommmended' --> 'recommended' * Fixed typo: 'recipies' --> 'recipes' * Fixed typo: 'pre-adminsitered' --> 'pre-administered' * Fixed typo: 'resusitated' --> 'resuscitated' * Fixed typo: 'types' --> 'type' * Fixed typo: `someones` --> `someone's` * Fixed typo: 'appy' --> 'apply' * Fixed typo: added 'to' * Fixed typo: 'CentCom' --> 'CentComm' (as per space-wizards/space-station-14#29217) * Fixed typo: 'emergencys' --> 'emergencies' * Fixed typo: removed a dash
* Xeno walls * Fix icon smoothing for the walls * Added a bunch of items, and the map/shuttle * Fixed construction graphs * Put the map in the right place gosh * Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties * Fix APC names and stuff * Updated to v1.1
* Coughing * Merge branch 'space-wizards:master' into coughing * Coughing * Coughing
* Goliath mob * Update asteroid.yml * mcfuck yourself * add cloak * fixes * Update materials.yml
updated cog a ton
golden toiler
shark makes RAWR!
fix raditation collectors gaslighting you
* bah * all done, thanks slarti * makes the watcher do the thing * Update TemperatureSystem.cs Co-authored-by: Ed <[email protected]> * changes something --------- Co-authored-by: Ed <[email protected]>
* PDA can no longer be linked to multitool * Ignore previous commit, it would've broken things * Added SavableAddress field to DeviceNetwork component and PDA for testing. Still need to implement * System works, borg and pda addresses cannot be saved, but they still connect to the net. * Suit sensors can no longer be added to network configurators, still work for monitoring purposes. --------- Co-authored-by: Zachary Yona <[email protected]>
* main antag page + minor antags * nuuk operatives (greenland) * "coup d'flop" = "flukies" but for revs * manifest edgelord * traitor tot (potato) * they're coming to get you, barbara * general changes. posters. * tfw last minute commit * traitoration rewritification * created thieves.xml * thieves, wow!!
ert chaplains can now use bibles
Mildly Reshapes The Sec Helmet
* increase material prices * ack
* Convert bookshelves to EntityTables * the fixy --------- Co-authored-by: plykiya <[email protected]>
* new vox customization stuff * tests fix
* Recycler overhaul * remove
clarify what is an important role
buffed cog atmos so now its massive
* Cheese tweaks * 22221241256247849`
…on-14 into upstream # Conflicts: # Resources/Prototypes/Voice/disease_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
|
RSI Diff Bot; head commit d16c913 merging into 9b84b72 Resources/Textures/Clothing/Head/Helmets/security.rsi
Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Objects/Devices/gates.rsi
Resources/Textures/Structures/Hydroponics/overlays.rsi
Resources/Textures/Structures/Machines/recycling.rsi
Resources/Textures/Structures/Machines/material_reclaimer.rsi
Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi
Resources/Textures/Mobs/Customization/vox_facial_hair.rsi
Resources/Textures/Mobs/Customization/vox_hair.rsi
Resources/Textures/Objects/Materials/Mob/carptooth.rsi
Resources/Textures/Objects/Materials/Mob/sharktooth.rsi
Resources/Textures/Objects/Materials/hide.rsi
Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi
Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi
|
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.
Щитспавн апстримами