taukausanake b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light ...

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

2019-02-02 22:53:46 -06:00

..

camera

for ansari to view

2018-11-11 15:59:48 -06:00

dead

Devil game mode

2019-01-13 12:00:49 +01:00

living

Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light

2019-02-02 22:53:46 -06:00

new_player

Devil game mode

2019-01-13 12:00:49 +01:00

abilities.dm

…

death.dm

Devil game mode

2019-01-13 12:00:49 +01:00

emote.dm

…

hear_say.dm

revert change causing new handling for single-word messages

2019-01-26 17:45:36 -08:00

holder.dm

…

inventory.dm

…

language.dm

Multilingualism

2018-11-24 00:22:05 -08:00

login.dm

…

logout.dm

Revert "Discord Bot Functionality"

2019-01-30 21:19:33 -05:00

mob_defines.dm

dont_save

2019-01-31 12:10:28 -05:00

mob_grab.dm

…

mob_helpers.dm

ID/Agent ID fixes

2019-01-27 20:36:51 +00:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Devil game mode

2019-01-13 12:00:49 +01:00

say.dm

Multilingualism

2018-11-24 00:22:05 -08:00

status_procs.dm

SSoverlays for human icons, mostly works

2018-11-08 20:24:22 -08:00

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

SSoverlays for human icons, mostly works

2018-11-08 20:24:22 -08:00