PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02:00

..

atmoalter

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

bots

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

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

camera

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

2015-06-16 10:52:33 +02:00

computer

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

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

computer3

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

doors

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

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

embedded_controller

…

kitchen

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

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

pipe

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

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

telecomms

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

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

adv_med.dm

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

2015-06-26 20:28:47 +02:00

ai_slipper.dm

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

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

alarm.dm

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

2015-06-24 18:15:28 +02:00

atmo_control.dm

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

autolathe_datums.dm

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

2015-05-22 08:26:13 +02:00

autolathe.dm

Autolathe now spits out stuff on it's location instead of at your feet

2015-06-13 00:46:59 -07:00

Beacon.dm

…

bees_items.dm

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

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

biogenerator.dm

…

bioprinter.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

bluespacerelay.dm

Fixes bluespace relay issues (being un deconstructable, and not building properly.

2015-05-28 03:56:53 +01:00

buttons.dm

…

CableLayer.dm

…

cell_charger.dm

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

2015-06-02 17:33:20 +01:00

cloning.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

commsbantenna.dm

…

constructable_frame.dm

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

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

cryo.dm

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

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

cryopod.dm

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

2015-06-16 10:52:33 +02:00

deployable.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

door_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

doppler_array.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

flasher.dm

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

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

floodlight.dm

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

2015-05-30 16:11:57 +02:00

floorlayer.dm

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

hologram.dm

Ports /tg/'s meteor implementation.

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

holosign.dm

Fixes #9847

2015-06-20 22:15:38 +09:30

igniter.dm

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

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

iv_drip.dm

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

jukebox.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

lightswitch.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

machinery.dm

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

2015-06-16 10:52:33 +02:00

magnet.dm

…

mass_driver.dm

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

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

navbeacon.dm

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

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

newscaster.dm

new object-based lighting system

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

nuclear_bomb.dm

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

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

OpTable.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

overview.dm

…

portable_tag_turret.dm

…

portable_turret.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

recharger.dm

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

2015-06-26 20:28:47 +02:00

rechargestation.dm

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30

records_scanner.dm

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

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

requests_console.dm

Request Console NanoUI and fixes

2015-06-11 21:43:27 -04:00

robot_fabricator.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

seed_extractor.dm

…

Sleeper.dm

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

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

spaceheater.dm

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

2015-06-02 17:33:20 +01:00

status_display_ai.dm

…

status_display.dm

…

suit_storage_unit.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

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

supply_display.dm

…

syndicatebeacon.dm

…

teleporter.dm

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

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

transformer.dm

…

turret_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

turrets.dm

Ports /tg/'s meteor implementation.

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

vending.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

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

wall_frames.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

walllockers.dm

…

washing_machine.dm

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

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

wishgranter.dm

…