GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm

2015-08-11 18:47:05 +01:00

..

apc_damage.dm

APC event tweak.

2015-06-01 18:13:05 +02:00

blob.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

brand_intelligence.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

camera_damage.dm

Cameras now have a small chance of being permanently destroyed.

2015-04-27 19:09:46 +02:00

carp_migration.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

comms_blackout.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

communications_blackout.dm

Adds the camera loss event.

2015-04-27 10:47:45 +02:00

disease_outbreak.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

dust.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

electrical_storm.dm

Adds the ACP damage event.

2015-04-27 10:56:14 +02:00

event_container.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

event_dynamic.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

event_manager.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-03 09:33:05 +02:00

event.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

gravity.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

grid_check.dm

Gridcheck event now only announces sometimes

2015-01-10 01:26:49 -05:00

infestation.dm

Fixes vine/infestation events not working with new lighting

2015-06-02 16:56:10 +01:00

ion_storm.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-08-11 18:47:05 +01:00

meteors.dm

Adds spinning animation for meteors.

2015-06-05 15:55:39 +02:00

money_hacker.dm

Request Console cleanup.

2015-06-03 22:38:04 -04:00

money_lotto.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

money_spam.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

prison_break.dm

Fixes double request console messages for prison break event.

2015-06-11 19:38:57 -04:00

radiation_storm.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

random_antagonist.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

rogue_drones.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

space_ninja.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

spacevine.dm

Adds announcement to the space vine event.

2015-05-10 20:40:49 +02:00

spider_infestation.dm

Fixes #9029.

2015-04-30 10:22:58 +02:00

spontaneous_appendicitis.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

viral_infection.dm

Adds logging and admin investigatability (read: checking what the virus does) to virus events

2015-05-27 10:36:45 +01:00

viral_outbreak.dm

Fixed various medical events.

2013-05-26 23:21:08 +02:00

wallrot.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00