Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev ...

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

2015-02-04 04:44:09 +06:00

..

circuitboards

Removes FPRINT and TABLEPASS flags

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

grenades

Removes FPRINT and TABLEPASS flags

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

implants

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

melee

Removes FPRINT and TABLEPASS flags

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

storage

Removes FPRINT and TABLEPASS flags

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

tanks

Removes FPRINT and TABLEPASS flags

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

AI_modules.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

autopsy.dm

Another pass at WIP folder

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

candle.dm

…

cards_ids.dm

Merge remote-tracking branch 'upstream/master' into TheGreatPurge

2015-02-03 14:16:14 +01:00

cigs_lighters.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA

2015-02-03 18:30:18 +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

Removes FPRINT and TABLEPASS flags

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

dice.dm

Fixes #7619

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

dna_injector.dm

More name updates and refactoring for research

2014-12-18 03:26:55 +01:00

explosives.dm

Removes FPRINT and TABLEPASS flags

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

extinguisher.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA

2015-02-03 18:30:18 +03:00

flamethrower.dm

Removes FPRINT and TABLEPASS flags

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

game_kit.dm

…

gift_wrappaper.dm

Code formatting, EOL at EOF fixes, refactoring

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

handcuffs.dm

Removes FPRINT and TABLEPASS flags

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

hydroponics.dm

Removes FPRINT and TABLEPASS flags

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

kitchen.dm

Removes FPRINT and TABLEPASS flags

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

manuals.dm

Old link was replaced by new one

2015-01-08 22:26:31 +01:00

mop.dm

Removes FPRINT and TABLEPASS flags

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

paint.dm

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

2015-02-01 23:04:18 +01: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

Removes FPRINT and TABLEPASS flags

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

scrolls.dm

Merge pull request #7801 from Mloc/bs12-glowypipes

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

shards.dm

Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.

2014-12-28 19:16:07 +10:30

shields.dm

Removes FPRINT and TABLEPASS flags

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

stunbaton.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

surgery_limbattachment.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01: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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA

2015-02-03 18:30:18 +03:00

twohanded.dm

Merge pull request #7582 from Zuhayr/richard

2015-02-03 18:10:34 +03:00

weaponry.dm

Merge pull request #7582 from Zuhayr/richard

2015-02-03 18:10:34 +03:00

weldbackpack.dm

Another pass at WIP folder

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

wires.dm

Code formatting, EOL at EOF fixes, refactoring

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