ikarrus e73586dadf Resolved Conflicts: ...

code/modules/security levels/keycard authentication.dm

2014-03-18 00:17:22 -06:00

..

diseases

Merge pull request #3067 from Giacom/virus_food_mix

2014-03-17 09:02:45 -07:00

helper_datums

Adds a new game option: slow_game_type_odds

2014-02-05 17:58:07 -05:00

spells

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

2014-02-25 05:05:22 +04:00

wires

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

ai_laws.dm

Added a failsafe, default_laws is now a config option.

2013-12-23 13:10:04 +01:00

browser.dm

…

computerfiles.dm

…

datacore.dm

Fixed coloring, overlays on overlays, and blood trails.

2014-02-18 16:54:22 -05:00

datumvars.dm

Fixes #2456 by moving the code which transfers the reagents to ready_proj()

2014-01-20 14:20:54 +00:00

disease.dm

Commiting some soft Updates of commits I'm behind on and Committing the rest via git.

2013-11-17 18:02:43 +00:00

gas_mixture.dm

Removed group_multiplier nonsense from gas_mixture.

2014-02-28 18:12:33 -05:00

mind.dm

Fixed an issue with lesser form and fake death where you would be made a changeling for no reason.

2014-03-02 20:21:55 +02:00

mixed.dm

Initial commit for telescience which uses projectile trajectory to obtain a destination coordinate.

2013-11-09 13:02:15 +00:00

modules.dm

…

recipe.dm

…

spell.dm

- Destroying a mindswapper's old body won't destroy the spells.

2014-01-10 20:04:54 +02:00

sun.dm

…

supplypacks.dm

Added watertank crates

2014-03-10 20:46:53 +00:00

uplink_item.dm

Merge remote-tracking branch 'upstream/master' into TC-Green-Text

2014-02-25 20:19:32 -05:00