Hubblenaut 5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-02-16 16:16:30 +01: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

Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm

2015-02-14 13:38:05 -05:00

jobs

Merge pull request #8081 from comma/maximumtrinkets

2015-02-10 06:51:30 +01:00

machinery

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03: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

Improves gun scope zooming

2015-02-14 22:12:16 -05:00

objects

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

2015-02-16 16:16:30 +01:00

turfs

Adds two admin weapons and refactors wall damage code.

2015-02-08 04:01:35 -07: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

All cleaning removes paint

2015-02-07 01:41:08 +01: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

…