PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

2015-03-05 08:05:44 +01:00

..

area

Alarm centralization completion

2015-02-23 15:11:13 +01:00

dna

copytext() check for some input

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

gamemodes

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-02-27 09:06:48 +01:00

jobs

Adds paramedic to the medical category. Fixes #8255

2015-02-26 16:37:27 -05:00

machinery

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-05 08:05:44 +01:00

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

Fixes and adjustments

2015-03-04 11:18:40 -05:00

turfs

Merged with dev.

2015-02-24 17:03:39 +10:30

vehicles

…

verbs

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

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

asteroid.dm

…

atoms_movable.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

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

Rewriting the /obj/effect/glowshroom into a more general system.

2015-02-04 10:49:09 +10:30

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

Replaces stool structures with stool items

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