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

..

circuitboards

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

2015-03-25 01:06:32 +03:00

grenades

Flash projectile adjustment

2015-02-10 19:54:30 -05:00

implants

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

2015-03-31 01:37:55 -04:00

melee

Removes FPRINT and TABLEPASS flags

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

storage

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

2015-03-31 01:37:55 -04:00

tanks

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

2015-03-31 01:37:55 -04:00

AI_modules.dm

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

2015-03-28 20:26:24 +01:00

autopsy.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

candle.dm

Makes candles last longer

2015-03-18 20:57:51 +03:00

cards_ids.dm

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

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

cigs_lighters.dm

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

2015-03-31 01:37:55 -04:00

clown_items.dm

…

cosmetics.dm

Defines icon file for purple comb

2015-02-18 15:09:40 -05:00

dice.dm

Fixes #7619

2015-01-02 19:28:30 +10:30

dna_injector.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

explosives.dm

Accessories update.

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

extinguisher.dm

Replaces stool structures with stool items

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

flamethrower.dm

Removes FPRINT and TABLEPASS flags

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

game_kit.dm

…

gift_wrappaper.dm

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

2015-03-31 01:37:55 -04:00

handcuffs.dm

Mob refactoring.

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

hydroponics.dm

Tweaks to xenoflora, added plant icons and colours to all plants.

2015-02-04 10:42:39 +10:30

kitchen.dm

Mob refactoring.

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

manuals.dm

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

mop.dm

All cleaning removes paint

2015-02-07 01:41:08 +01:00

paint.dm

Mops clean paint too

2015-02-07 00:18:56 +01:00

paiwire.dm

…

policetape.dm

Mob refactoring.

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

power_cells.dm

Removes FPRINT and TABLEPASS flags

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

RCD.dm

Removes FPRINT and TABLEPASS flags

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

RSF.dm

Conflict fix

2015-02-03 20:57:16 +03:00

scrolls.dm

Merge pull request #7801 from Mloc/bs12-glowypipes

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

shards.dm

Fixes runtime when walking over shards with no shoes

2015-02-14 23:29:11 +00:00

shields.dm

Removes FPRINT and TABLEPASS flags

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

stunbaton.dm

Mob refactoring.

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

surgery_limbattachment.dm

Replaces stool structures with stool items

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

surgery_tools.dm

Removes FPRINT and TABLEPASS flags

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

swords_axes_etc.dm

Mob refactoring.

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

syndie.dm

…

table_rack_parts.dm

Removes FPRINT and TABLEPASS flags

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

tape.dm

Tape fixes

2015-01-26 15:16:27 +13:00

teleportation.dm

Removes FPRINT and TABLEPASS flags

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

tools.dm

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

2015-03-31 01:37:55 -04:00

twohanded.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

weaponry.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

weldbackpack.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

wires.dm

…