Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
cartridge.rsi	Add access logs (IC ones) (#17810)	2023-12-26 18:24:53 -04:00
cartridges.rsi	PDA UI refactor and cartridges (#11335)	2022-11-08 14:00:20 -06:00
chameleon_projector.rsi	prop hunt ss14 (real) (#26691)	2024-04-17 14:48:35 -07:00
communication.rsi	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
declaration_of_war.rsi	Give nukies the ability to declare war for a TC boost (#19291)	2023-08-29 23:56:20 -08:00
door_remote.rsi	Adds door remotes from SS13 (#6335)	2022-02-06 00:33:24 +11:00
encryption_keys.rsi	new encryption key sprites (#14742)	2023-03-19 20:56:11 -05:00
flatpack.rsi	Allow the purchase of emitters from cargo. (#27229)	2024-04-23 21:34:09 +10:00
forensic_scanner.rsi	Forensics (#8451)	2022-06-27 20:04:53 -05:00
gates.rsi	add power sensor (#20400)	2023-12-16 11:32:42 -07:00
gps.rsi	Add basic handheld GPS (#6896)	2022-02-26 16:59:20 +11:00
hand_teleporter.rsi	Portals & hand teleporter (#13266)	2023-01-02 19:58:25 -06:00
health_analyzer.rsi	Health analyzers now show if somebody is starving (#24789)	2024-02-01 17:28:17 +11:00
Holoprojectors	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
igniter.rsi	add igniter (#20962)	2023-10-14 00:11:50 -07:00
jammer.rsi	Radio jammer update! (#25912)	2024-04-25 12:19:16 +10:00
mousetrap.rsi	Mousetraps (#8440)	2022-05-25 13:16:34 -07:00
nuke.rsi	Fix missing line in nuke exploding sprite (#25351)	2024-02-17 15:46:38 -05:00
payload.rsi	Flash payload (#7587)	2022-04-20 16:08:57 +10:00
pda.rsi	Darken equipped PDA sprites (#23197)	2023-12-29 21:22:29 -05:00
pinpointer.rsi	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
signaller.rsi	Partially reverts the remote signaller resprite (#27073)	2024-04-17 21:16:48 -04:00
signaltrigger.rsi	Remote Explosives (#7682)	2022-04-22 16:54:39 +10:00
singularity_beacon.rsi	add syndicate singularity beacon (#18486)	2024-01-06 00:21:24 -08:00
station_beacon.rsi	Station beacons (#23136)	2023-12-28 17:02:21 -07:00
swapper.rsi	[Resprite] Swapper (#1746)	2024-01-17 19:57:16 +03:00
tablets.rsi	Station maps (#13027)	2023-04-13 16:21:24 +10:00
timer.rsi	Add Modular grenades (chemnades). (#7138)	2022-03-25 15:17:29 +11:00
voice.rsi	Add voice trigger for modular grenades (#11449)	2022-10-17 04:44:50 +11:00