Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

antagonists

Fixes the false armblade removal timer. Refactors addtimer (#21714)

2016-11-25 22:05:58 +13:00

diseases

w_class now uses defines

2016-12-01 21:33:14 -08:00

helper_datums

Merge pull request #21584 from RemieRichards/swarmer_boss

2016-12-01 07:47:54 -06:00

martial

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

ruins

Swarmer Boss is now in a Ruin (Cost 20)

2016-11-25 17:58:49 +00:00

status_effects

Clockcult Cyborgs can charge from Sigils of Transmission (#21558)

2016-11-17 12:29:21 +13:00

weather

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00

wires

Fixes all remaining addtimers missed

2016-11-27 08:31:07 +00:00

action.dm

[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)

2016-11-25 13:26:43 +13:00

ai_laws.dm

Allows the possible roundstart random AI laws to be customized in config. (#21414)

2016-11-10 09:27:57 +13:00

beam.dm

…

browser.dm

Fixes browser datum's not having a style.

2016-10-09 16:34:33 -07:00

datacore.dm

Fixes kill objectives

2016-08-22 21:58:08 +02:00

datumvars.dm

Fixes some bugs/runtimes. Makes vv var formating use less strings.

2016-11-30 12:50:16 -08:00

dna.dm

corrects some defs without leading slash (#21843)

2016-11-30 20:05:14 +13:00

dog_fashion.dm

…

gas_overrides.dm

Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION

2016-09-02 15:04:51 -07:00

hud.dm

Removes Hand of God gamemode.

2016-09-18 13:32:26 +02:00

martial.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

material_container.dm

Made biogenerator recipes into research datums.

2016-07-31 10:47:36 -04:00

mind.dm

Minor devil fixes (#20770)

2016-10-18 08:45:45 +02:00

mutations.dm

Remove slash from end of type refs/defs

2016-11-30 19:23:15 -08:00

outfit.dm

Neck Slots (#21169)

2016-10-26 19:03:41 +13:00

progressbar.dm

…

recipe.dm

CHEMICAL GAS & Reworks

2016-08-31 19:35:39 -07:00

ruins.dm

…

shuttles.dm

Merge pull request #21647 from KorPhaeron/buildyourownshuttle

2016-11-25 10:13:53 +13:00

votablemap.dm

…