mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-26 02:02:39 +00:00
Conflicts: code/_onclick/click.dm code/game/dna/genes/powers.dm code/game/machinery/wishgranter.dm code/modules/mob/living/carbon/alien/alien.dm code/modules/mob/living/carbon/alien/humanoid/life.dm code/modules/mob/living/carbon/alien/larva/life.dm code/modules/mob/living/carbon/human/examine.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_movement.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/carbon/monkey/life.dm code/modules/mob/living/carbon/species.dm code/modules/mob/living/damage_procs.dm code/modules/mob/living/living.dm code/modules/power/lighting.dm code/modules/reagents/Chemistry-Recipes.dm code/setup.dm maps/RandomZLevels/wildwest.dm