mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm

2015-02-13 01:57:19 -05:00

..

crates_lockers

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

stool_bed_chair_nest

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

barsign.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

bedsheet_bin.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

coathanger.dm

Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

curtains.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

displaycase.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

door_assembly.dm

Fixes #5220

2014-12-23 13:23:35 +10:30

electricchair.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

extinguisher.dm

Fix most nullspace items, rewrite floor tiles not to del() on every place/remove

2014-11-24 17:05:46 +00:00

false_walls.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

flora.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

girders.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

grille.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

inflatable.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

janicart.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00

kitchen_spike.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

ladders.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

lamarr_cage.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

lattice.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

mineral_doors.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

mirror.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

mop_bucket.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

morgue.dm

Buttons refactoring. Introduced wonders of inheritance, cutting down on inconsistencies and copypaste.

2015-02-06 09:53:05 +03:00

musician.dm

…

noticeboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

safe.dm

Accessories update.

2015-02-08 12:35:50 +03:00

signs.dm

Fixed capitalization of most game items

2014-12-18 03:10:36 +01:00

tables_racks.dm

Fixes #7508

2014-12-24 12:43:36 +10:30

tank_dispenser.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

target_stake.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

transit_tubes.dm

Fixes broken span statement.

2014-12-11 19:05:59 +01:00

watercloset.dm

Ported TG's code for burny mobs, by ergoslavi.

2015-01-15 23:47:07 +03:00

windoor_assembly.dm

Fixed capitalization of most game items

2014-12-18 03:10:36 +01:00

window.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30