Xhuis f53897523c Conflicts 2/3

2015-09-19 14:07:24 -04:00

..

diseases

increased confusion multiplier, increased confusion sources

2015-09-13 12:39:41 -06:00

helper_datums

Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring

2015-07-16 13:50:01 +02:00

spells

Merge pull request #11769 from phil235/FixMutations

2015-09-15 22:31:59 +03: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

browser.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

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

Transferred body eggs to new organs system

2015-08-03 23:24:17 +03:00

debug.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

gas_mixture.dm

Changes a lot of del() to qdel()

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

hud.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

martial.dm

Surgery & Organs Rework: Phase 2

2015-08-06 09:56:54 +03:00

material_container.dm

Fix material container

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

mind.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

modules.dm

Changes a lot of del() to qdel()

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

mutations.dm

Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.

2015-09-14 00:58:25 +02:00

outfit.dm

Adds Create Custom Outfit admin verb

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

recipe.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

spell.dm

Changed bloodcrawl to be a spell.

2015-08-31 16:24:27 +01:00

supplypacks.dm

MoreChanges

2015-09-16 18:00:21 +08:00

uplink_item.dm

Traitor item rebalance

2015-09-16 22:55:45 -04:00