Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev ...

Conflicts:
	code/modules/virus2/helpers.dm

2015-01-19 02:15:38 +06:00

..

circuitboards

Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple.

2014-12-25 20:26:22 +10:30

grenades

Code formatting, EOL at EOF fixes, refactoring

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

implants

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

melee

Fixes #7656

2015-01-09 03:58:43 +10:30

storage

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

tanks

Air tank interface fix

2015-01-13 23:19:58 +13:00

AI_modules.dm

Fix infinite loop in freeform AI module

2014-06-25 23:09:21 +04:00

candle.dm

Changes candle.dm procs to absolute paths

2014-08-31 19:48:34 -07:00

cards_ids.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

cigs_lighters.dm

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

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

Custom loadout updates

2014-11-01 15:56:11 -04: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

Fixes explosives-on-webbing-prevention not working

2014-12-18 05:27:37 +01:00

extinguisher.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-12-25 20:05:01 +10:30

flamethrower.dm

Code formatting, EOL at EOF fixes, refactoring

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

game_kit.dm

…

gift_wrappaper.dm

Code formatting, EOL at EOF fixes, refactoring

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

handcuffs.dm

Code formatting, EOL at EOF fixes, refactoring

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

hydroponics.dm

…

kitchen.dm

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05:00

manuals.dm

Fixes manual runtimes without modifying the construction of every object

2014-12-13 09:35:36 -05:00

mop.dm

Solves a runtime when someone tries to mop up blood.

2014-11-22 03:02:40 -05:00

paint.dm

…

paiwire.dm

Code formatting, EOL at EOF fixes, refactoring

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

power_cells.dm

Fixes typos in powercells.dm

2014-12-17 20:03:04 +01:00

RCD.dm

Fixes #7660

2015-01-05 01:05:13 +10:30

RSF.dm

Code formatting, EOL at EOF fixes, refactoring

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

scrolls.dm

Code formatting, EOL at EOF fixes, refactoring

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

Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.

2014-11-06 19:50:40 -05: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

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

2014-09-29 06:19:26 +09:30

swords_axes_etc.dm

Code formatting, EOL at EOF fixes, refactoring

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

syndie.dm

Code formatting, EOL at EOF fixes, refactoring

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

table_rack_parts.dm

Table/rack refactor. Fixes #7509

2014-12-24 12:14:48 +10:30

tape.dm

Code formatting, EOL at EOF fixes, refactoring

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

teleportation.dm

Code formatting, EOL at EOF fixes, refactoring

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

tools.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-12-25 20:05:01 +10:30

twohanded.dm

Fixes #5910

2014-12-24 22:23:26 +10:30

weaponry.dm

Code formatting, EOL at EOF fixes, refactoring

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

wires.dm

Code formatting, EOL at EOF fixes, refactoring

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