Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json		2024-01-10 00:23:02 +03:00
..
acidifier.rsi	Acidifier Effect Sprite (#22425)	2023-12-14 20:56:42 -05:00
arcs.rsi	Polish melee effects (#11653)	2022-11-08 14:28:49 -06:00
atmospherics.rsi	Make the atmospherics meta not bad (#23737)	2024-01-09 13:18:30 +03:00
chempuff.rsi	Swept commits JSON genocide. (#2991)	2021-01-13 23:04:38 +11:00
chemsmoke.rsi	Add Smoke and Foam chemical reaction effects. (#2913)	2021-02-03 15:26:46 +01:00
clicktest.rsi	Fix a bunch of invalid rsi files (#13104)	2022-12-20 09:36:59 +01:00
crayondecals.rsi	Add capitalism (#6617)	2022-03-03 21:11:35 +11:00
creampie.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
electricity.rsi	diagonal window glass and pirate shuttle improvements (#21174)	2023-11-05 19:38:02 -07:00
emp.rsi	Add emp grenade (#14393)	2023-03-06 11:05:12 -08:00
explosion.rsi	Fix a bunch of invalid rsi files (#13104)	2022-12-20 09:36:59 +01:00
extinguisherSpray.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
fire.rsi	Cleaned up all produce meta.jsons (#3943)	2021-05-08 09:09:35 +00:00
fire_greyscale.rsi	Explosion refactor (#5230)	2022-03-31 21:39:26 -05:00
foam.rsi	New foam sprites (edge sprites) (#21308)	2023-10-29 10:13:41 -04:00
hearts.rsi	Animals make hearts when you pet them (#20859)	2023-10-13 09:34:18 -08:00
LightMasks	nuke lights code change (#19315)	2023-09-04 17:14:10 +03:00
lightning.rsi	Beam Component and Lightning Component (#10196)	2022-09-16 01:49:01 +10:00
mobspawn.rsi	Rock Anom effects (#23633)	2024-01-06 23:44:04 -07:00
portal.rsi	More artifact content (#22574)	2023-12-31 21:19:03 -05:00
rcd.rsi	Adds construction effect to RCD (#22633)	2023-12-17 11:08:59 -05:00
rockspawn.rsi	Rock Anom effects (#23633)	2024-01-06 23:44:04 -07:00
sparks.rsi	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
speech.rsi	Add arachnid idle state for typing indicator	2023-09-05 01:23:47 +03:00
ssd.rsi	SSD Indicator (#19701)	2023-09-11 15:52:56 +10:00
text.rsi	[Entity] Brig Timers (#15285)	2023-04-19 01:47:01 -06:00
weather.rsi	Weather effects (#12528)	2023-01-17 20:26:52 +11:00