Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme

2019-05-04 03:16:38 +02:00

..

devil.dm

Devil game mode

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

flavor_misc.dm

Gonna have to clean some files after this.

2019-01-19 22:38:47 -05:00

fortunes.dm

More fortunes

2018-04-15 16:40:55 +01:00

misc.dm

Makes syndicate comm channel pseudonymous.

2018-10-19 14:34:47 +02:00

mobs.dm

Here we go again

2019-05-03 21:47:07 +08:00

names.dm

Progress...

2019-02-02 17:51:25 +00:00

objects.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-30 19:26:17 +02:00

reagents.dm

Adds jestosterone to standard reagents list

2019-02-13 18:43:13 +00:00

typecache.dm

Updates Components Again

2018-11-02 16:23:46 -04:00