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

..

_readme.dm

…

admin.dm

Fix up \ref's

2016-12-07 07:53:20 +01:00

atmospherics.dm

Sound Defines

2016-08-01 22:28:37 -04:00

bots.dm

Refactors Simple Animal Death and Implements Spawners

2016-07-18 04:13:56 -04:00

clothing.dm

Re-adds PDA slot

2016-07-21 13:04:02 -04:00

combat.dm

Makes shields counter xeno leap more effectively

2016-09-01 11:34:00 -04:00

crafting.dm

Personal Crafting - Initial Commit

2016-07-15 16:25:37 -04:00

error_handler.dm

Adds Error Handling and Realtime Runtime Reviewal (#4679)

2016-06-19 12:53:07 -04:00

flags.dm

Adds Species Levers

2017-01-14 03:51:43 -05:00

game.dm

…

gamemode.dm

ckeyless humans don't get to be shot

2016-09-26 17:43:57 +02:00

genetics.dm

Cloning Update

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

hud.dm

Lay groundwork for megafauna, and add Ashdragon.

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

hydroponics.dm

glowcaps

2015-12-08 16:44:07 -05:00

is_helpers.dm

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

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

language.dm

no stuttering for noise language

2015-10-08 14:24:58 -07:00

lighting.dm

…

logging.dm

Moves many uses of log_to_dd to log_runtime, to make the output

2016-08-24 09:55:19 -07:00

machines.dm

Lights and Static Power: Machine Processing Optimization

2015-10-18 21:06:25 -04:00

math.dm

Removes Default()

2016-05-07 19:31:40 -04:00

misc.dm

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

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

mob.dm

Polishes up the reset_view proc, which is basically

2016-12-21 17:56:57 -08:00

pda.dm

pda refactor

2016-02-12 03:24:21 -05:00

preferences.dm

Fixes new merge conflict from patreon PR

2016-12-02 22:53:08 -08:00

process_scheduler.dm

Timer Controller Update

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

qdel.dm

Replaces qdeleted with a cleaner macro

2016-08-22 23:49:33 -07:00

role_preferences.dm

Giant Spiders no longer clog up the Alien role channel

2017-01-09 13:38:34 -08:00

rolebans.dm

Giant Spiders no longer clog up the Alien role channel

2017-01-09 13:38:34 -08:00

sight.dm

…

snpc.dm

Ports SNPCs

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

stat.dm

THE HACKS HURTS US PRECIOUS

2016-09-27 01:06:48 -04:00

tick.dm

Mass replace

2016-07-07 19:34:02 -07:00

zlevel.dm

Makes space transition checks more consistent

2016-08-22 19:46:23 -07:00