Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

2017-01-20 23:43:35 +01:00

..

lists

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

2017-01-20 23:43:35 +01:00

configuration.dm

Lay groundwork for megafauna, and add Ashdragon.

2016-10-23 23:15:57 +02:00

database.dm

SQL update

2015-09-23 06:13:42 +02:00

game_modes.dm

SQL update

2015-09-23 06:13:42 +02:00

genetics.dm

removes stupid sdisabilities

2016-07-21 02:24:54 -04:00

logging.dm

Fixes Investigation Logs and Runtimes

2016-06-24 12:30:49 -04:00

mapping.dm

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

2016-12-30 00:17:56 +01:00

misc.dm

Revert "Merge pull request #4739 from monster860/vg-parallax"

2016-07-28 15:48:27 -07:00

station.dm

Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster

2016-04-29 23:42:47 -04:00

unused.dm

ERT fixes

2016-10-26 03:05:51 +02:00