mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-20 07:12:55 +00:00
Conflicts: code/game/gamemodes/shadowling/shadowling_abilities.dm code/game/objects/items/devices/flashlight.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/living.dm code/modules/mob/living/silicon/robot/robot.dm Changes to be committed: modified: code/game/gamemodes/shadowling/shadowling_abilities.dm modified: code/game/machinery/computer/computer.dm modified: code/game/machinery/floodlight.dm modified: code/game/objects/items/devices/flashlight.dm modified: code/game/objects/items/devices/paicard.dm modified: code/modules/clothing/head/hardhat.dm modified: code/modules/clothing/spacesuits/hardsuit.dm modified: code/modules/clothing/spacesuits/plasmamen.dm modified: code/modules/lighting/lighting_atom.dm modified: code/modules/mob/living/carbon/human/human.dm modified: code/modules/mob/living/living.dm modified: code/modules/mob/living/silicon/pai/pai.dm modified: code/modules/mob/living/silicon/pai/software_modules.dm modified: code/modules/mob/living/silicon/robot/robot.dm modified: code/modules/pda/PDA.dm modified: code/modules/power/lighting.dm modified: code/modules/projectiles/gun.dm