4 Commits

Author	SHA1	Message	Date
mwerezak	9b2f5cea33	Merge remote-tracking branch 'upstream/dev' into inventoryfix ... Conflicts: code/game/gamemodes/revolution/rp-revolution.dm code/game/machinery/kitchen/juicer.dm code/game/objects/items/stacks/stack.dm code/game/objects/items/weapons/cigs_lighters.dm code/game/objects/structures/stool_bed_chair_nest/stools.dm code/modules/destilery/main.dm code/modules/hydroponics/biogenerator.dm code/modules/mob/living/carbon/human/inventory.dm code/modules/mob/living/carbon/monkey/inventory.dm code/modules/projectiles/guns/launcher/pneumatic.dm	2015-03-31 01:37:55 -04:00
mwerezak	486940c9e0	Makes holo objs slightly transparent	2015-03-27 10:32:41 -04:00
mwerezak	6d15809768	Corrects return values for the Topic procs of several computers and some other machines as well.	2015-02-25 21:32:35 -05:00
RavingManiac	8bc85c6bca	Missing files added	2015-02-04 20:40:39 +08:00