PsiOmega fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm

2015-06-07 10:30:27 +02:00

..

circuitboards

Merge pull request #9199 from Techhead0/voidmachine-englishlists

2015-05-12 14:20:37 +09:30

grenades

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

implants

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

material

Fixes #9597

2015-06-06 11:20:56 +09:30

melee

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

storage

Entirely removes briefcase instastun and pointless New() definition

2015-06-05 09:00:19 +01:00

tanks

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

2015-06-07 10:30:27 +02:00

AI_modules.dm

…

autopsy.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

candle.dm

Useless lights galore, adding small/colorful lights:

2015-05-12 10:23:24 +03:00

cards_ids.dm

First pass on custom item cleanup/refactor.

2015-05-12 10:53:16 +09:30

cigs_lighters.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

clown_items.dm

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

2015-04-24 17:13:37 +02:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173.

2015-05-15 23:19:57 +09:30

explosives.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

extinguisher.dm

Fixes #9380

2015-05-20 16:44:47 +01:00

flamethrower.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

game_kit.dm

…

gift_wrappaper.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

handcuffs.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

hydroponics.dm

…

improvised_components.dm

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

kitchen.dm

Restructuring a bunch of files in prep for widespread path changes.

2015-05-16 20:09:28 +09:30

manuals.dm

Minor fixes to supermatter manual text

2015-04-05 22:40:19 +10:00

mop.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

paint.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

paiwire.dm

…

policetape.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

power_cells.dm

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

2015-05-22 08:26:13 +02:00

RCD.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

RSF.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

scrolls.dm

…

shields.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stunbaton.dm

Refactor floodlights

2015-05-28 21:45:54 +02:00

surgery_limbattachment.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

surgery_tools.dm

Sets w_class for external organs

2015-05-30 19:02:37 -04:00

swords_axes_etc.dm

…

syndie.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

tape.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

teleportation.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

tools.dm

Merge with dev.

2015-05-20 13:39:31 +09:30

traps.dm

Updates bear traps

2015-05-24 16:33:41 -04:00

trays.dm

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

weaponry.dm

Restructuring a bunch of files in prep for widespread path changes.

2015-05-16 20:09:28 +09:30

weldbackpack.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

wires.dm

…