mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-04-04 19:42:58 +01:00
Conflicts: code/game/area/areas.dm code/game/turfs/turf.dm code/modules/clothing/shoes/magboots.dm code/modules/mob/living/carbon/human/human_movement.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defines.dm code/modules/mob/mob_movement.dm code/modules/power/gravitygenerator.dm