3 Commits

Author	SHA1	Message	Date
lessthanthree	8198e578ca	[MANUAL MIRROR] Fix a merge skew on armor datums (#19212) ... * Fix a merge skew on armor datums (#72909) And also add a check grep to find it in the future * fix linters * damn youuuu --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>	2023-02-07 15:20:00 -05:00
SkyratBot	6aebab2146	[MIRROR] MODsuit module update: clamp nerf, replacement of holster and pepper spray modules, some tweaks to suit starting modules [MDB IGNORE] (#12783) ... * MODsuit module update: clamp nerf, replacement of holster and pepper spray modules, some tweaks to suit starting modules * Update mod_control.dm * fixes * fix2 Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>	2022-04-18 20:34:32 -07:00
SkyratBot	5910fd9649	[MIRROR] MOD update: Modular Cores [MDB IGNORE] (#10710) ... * MOD update: Modular Cores * Fixing all dem conflicts * Okay now it's going to compile too * Fixing some Trigger() (they triggered me) Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>	2022-01-16 15:25:41 -05:00