Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

crates_lockers

As above.

2013-08-28 23:34:12 -07:00

stool_bed_chair_nest

Fix for #3498.

2013-08-30 04:40:39 +03:00

barsign.dm

Whoa, 2 barsign.dm's? WTF?

2013-07-08 23:25:13 +04:00

bedsheet_bin.dm

…

displaycase.dm

…

door_assembly.dm

Quickfix for multitile doors.

2013-06-25 11:40:01 +03:00

electricchair.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

extinguisher.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

false_walls.dm

-Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)

2013-01-10 19:07:02 +00:00

flora.dm

Fix for #3410.

2013-08-01 20:58:35 +03:00

girders.dm

…

grille.dm

Deconstruction fix.

2013-08-23 15:31:37 +03:00

janicart.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Returned Lamarr.

2013-04-30 16:59:38 +04:00

lattice.dm

…

mineral_doors.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

mirror.dm

Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles.

2013-08-21 23:26:59 +01:00

mop_bucket.dm

- Added a killswitch to the master controller for air processing and pipe processing, accessible through two toggle-verbs in debug verbs.

2013-01-15 07:12:32 +00:00

morgue.dm

Morgue trays now can open in different direction depending on how they are placed.

2013-01-12 09:32:08 +04:00

musician.dm

The code compiles again but I make no promises about whether or not the piano works.

2012-12-30 17:51:49 +00:00

noticeboard.dm

…

safe.dm

…

signs.dm

Part 3: fixing shit

2013-07-06 02:53:06 +04:00

tables_racks.dm

Fixed issue with magical wooden table disassembling.

2013-01-30 01:31:06 +04:00

tank_dispenser.dm

Fixed the order of update/return statements for dispenser.

2013-08-08 23:17:38 -07:00

target_stake.dm

…

transit_tubes.dm

transit pods should reverse direction when they reach the end of the tube

2013-05-14 13:10:28 +10:00

watercloset.dm

Added two ears back.

2013-08-27 22:05:27 +01:00

windoor_assembly.dm

Adding construction of req_one_access doors.

2013-06-18 02:47:24 +03:00

window.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00