nevimer f2b71e7686 Merge remote-tracking branch 'skrat/master' into upstream-nov-19-2023 ...

# Conflicts:
#	_maps/skyrat/automapper/templates/deltastation/deltastation_armory.dmm
#	code/modules/mob/living/simple_animal/guardian/guardian.dm
#	html/changelogs/archive/2023-11.yml
#	modular_skyrat/master_files/code/datums/traits/neutral.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	modular_skyrat/modules/mold/code/mold.dm
#	modular_skyrat/modules/mold/code/mold_mobs.dm

2023-11-19 14:16:20 -05:00

..

corpses

[MIRROR] Basic Wizards [MDB IGNORE] (#24783)

2023-11-04 20:58:11 -04:00

ghost_roles

Merge remote-tracking branch 'skrat/master' into upstream-nov-19-2023

2023-11-19 14:16:20 -05:00

mob_spawn.dm

[MIRROR] Fixes a runtime with AI targeting code, refactors faction checking to be at the atom/movable level [MDB IGNORE] (#24386)

2023-10-16 21:41:24 -04:00