PsiOmega ffa13c68cb Merge remote-tracking branch 'upstream/dev' into CanTrack ...

Conflicts:
	code/modules/mob/living/living_defines.dm

2015-02-03 22:27:22 +01:00

..

area

ERT adjustment and fixes

2015-01-28 13:11:04 -05:00

dna

copytext() check for some input

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

gamemodes

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

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

jobs

Merge pull request #8018 from GinjaNinja32/ai

2015-02-03 16:10:46 +01:00

machinery

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

2015-02-03 22:27:22 +01:00

magic

…

mecha

Merge pull request #7924 from Kelenius/ofTablesAndPass

2015-01-30 16:17:41 +03:00

objects

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

2015-02-03 18:30:18 +03:00

turfs

Conflict fix

2015-01-20 15:02:25 +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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03: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

Moved supply computers to a separate file in machinery/computer/.

2014-12-17 12:53:18 +01:00