Razharas 4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT ...

Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts

2015-02-25 15:17:14 +03:00

..

holiday

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

wizard

Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2

2015-02-22 11:59:09 +01:00

alien_infestation.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

anomaly_bluespace.dm

…

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

anomaly.dm

…

blob.dm

…

brand_intelligence.dm

Fixes mimic spawning in nullspace if the overridden machinery was qdel'ed.

2015-01-10 00:06:53 +01:00

carp_migration.dm

…

communications_blackout.dm

…

disease_outbreak.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

dust.dm

…

electrical_storm.dm

…

event.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

false_alarm.dm

False Alarm Event Tweaks

2015-01-24 20:14:06 -07:00

immovable_rod.dm

…

ion_storm.dm

…

mass_hallucination.dm

…

meateor_wave.dm

…

meteor_wave.dm

…

ninja.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

prison_break.dm

…

radiation_storm.dm

…

shuttle_loan.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

spacevine.dm

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

2015-02-25 15:17:14 +03:00

spider_infestation.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

spontaneous_appendicitis.dm

…

vent_clog.dm

replaces all instances of pacid with facid

2015-01-21 20:17:23 -06:00

weightless.dm

…

wormholes.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00