cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a9dda6cf3f0fbc8632bc54d045bd59c264d49453
CHOMPStation2/code/modules/mining
History
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge 
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
..
drilling
Mech chargers are now a single machine
2015-08-16 06:07:36 -07:00
abandonedcrates.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-14 08:21:12 +02:00
alloys.dm
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
coins.dm
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
machine_input_output_plates.dm
…
machine_processing.dm
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-08-23 01:30:46 -04:00
machine_stacking.dm
Removes machinedir on in machine_processing.dm and machine_stacking.dm
2015-07-07 18:43:59 -04:00
machine_unloading.dm
…
mine_items.dm
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-08-23 01:30:46 -04:00
mine_turfs.dm
colony-1 could not be saved, unfortunately. RIP
2015-08-23 18:04:47 -04:00
mineral_effect.dm
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
mint.dm
Fixes #10314
2015-08-02 00:01:10 -04:00
money_bag.dm
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
ore_datum.dm
Finalized wall refactor.
2015-04-26 12:58:57 +09:30
ore.dm
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00
satchel_ore_boxdm.dm
Updates the atom_pool, now datum_pool, to handle any datum object.
2015-04-24 09:59:05 +02:00