Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk ...

Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi

2015-11-07 15:56:39 -03:00

..

diseases

Fixes wizarditis runtime

2015-10-25 23:50:07 -07:00

helper_datums

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

spells

Shapeshift Spell

2015-11-02 00:28:58 +01:00

wires

Assemblies update

2015-09-04 11:22:37 +03:00

ai_laws.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

beam.dm

Adds a few checks in beam code to make it compatible with turfs.

2015-11-04 22:12:13 -05:00

browser.dm

…

datacore.dm

Fixes monkeyize/humanize removing the mob's viruses when they should be kept.

2015-09-13 22:52:38 +02:00

datumvars.dm

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

debug.dm

…

gas_mixture.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

hud.dm

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

2015-11-07 15:56:39 -03:00

martial.dm

Generalizes deflection to all martial arts

2015-10-05 12:01:31 -04:00

material_container.dm

Fix material container

2015-09-13 23:35:49 +01:00

mind.dm

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

2015-11-07 15:56:39 -03:00

modules.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

mutations.dm

Merge pull request #12455 from TheDreamweaver/master

2015-10-23 20:52:01 +03:00

outfit.dm

Adds Create Custom Outfit admin verb

2015-09-08 14:41:15 +02:00

recipe.dm

…

spell.dm

Changes spell sound mechanics

2015-10-31 23:27:27 -04:00

supplypacks.dm

InitalCommit

2015-10-15 01:51:54 +08:00

uplink_item.dm

Gamemode override for uplinks

2015-10-05 12:13:37 +02:00

votablemap.dm

map rotation base code

2015-09-30 07:13:38 -07:00