Commit Graph

6 Commits

Author SHA1 Message Date
Rob Nelson
e7d4c1db14 OH GOD YOU CAN BUILD PODS NOW OH GOD
Conflicts:
	code/datums/helper_datums/construction_datum.dm
	code/game/machinery/constructable_frame.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/mecha_construction_paths.dm
	code/game/mecha/mecha_parts.dm
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2014-05-17 19:05:08 -04:00
d3athrow
d5e4fd0f33 Muh pod equipment
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-03-24 07:49:37 -04:00
d3athrow
8ff71e7626 Temporary pod changes
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:23:49 -04:00
d3athrow
d680d978f1 Nuh 2014-03-22 06:23:28 -04:00
d3athrow
00f542c267 Remove debug verb 2014-03-22 06:23:13 -04:00
d3athrow
68012f5017 Fixed a gamebreaking bug
Conflicts:
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/life.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:22:55 -04:00