Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

crates_lockers

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

stool_bed_chair_nest

Grammar patch 1

2014-04-08 14:48:31 +03:00

barsign.dm

…

bedsheet_bin.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

coathanger.dm

…

displaycase.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

door_assembly.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

electricchair.dm

…

extinguisher.dm

Can no longer use fire extinguisher closet without hands

2014-03-31 18:19:25 +03:00

false_walls.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

flora.dm

Same fix again.

2013-10-21 04:48:07 +03:00

girders.dm

Girder health/laserkill fix

2013-11-23 18:50:15 -05:00

grille.dm

Fixes #4923

2014-05-09 21:29:44 +09:30

inflatable.dm

Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.

2014-04-28 00:28:06 +08:00

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

Update lattice.dm

2014-01-18 00:16:14 +01:00

mineral_doors.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

mirror.dm

…

mop_bucket.dm

…

morgue.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

musician.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

noticeboard.dm

…

safe.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

signs.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

tables_racks.dm

Fixes #4034

2013-12-18 11:17:17 +10:30

tank_dispenser.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

target_stake.dm

…

transit_tubes.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

watercloset.dm

Cannot wash your missing hands anymore

2014-03-31 21:13:26 +03:00

windoor_assembly.dm

Fixed inexplicable reversions.

2014-02-19 17:11:09 -07:00

window.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00