Tigercat2000
27d56bdab1
Update gitignore and mapmerge for tgstyle maptree
...
This commit updates the .gitignore file to ignore the proper files with
the new tree system, and modifies the mapmerge files to the latest -tg-
files, as those are already compatible and written for the new tree
system.
2015-05-11 16:03:07 -07:00
Markolie
ca74026ad3
ED-209 construction fix
2015-01-18 04:28:16 +01:00
Markolie
1d55d8ee32
Fix away mission atmos
2015-01-18 03:08:29 +01:00
Markolie
d593679a22
Fix the library
2015-01-07 03:17:17 +01:00
Markolie
86f80d5a69
IPC fixes galore
2014-12-06 08:28:02 +01:00
Markolie
421c461705
Some more map fixes
2014-11-21 03:17:10 +01:00
fj45
3944c7b2e7
Upgraded Escape and Security Podbays
...
Major changes to the Escape and Security podbays. Minor changes in space
around the vault. Minor change of acute treatment roller beds to beds.
2014-11-11 08:32:15 +08:00
Jeremy Liberman
f43ef06431
Virology - NanoUI, gameplay tweaks, bugfixes
...
Conflicts:
.gitignore
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/machinery.dm
code/modules/food/recipes_microwave.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/virus2/isolator.dm
nano/js/nano_base_helpers.js
2014-04-19 15:42:49 -04:00
ZomgPonies
b42b4de763
Gitignore fixes.
2013-08-24 17:33:27 -04:00
ZomgPonies
a9f4903f0b
Merge updates
2013-08-24 17:22:05 -04:00
ZomgPonies
8c1078b8ff
Updated gitignore
2013-08-14 01:44:43 +04:00
SkyMarshal
fe4d8dda78
EMERGENCY ZAS FIX
2012-08-14 11:34:59 -07:00
Miniature
e1a254c34f
Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json)
2011-12-02 15:47:42 +10:30
Abi79
f18e5405d8
Added the .gitignore files
2011-11-08 02:31:24 +08:00
