mwerezak 6c4d16774f Merge remote-tracking branch 'upstream/dev' into mercenary ...

Conflicts:
	code/game/objects/items/devices/uplinks.dm

2015-02-22 20:44:43 -05:00

..

area

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity

2015-02-04 05:15:23 -08:00

dna

copytext() check for some input

2015-02-01 23:16:04 +03:00

gamemodes

Nerfs merc sniper rifle and makes it uplink purchasable

2015-02-22 20:27:06 -05:00

jobs

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

machinery

Merge pull request #8203 from Baystation12/master

2015-02-22 18:24:47 +10:30

magic

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

mecha

Allows exosuits to interface with adjacent airlock controllers and buttons.

2015-02-21 20:54:01 -05:00

objects

Merge remote-tracking branch 'upstream/dev' into mercenary

2015-02-22 20:44:43 -05:00

turfs

Merge pull request #8175 from Kelenius/ofBorgsAndSynths

2015-02-21 11:43:39 +03:00

vehicles

…

verbs

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05:00

json.dm

…

periodic_news.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00