Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

circuitboards

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

grenades

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

implants

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

material

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

melee

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

storage

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

tanks

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

2015-10-11 17:37:01 +02:00

AI_modules.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

Adds Syndicate ID sprite

2015-09-20 21:11:49 +02:00

cards_ids.dm

Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source

2015-09-09 02:58:07 -04:00

cigs_lighters.dm

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

2015-08-14 08:34:42 +02:00

clown_items.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

explosives.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

extinguisher.dm

Woodrat Work v8.1 "Glasslock Edition"

2015-08-20 16:55:56 -07:00

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

handcuffs.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

mop_deploy.dm

…

mop.dm

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

2015-08-23 01:30:46 -04:00

paint.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

paiwire.dm

…

policetape.dm

Police tape rewrite

2015-10-22 14:31:04 +02:00

power_cells.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-24 18:16:36 +03:00

RCD.dm

colony-1 could not be saved, unfortunately. RIP

2015-08-23 18:04:47 -04:00

RSF.dm

…

scrolls.dm

…

shields.dm

Headset/shield issues.

2015-10-11 00:54:01 -04:00

stunbaton.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

syndie.dm

…

tape.dm

…

teleportation.dm

…

tools.dm

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

traps.dm

Removes bear traps from the custodial closet, adds autolathe recipe

2015-08-22 02:31:19 -04:00

trays.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

weaponry.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

weldbackpack.dm

…

wires.dm

…