phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

holiday

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

wizard

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

_event.dm

…

abductor.dm

Revenants now spawn

2016-08-14 13:56:30 -04:00

alien_infestation.dm

Revenants now spawn

2016-08-14 13:56:30 -04:00

anomaly_bluespace.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

Balances pyro anomaly (#18310)

2016-06-08 19:23:10 +12:00

anomaly_vortex.dm

…

anomaly.dm

…

blob.dm

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

brand_intelligence.dm

…

camerafailure.dm

…

carp_migration.dm

…

communications_blackout.dm

…

devil.dm

Revenants now spawn

2016-08-14 13:56:30 -04:00

disease_outbreak.dm

…

dust.dm

What song is this?

2016-08-04 21:01:29 +02:00

electrical_storm.dm

…

false_alarm.dm

…

ghost_role.dm

abort and refund

2016-08-26 18:18:11 -07:00

grid_check.dm

Removes SMES power failure.

2016-08-22 19:24:59 -07:00

immovable_rod.dm

Observers can auto-orbit meteors; space dust event (#19142)

2016-07-09 18:16:11 +12:00

ion_storm.dm

…

major_dust.dm

Reduces meteors

2016-07-17 16:23:37 -07:00

mass_hallucination.dm

…

meateor_wave.dm

Observers can auto-orbit meteors; space dust event (#19142)

2016-07-09 18:16:11 +12:00

meteor_wave.dm

Reduces meteors

2016-07-17 16:23:37 -07:00

operative.dm

Revenants now spawn

2016-08-14 13:56:30 -04:00

portal_storm.dm

…

prison_break.dm

Refactors the Prison Break event into the Grey Tide event

2016-06-04 15:35:55 -07:00

processor_overload.dm

…

radiation_storm.dm

Removes auto maint access

2016-08-21 18:58:22 -07:00

shuttle_loan.dm

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

spacevine.dm

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

2016-09-27 20:03:26 +02:00

spider_infestation.dm

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

spontaneous_appendicitis.dm

…

vent_clog.dm

…

weightless.dm

…

wormholes.dm

…