Commit Graph

2 Commits

Author SHA1 Message Date
iamgoofball
4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
Rob Nelson
71c07e208a Improved creature AI and random mob spawning in caves.
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00