Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-03-28 19:14:59 +03:00

..

circuitboards

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

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

grenades

Chemistry commit

2015-03-25 19:09:10 +03:00

implants

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

melee

Removes FPRINT and TABLEPASS flags

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

storage

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

tanks

Implements fuel fires

2015-03-02 12:40:01 -05:00

AI_modules.dm

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

2015-03-23 01:38:09 +03: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

Chemistry commit

2015-03-25 19:09:10 +03:00

clown_items.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

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

Chemistry commit

2015-03-25 19:09:10 +03:00

flamethrower.dm

Removes FPRINT and TABLEPASS flags

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

game_kit.dm

…

gift_wrappaper.dm

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

handcuffs.dm

Preliminary work on converting all monkeys to a human subspecies.

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

hydroponics.dm

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

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

kitchen.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

manuals.dm

Changed supermatter engine manual for thermoelectric engine.

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

mop.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

paint.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

paiwire.dm

Code formatting, EOL at EOF fixes, refactoring

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

policetape.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03: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

…

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

Removes FPRINT and TABLEPASS flags

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

syndie.dm

Code formatting, EOL at EOF fixes, refactoring

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

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

Chemistry commit

2015-03-25 19:09:10 +03: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

Chemistry commit

2015-03-25 19:09:10 +03:00

wires.dm

Code formatting, EOL at EOF fixes, refactoring

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