Jordie0608 ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi

2015-04-08 22:51:45 +10:00

..

laborcamp

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

equipment_locker.dm

Merge pull request #8624 from Cheridan/day42_betsoff

2015-04-02 20:15:18 +11:00

machine_input_output_plates.dm

…

machine_processing.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

machine_stacking.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

machine_unloading.dm

…

mine_areas.dm

Area Ambiance Refactor

2014-05-06 21:40:28 -05:00

mine_items.dm

pre-map compile

2015-04-08 15:40:41 +10:00

mine_turfs.dm

cyborg drills use internal battery first + charging fix

2015-03-31 21:24:48 +11:00

mint.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

money_bag.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

ores_coins.dm

A lot of stuff

2015-03-31 18:30:09 +12:00

satchel_ore_boxdm.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00