Miniature f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git ...

Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm

2011-12-03 19:28:10 +10:30

..

alien

Facehuggers now can be purged with fire.

2011-10-30 13:12:45 +00:00

closets

Fixed issue 222.

2011-12-01 20:02:43 +00:00

devices

Fixed issue 222.

2011-12-01 20:02:43 +00:00

items

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30

radio

Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209.

2011-11-26 15:58:50 +00:00

secstorage

Fixed issue 222.

2011-12-01 20:02:43 +00:00

stacks

Fix for husk revival.

2011-11-14 19:16:35 +00:00

storage

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30

tanks

Timers will no longer go off when you set them to 0 unless they are on.

2011-11-05 05:25:22 +00:00

biomass.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

blood.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

bodybag.dm

Cleanbots have Janitor level access rather than Detective.

2011-10-19 02:40:11 +00:00

bombspawner.dm

Organs:

2011-10-08 10:38:01 +00:00

cleaner.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

closets.dm

Fixed issue 222.

2011-12-01 20:02:43 +00:00

displaycase.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

door_assembly.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

effect_system.dm

Implemented more getters/setters for damage system. 2

2011-11-26 13:33:18 +00:00

empulse.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

explosion.dm

Tension Report

2011-10-05 02:00:41 +00:00

gibs.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

glowshroom.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

grille.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

items.dm

Timers will no longer go off when you set them to 0 unless they are on.

2011-11-05 05:25:22 +00:00

kitchen.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

lamarr.dm

Facehugger overhaul

2011-10-28 17:17:01 +00:00

mineral_doors.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

new_year.dm

Fixed issue 222.

2011-12-01 20:02:43 +00:00

noticeboard.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

object_procs.dm

Fixed hearing in lockers (and pipes, i-cards, etc).

2011-03-23 09:56:01 +00:00

portals.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

shooting_range.dm

Final fixes for the firing range. This SHOULD be the last of them.

2011-11-24 00:29:36 +00:00

sign_decals.dm

Fixed a small bug with meteors.

2011-11-03 19:07:56 +00:00

stool.dm

Energy projectiles work again.

2011-10-11 07:52:30 +00:00

structures.dm

Fixed a rechargestation runtime.

2011-10-04 03:48:45 +00:00

tables_racks.dm

Fixes camera casings not fitting in lockers, fixes being able to delete cameras completely by moving away after wrenching them.

2011-10-20 03:57:38 +00:00

tank.dm

Timers will no longer go off when you set them to 0 unless they are on.

2011-11-05 05:25:22 +00:00

toys.dm

Organs:

2011-10-08 10:38:01 +00:00

transfer_valve.dm

The infinite cells return proc has been set to return 1 rather than null.

2011-10-13 06:58:20 +00:00

washing_machine.dm

- Fixed a bug where putting a crayon into a washing machine, closing it and opening would disallow you from putting another crayon in. If you then tried to wash something, it'd color it in the crayon's color, but wouldn't delete the crayon, which wasn't in the actual machine anymore.

2011-09-22 15:51:59 +00:00

weapons.dm

Implemented more getters/setters for damage system. 2

2011-11-26 13:33:18 +00:00

window.dm

Fixes issue 178. Including placing modules into disposals.

2011-11-16 20:42:05 +00:00