TZK13 c0bfd10e49 Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

..

__DEFINES

Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd

2014-12-26 16:14:19 -08:00

__HELPERS

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

_globalvars

Adds socks as an underwear option.

2014-12-22 19:27:46 -06:00

_onclick

Fixes being able to remove clothing and inventory stuff while straightjacketed or handcuffed by clicking the inventory slot, not the worn item itself.

2014-12-14 18:03:49 +01:00

ATMOSPHERICS

Ports the rapid pipe dispenser (RPD) from /vg/

2014-12-25 22:06:39 -03:00

controllers

Merge pull request #6425 from JJRcop/OOCemoji

2014-12-27 03:01:36 -03:00

datums

Conflict fixing

2014-12-25 22:34:40 +01:00

defines

* Added a wrapper proc for A* that returns an empty list when failing to find a path

2014-11-14 00:09:02 +01:00

game

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

js

- Added href getter datum. Returns either what you want or null.

2011-10-11 20:24:14 +00:00

LINDA

Conflicts:

2014-11-13 17:33:32 +01:00

modules

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

_compile_options.dm

Interface for using boost::regex in byond.

2014-11-13 05:55:58 +00:00

hub.dm

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

world.dm

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00