PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

ai_core.dm

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

2015-09-05 09:24:30 +02:00

aifixer.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

arcade.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

atmos_alert.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

atmos_control.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

buildandrepair.dm

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

2015-08-08 15:34:51 +02:00

camera_circuit.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

camera.dm

Code relocation.

2015-09-11 08:45:49 +02:00

card.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

cloning.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

communications.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

computer.dm

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

2015-10-11 17:17:41 +02:00

crew.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

guestpass.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

law.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

lockdown.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

medical.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

message.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

Operating.dm

mood lighting for computers

2015-05-10 20:54:29 +01:00

pod.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

prisoner.dm

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

2015-06-22 16:59:19 +02:00

prisonshuttle.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

RCON_Console.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

robot.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

security.dm

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

2015-07-14 08:21:12 +02:00

shuttle.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

skills.dm

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

2015-09-02 14:42:27 +02:00

specops_shuttle.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

station_alert.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

supply.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

syndicate_specops_shuttle.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00