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

..

crates_lockers

Merge pull request #8603 from Baystation12/dev-freeze

2015-03-24 14:00:57 +01:00

stool_bed_chair_nest

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

2015-03-31 01:37:55 -04: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

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

door_assembly.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

electricchair.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

extinguisher.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04: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

Fixes #7877

2015-02-28 16:47:41 +10:30

grille.dm

Fixes #8485

2015-03-24 13:20:24 +10:30

inflatable.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

janicart.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

kitchen_spike.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

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

Resolving bugs with spawn order and delays.

2015-03-21 11:49:42 +10:30

mop_bucket.dm

Removes FPRINT and TABLEPASS flags

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

morgue.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +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

Mob refactoring.

2015-03-29 10:44:31 +02:00

tank_dispenser.dm

Code formatting, EOL at EOF fixes, refactoring

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

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

Partial breathing refactor

2015-03-09 00:09:34 -04:00

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +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

Mob refactoring.

2015-03-29 10:44:31 +02:00