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

# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi

2017-01-06 16:36:46 +01:00

..

air.dm

You can now load the cyberiad runtime-free

2016-07-03 15:36:38 -07:00

alarm.dm

…

diseases.dm

-tg- disease1

2016-03-27 21:24:00 -07:00

event.dm

…

fast_process.dm

Cloning Update

2016-08-31 01:48:02 -04:00

fires.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

garbage.dm

…

inactivity.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

lighting.dm

…

machinery.dm

Process deferral and profiling improvements

2016-08-17 02:10:39 -04:00

mob.dm

Clean up mob code a bit

2015-10-27 06:19:24 -07:00

nano_mob_hunter.dm

Fixes up battle terminal connections

2016-12-30 00:12:02 -05:00

nanoui.dm

…

npcai.dm

Minor fix to npc controller

2016-04-17 17:05:59 -04:00

npcpool.dm

Ports SNPCs

2016-04-09 00:10:01 -04:00

obj.dm

…

pipenet.dm

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

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

shuttles.dm

addresses mrrowl comments

2016-12-11 23:11:21 -05:00

sun.dm

You can now load the cyberiad with the map-loader

2016-07-02 22:50:45 -07:00

ticker.dm

You can now load the cyberiad with the map-loader

2016-07-02 22:50:45 -07:00

timer.dm

Timer Controller Update

2016-11-30 17:50:16 -05:00

weather.dm

Added Legion megafauna, updated weather and some minor other refactors/changes.

2016-10-24 02:16:45 +02:00