Markolie 4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals ...

# Conflicts:
#	icons/effects/beam.dmi

2017-02-11 18:26:06 +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

Add slot_collar, remove simple_animal add_inv/remove_inv

2017-01-29 13:26:54 -08:00

combat.dm

Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord

2017-02-06 01:42:32 +01: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

Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor

2017-01-26 03:47:30 -08:00

game.dm

…

gamemode.dm

ckeyless humans don't get to be shot

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

genetics.dm

Uses the Disabilities system more correctly

2017-01-26 04:10:55 -05:00

hud.dm

Merge pull request #6286 from uraniummeltdown/aimech

2017-02-06 04:04:34 -08:00

hydroponics.dm

…

inventory.dm

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

is_helpers.dm

Add Station Goals

2017-01-23 22:02:29 +01:00

language.dm

…

layers.dm

Minor fixes, prevent ABSTRACT items from being summoned

2017-02-07 23:54:50 +01:00

lighting.dm

Goonlights

2017-02-05 07:08:17 -08:00

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

Botany Rework

2017-01-21 18:28:03 -05: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 stationgoals

2017-02-11 18:26:06 +01:00

mob.dm

Polishes up the reset_view proc, which is basically

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

pda.dm

…

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

Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage

2017-01-23 01:56:47 -05:00

reagents.dm

Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord

2017-02-06 01:42:32 +01: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