PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge ...

Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm

2015-02-03 14:16:14 +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

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

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

machinery

Merge remote-tracking branch 'upstream/master' into TheGreatPurge

2015-02-03 14:16:14 +01:00

magic

…

mecha

Merge pull request #7924 from Kelenius/ofTablesAndPass

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

objects

Merge remote-tracking branch 'upstream/master' into TheGreatPurge

2015-02-03 14:16:14 +01:00

turfs

fix wall burning runtime, balance rwalls

2015-01-16 23:58:15 +00: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