alberyk 2294b4f0c5 Merge branch 'master' into computer_tweaks ...

# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi

2021-10-29 21:41:30 -03:00

..

programs

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

computer_file.dm

Modular PDAs: The End of an Era (#10319)

2020-11-01 21:09:50 +02:00

data.dm

a small addition

2020-04-15 19:58:18 +02:00

news_article.dm

a small addition

2020-04-15 19:58:18 +02:00

program_events.dm

New chat client / messenger (#10654)

2021-01-11 10:04:16 +01:00

program.dm

New chat client / messenger (#10654)

2021-01-11 10:04:16 +01:00

script.dm

NTSL2++ sucessor to NTSL2+ (#9321)

2021-02-05 16:05:21 +02:00