skull132 7c5c835a7f Merge branch 'master' into development

2017-08-15 23:01:15 +03:00

..

antagonist

Merge branch 'master' into development

2017-08-06 22:09:41 +03:00

area

Adds the merchant station, the shuttle and the station's dock (#3254)

2017-08-13 23:31:50 +03:00

dna

Machinery Component Initialization Refactor (#3258)

2017-08-09 20:33:14 +03:00

gamemodes

Human icon key & preferences tweaks (#3274)

2017-08-14 01:01:40 +03:00

jobs

Merge branch 'master' into development

2017-08-06 22:09:41 +03:00

machinery

Merge branch 'master' into development

2017-08-13 23:30:37 +03:00

magic

clean up some legacy code (#3211)

2017-08-02 19:53:23 +03:00

mecha

Machinery Component Initialization Refactor (#3258)

2017-08-09 20:33:14 +03:00

modifiers

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

objects

Merge branch 'master' into development

2017-08-15 23:01:15 +03:00

turfs

Merge branch 'master' into development

2017-08-11 22:56:23 +03:00

verbs

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

atoms_init.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

atoms_movable.dm

Fix parallax again (#3279)

2017-08-13 19:46:23 +03:00

atoms.dm

Fashion update 2.0 (#3229)

2017-08-13 23:30:59 +03:00

base_turf.dm

Misc changes & Fixes (#2922)

2017-07-03 00:22:07 +03:00

periodic_news.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

response_team.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

shuttle_engines.dm

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

skincmd.dm

…

sound.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

supplyshuttle.dm

More macros (#2955)

2017-07-06 23:37:58 +03:00