ZomgPonies
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
Segrain
dcf984577a
Adding construction of req_one_access doors.
2013-06-18 02:47:24 +03:00
Segrain
91e1e848f7
Bugfixes for windoor construction.
2013-06-18 02:34:15 +03:00
Cael_Aislinn
4c500f8b1c
Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/devices/uplinks.dm
code/game/objects/weapons.dm
code/modules/mining/mine_items.dm
html/changelog.html
icons/obj/chemical.dmi
maps/tgstation.2.0.9.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-08-24 21:55:58 +10:00
johnsonmt88@gmail.com
9e30e7d2ec
Moving stuff around part 2!
...
Committing this early to allow pete to commit something involving the .dme file which would probably conflict otherwise.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4514 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-22 16:32:45 +00:00
