PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

circuitboards

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

grenades

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

implants

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

2015-09-08 08:22:37 +02:00

material

Merge pull request #10110 from mwerezak/shields

2015-09-03 20:38:48 +03:00

melee

Refactors duplicate parry code

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

storage

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

2015-09-11 08:54:03 +02:00

tanks

Added the Resomi.

2015-09-04 08:57:03 +09:30

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

Id card handling changes.

2015-08-21 14:04:06 +02:00

cards_ids.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

cigs_lighters.dm

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

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

clown_items.dm

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

2015-08-12 21:18:18 +02:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Moved cap guns to proper guns.

2015-08-14 05:51:29 +03:00

handcuffs.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

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

Fixes #10548

2015-08-12 12:21:28 -04:00

paint.dm

Fixes #10645

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

paiwire.dm

…

policetape.dm

…

power_cells.dm

Merge branch 'dev' into ofMechfabAndPanic

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

RCD.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

RSF.dm

…

scrolls.dm

…

shields.dm

Refactors duplicate parry code

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

stunbaton.dm

…

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

syndie.dm

…

tape.dm

…

teleportation.dm

…

tools.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07: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

Structures now take damage properly from projectile clouds

2015-08-15 19:08:45 -04:00

weldbackpack.dm

…

wires.dm

…