Morb0 d9142b3553 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/conflict-labeler.yml # .github/workflows/labeler-pr.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png # Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json		2024-04-30 21:12:31 +03:00
..
Components	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-30 21:12:31 +03:00
Systems	Rodents can be Faxecuted (executed via Fax machine) (#21461)	2024-04-27 23:50:57 +10:00
AdminFaxEui.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
DamageOnFaxecuteEvent.cs	Rodents can be Faxecuted (executed via Fax machine) (#21461)	2024-04-27 23:50:57 +10:00
FaxVisuals.cs	Fax Machine (#11704)	2022-12-12 05:06:11 +11:00
SharedFax.cs	feat(fax): Fax machines print, copy, and send paper labels (#25979)	2024-04-28 16:12:45 +10:00