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

# Conflicts:
#	code/__DEFINES/misc.dm

2019-04-12 19:44:31 +02:00

..

_globals.dm

…

_readme.dm

…

admin.dm

NTSL2 fixes (ParadiseSS13/Paradise#10232)

2018-11-15 11:03:16 -08:00

antagonists.dm

…

atmospherics.dm

tweak

2019-04-09 11:32:21 -04:00

bots.dm

honk_bot from V2

2019-01-21 12:31:47 -03:00

callbacks.dm

…

clothing.dm

Improve slot accessory handling

2019-04-03 22:50:34 +02:00

combat.dm

Merge pull request #11151 from Fox-McCloud/suicide-refactor

2019-03-29 20:49:18 +08:00

components.dm

Hotkeys + slime scanner + hell yea

2019-02-14 18:31:22 -08:00

construction.dm

…

contracts.dm

Activates friendship contracts.

2019-01-13 18:35:30 +01:00

crafting.dm

…

error_handler.dm

…

flags.dm

General Lavaland fixes, add Hierophant ruin

2019-03-31 01:12:10 +01:00

game.dm

…

gamemode.dm

The Nations Update Everyone Deserves!

2019-04-06 20:30:04 -04:00

genetics.dm

Woop woop Travis

2019-02-06 19:43:53 -07:00

hud.dm

forgot this hud.

2019-04-09 23:28:19 -04:00

hydroponics.dm

…

inventory.dm

…

is_helpers.dm

Further turf updates, add Necropolis/boss turfs

2019-03-30 01:24:03 +01:00

language.dm

Multilingualism

2018-11-24 00:22:05 -08:00

layers.dm

Refactor catwalks to not be floors, update chasms and fix Lavaboat

2019-04-04 22:01:25 +02:00

lighting.dm

…

machines.dm

multitool fixes

2018-11-20 14:21:25 +01:00

math.dm

Atmos Define Cleanup + Plasma Tweaks

2019-04-09 11:22:01 -04:00

MC.dm

…

medal.dm

Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional

2019-04-04 17:43:15 +02:00

misc.dm

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

2019-04-12 19:44:31 +02:00

mobs.dm

Removed unneeded definitions.

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

move_force.dm

for ansari to view

2018-11-11 15:59:48 -06:00

pda.dm

…

pipes.dm

…

preferences.dm

Merge branch 'master' into mhelp-ticket-system

2019-04-07 14:43:49 +02:00

process_scheduler.dm

…

qdel.dm

…

reagents.dm

…

role_preferences.dm

Alphabetical prefs

2019-03-18 17:28:01 +00:00

rolebans.dm

…

shuttle.dm

it's alive

2019-02-06 20:01:30 +00:00

sight.dm

…

snpc.dm

…

sound.dm

…

stat.dm

…

station_goals.dm

Fixes BSA size

2019-01-07 18:11:13 +00:00

status_effects.dm

blood drunk miner

2019-04-04 20:34:26 +01:00

subsystems.dm

…

tick.dm

…

typeids.dm

…

vv.dm

…

zlevel.dm

…