Ergovisavi 439aec7b50 Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2013-09-12 18:02:15 -07:00

..

__HELPERS

Revert "Merge pull request #689 from dumpdavidson/changeling_voices_squash"

2013-09-06 22:00:11 -05:00

ATMOSPHERICS

Adding Linda.

2013-08-10 06:15:14 -03:00

controllers

Removes TorBan.

2013-08-12 13:28:11 +01:00

datums

reverts my changes to supply packs. Will address in a later larger pull request.

2013-09-08 20:03:41 -07:00

defines

HONK

2013-08-14 01:54:34 +01:00

FEA

Adding Linda.

2013-08-10 06:15:14 -03:00

game

Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge

2013-09-12 18:02:15 -07:00

js

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

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

LINDA

Adds a fix for 2x1 (glass_large) airlocks.

2013-08-29 19:47:25 -04:00

modules

Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge

2013-09-12 18:02:15 -07:00

unused

Removed a bunch of copy pasted code regarding moving pulled atmos by clicking on turfs or conveyors. Now this is handled by a mob proc, Move_Pulled()

2013-06-21 17:55:32 -03:00

WorkInProgress

Runtime fix for buildmode type path inputs, incorrect paths are now rejected.

2013-07-25 22:55:12 -03:00

__DEFINES.dm

Merge pull request #1166 from Carn/admin_ranks

2013-08-28 11:57:21 -07:00

_compile_options.dm

Remote resources support.

2013-06-25 07:44:57 +01:00

global.dm

Converted the old air alarm wires to use the more structured datum wires.

2013-07-10 12:50:04 +01:00

hub.dm

Updated hub.dm to be slightly more descriptive.

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

names.dm

>Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever

2012-10-24 14:39:36 +00:00

stylesheet.dm

Removes equip_e - Fixes #423

2013-04-24 04:07:39 +01:00

world.dm

Removes TorBan.

2013-08-12 13:28:11 +01:00