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
..
6pack.rsi	Adds a 6pack of Cola (#4499)	2021-08-20 05:41:17 +00:00
authorbooks.rsi	a librarian's paradise (new books) (#15585)	2023-05-06 12:10:09 +10:00
bedsheets.rsi	[Brigmedic] Something like a "big update" (#15496)	2023-04-26 00:48:44 -06:00
books.rsi	New tabletop RPG rulebook (#1008)	2023-04-27 14:28:41 -07:00
brbsign.rsi	BRB sign retexture (#429)	2022-09-27 15:00:11 -07:00
buffering.rsi	Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456)	2022-05-27 00:41:18 -07:00
bureaucracy.rsi	Fix stamps	2023-12-29 17:23:07 +03:00
cablecuffs.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
candles.rsi	Candles (#21087)	2023-11-03 22:53:51 -07:00
candy_bowl.rsi	Added Candy Bowls for Waiting Lines (#18341)	2023-08-06 13:10:46 +10:00
cc-clipboard.rsi	Added CentCom clipboard, folder and added a normal green folder. (#22693)	2023-12-20 16:29:35 -07:00
clipboard.rsi	Adds clipboards to bureaucracy crate and replaces incorrectly credited sprites (#20736)	2023-10-04 23:24:29 -04:00
desk_bell.rsi	desk bell from SS13 (tgstation) (#14870)	2023-03-27 10:29:09 -04:00
eggspider.rsi	[mob] Space Spider (#15744)	2023-04-26 00:51:40 -06:00
ensnare.rsi	Ensnaring Component and Bola Update (#9968)	2022-08-25 00:50:31 +10:00
fire_extinguisher.rsi	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
flare.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
fleshkudzu.rsi	Meat kudzu (from anomoly) more killable, telegraphs better (#16107)	2023-05-06 15:08:50 +10:00
flies.rsi	Miasma improvements (#9022)	2022-06-24 01:20:52 -07:00
glowstick.rsi	Fixing some prototypes modifying components on init (#12385)	2022-11-06 02:28:44 +11:00
guardian_info.rsi	Guardians (Holoparasites) (#5140)	2021-12-29 14:58:48 +11:00
handcuffs.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Handy_Flags	Decorative Flags (also handheld flags) (#19670)	2023-12-04 17:27:02 +11:00
ice_crust.rsi	Ice anomaly spawns ice underneath it (#21227)	2023-11-05 19:41:42 -07:00
id_cards.rsi	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
inflatable_door.rsi	Add inflatable door (#6393)	2022-02-08 14:54:14 -07:00
inflatable_wall.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
killsign.rsi	Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456)	2022-05-27 00:41:18 -07:00
kudzu.rsi	Space Kudzu (#5472)	2021-11-28 19:25:36 -07:00
landmine.rsi	update landmine sprites from tg (#20977)	2023-10-14 00:09:47 -07:00
Lights	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-25 21:03:49 +03:00
modular_receiver.rsi	Adds the Improvised Shotgun (#18025)	2023-07-18 15:10:07 -06:00
module.rsi	whoops (#16728)	2023-05-22 23:59:37 -06:00
monkeycube.rsi	Dehydrated cube box overhaul (#23685)	2024-01-07 23:27:40 -07:00
nukedisk.rsi	Data Disk Update (#16240)	2023-05-08 22:28:37 +10:00
potatoai_chip.rsi	Potato battery update + potato AI (#21142)	2023-10-26 00:52:49 +11:00
proximity_sensor.rsi	Port honkbots from nyano (#9698)	2022-07-15 00:54:34 -07:00
qm_clipboard.rsi	The Quartermaster's Requisition Digi-board (#21023)	2023-10-22 00:34:06 -07:00
reagent_fillings.rsi	Fix/improve smokeables (#10497)	2022-08-13 22:20:31 -07:00
rifle_stock.rsi	Adds the Improvised Shotgun (#18025)	2023-07-18 15:10:07 -06:00
skub.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
spaceshroom.rsi	Add Spaceshrooms (#17092)	2023-08-02 00:10:48 +10:00
spiderweb.rsi	Behonker and Clown Spider (ready for merge) (#16678)	2023-06-15 12:47:36 +10:00
stamps.rsi	Move stamps out of big mess (#22877)	2023-12-27 15:46:30 -07:00
stock_parts.rsi	Revert stock part timings	2023-06-19 21:21:24 +03:00
torch.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
utensils.rsi	Adds a ton more inhands (#4488)	2021-08-20 05:36:32 +00:00
zipties.rsi	Zipties (#5727)	2021-12-13 22:17:26 -07:00