189 commits

Author	SHA1	Message	Date
Morb	6ad4a10b29	Repository cleanup (#631)	2022-12-10 12:10:27 -08:00
Morbo	513e6cf6ef	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Server/Chat/Managers/ChatManager.cs	2022-11-25 04:31:52 +03:00
metalgearsloth	6c76061887	Content changes for mapgrid kill (#12567)	2022-11-22 13:12:04 +11:00
Morbo	a1416bc4f7	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-11-15 22:24:03 +03:00
DrSmugleaf	da29a01846	Add ban list window (#12574)	2022-11-14 20:06:55 +01:00
metalgearsloth	6ab864fcda	Update content to mapsystem (#12387)	2022-11-13 17:47:48 +11:00
Morbo	bfa402a3e6	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-11-05 06:14:39 +03:00
metalgearsloth	c0abea8047	Content side for removing IMap / IMapGrid comps (#12357)	2022-11-04 10:12:25 +11:00
Morbo	2f11da37e8	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-29 10:36:00 +03:00
Jacob Tong	dfd72c5db2	Fix aghost when aghosting from a ghost (#12252)	2022-10-28 19:38:53 -07:00
Morbo	a93a3fb752	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_dirty.png # Resources/Textures/Tiles/white.png	2022-10-23 17:55:21 +03:00
DrSmugleaf	f323fb7644	ECS and cleanup body system, merge body templates and presets into body prototypes (#11991) ... Co-authored-by: Jezithyr <Jezithyr@gmail.com>	2022-10-22 15:46:28 -07:00
Morbo	8ffba84896	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-21 19:51:57 +03:00
Kara	7ad867fa0f	Slight localization func cleanup (#11380)	2022-10-18 19:51:18 -07:00
Morbo	3af5b83703	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Maps/cluster.yml	2022-10-18 21:23:46 +03:00
Leon Friedrich	c44f173f5e	Fix aghost parenting issues. (#11936)	2022-10-16 10:26:24 +11:00
Morbo	57d8a459bb	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Humanoid/Sex.cs # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml	2022-10-16 02:03:26 +03:00
Morb	5af82ebe9b	Add briefcase in hand & update setoutfit (#11634)	2022-10-15 14:22:27 -07:00
Morbo	ee06a9e19a	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Interaction/SharedInteractionSystem.cs # Resources/Locale/en-US/job/job-names.ftl # Resources/Prototypes/Datasets/Names/revenant.yml # Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml	2022-10-07 18:01:36 +03:00
Nemanja	f6234c7920	view ghosts on round end (#11680) ... * view ghosts on round end * now make it good * it toggles now i hope	2022-10-05 21:55:11 -05:00
Morbo	143d408c81	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml	2022-09-16 19:22:52 +03:00
Kara	db1dfc8958	Command perm modifications (#11273) ... * Command perm modifications * actually not this one * string	2022-09-14 19:02:38 -05:00
Visne	356a6b8d2e	Event-ify Rejuvenate (#11145)	2022-09-15 03:30:56 +10:00
metalgearsloth	b3581d11c6	Update maploader to support loading onto an existing map (#10748)	2022-09-14 14:05:48 +10:00
Morbo	9aa9539fe8	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs	2022-09-11 14:26:08 +03:00
metalgearsloth	72bc05e3ac	Add department bans (#11085) ... * Add department bans Also localised some stuff while I was there. * loc	2022-09-08 17:06:21 -05:00
Morbo	59de757713	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Doors/AirlockVisualizer.cs # Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png	2022-09-06 22:21:16 +03:00
Leon Friedrich	414f32a4ee	Make ghost warp use AttachToGridOrMap() (#11069)	2022-09-05 22:36:52 -07:00
Morbo	7d12bbd1a1	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Maps/game.yml	2022-08-31 23:44:39 +03:00
metalgearsloth	5b42861539	Smooth docking traversal (#10822)	2022-08-29 15:05:53 +10:00
Morbo	6b74e70360	Merge remote-tracking branch 'upstream/master' into test2 ... # Conflicts: # Resources/Maps/infiltrator.yml # Resources/Textures/Tiles/attributions.yml	2022-08-16 00:21:46 +03:00
Moony	6fe29d1c66	Update PlayTimeCommands.cs (#10596) ... pjb forgor to make it possible to actually use the command.	2022-08-14 13:16:47 -07:00
wrexbe	c4d135e253	Refactor lobby status (#10550)	2022-08-14 12:54:49 -07:00
Arthur	3077dd134c	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-08-08 02:41:55 +03:00
Moony	a2d8e96a53	Fix localization for playtime. (#10389)	2022-08-08 08:43:27 +10:00
Arthur	6edf90d517	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Maps/infiltrator.yml # Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_1.png # Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_2.png # Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_water_3.png # Resources/Textures/Tiles/attributions.yml	2022-08-07 13:28:53 +03:00
Pieter-Jan Briers	e852ada6c8	Play time tracking: Job timers 3: more titles: when the (#9978) ... Co-authored-by: Veritius <veritiusgaming@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>	2022-08-07 16:00:42 +10:00
Arthur	f4c7e873d4	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Maps/infiltrator.yml # Resources/Textures/Tiles/attributions.yml	2022-08-05 20:32:27 +03:00
metalgearsloth	b7bedcd282	Probably fix adminnotes for offline players (#10292) ... Works with 2 clients on my machine	2022-08-04 17:52:13 +02:00
Arthur	0052df0cf5	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Maps/infiltrator.yml	2022-07-15 15:39:41 +03:00
metalgearsloth	4d5d4cc564	Make controlmob not require sentience (#9479)	2022-07-14 22:34:07 +10:00
Nemanja	5edf2ccad5	EntityStorage ECS (#9291)	2022-07-14 09:11:59 +10:00
Arthur	421895e321	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-08 20:58:22 +03:00
metalgearsloth	a2a5df1990	Damage masks (#9402)	2022-07-06 17:58:14 +10:00
metalgearsloth	bdbed1e665	Allow adminnotes to use username (#9388) ... No I'm not going to the ban panel to find someone's GUID.	2022-07-03 16:34:16 -05:00
Moony	e038ae4820	fix variantize (#9348)	2022-07-02 18:29:47 -07:00
Arthur	e00e09b5f5	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-07-02 03:33:15 +03:00
Moony	8e90bf46e9	Implements panic bunkering. (#9315) ... * Implements panic bunkering. Helps with raid management, esp with unknown accounts. * adds an enable/disable command.	2022-07-01 22:46:37 +02:00
Arthur	e1e7dc2a9d	Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Maps/infiltrator.yml # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml # Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml	2022-06-28 22:33:18 +03:00
Moony	0ec3bc23cb	Revert "Adds a tool for importing .netset files into the ban DB. (#9016)" (#9149) ... This reverts commit b13e672393.	2022-06-25 14:02:41 -05:00