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

Conflicts:
	code/game/machinery/vending.dm

2015-04-10 15:25:34 +02:00

..

antimatter

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

2015-03-31 01:37:55 -04:00

rust

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

sensors

The AI now has a personal power monitor interface.

2015-02-16 15:12:23 +01:00

singularity

Preliminary work on converting all monkeys to a human subspecies.

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

apc.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

batteryrack.dm

Removed unused substation batteryrack code.

2014-12-17 14:31:57 +01:00

breaker_box.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

cable_heavyduty.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

cable_logic.dm

Fixes #6121

2014-09-04 05:02:03 +01:00

cable.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

cable.dm.orig

Merged with dev.

2015-03-31 11:17:13 +10:30

cell.dm

indent fix

2015-03-23 13:04:39 -04:00

engine.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

2014-11-28 21:35:02 +01:00

generator_type2.dm

…

generator.dm

Adds a bunch of prettiness to the TEG, fixes a runtime.

2015-03-04 09:13:05 -05:00

gravitygenerator.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

lighting.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

pacman2.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

port_gen.dm

Fixes PACMAN UI initial data

2015-04-09 15:58:07 +01:00

power.dm

Fixes machines being usable after a power failure

2015-02-11 23:28:53 -05:00

powernet.dm

Fixes two powernet related issues:

2015-01-20 21:12:52 +01:00

profiling.dm

May fix the debug verbs showing up for non-debuggers. Probably not.

2014-09-15 01:56:38 +09:30

smes_construction.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

2015-02-17 16:05:47 +01:00

smes.dm

Merge pull request #8603 from Baystation12/dev-freeze

2015-03-24 14:00:57 +01:00

solar.dm

Fixes (at least some) of the recursive power-drain crash issues.

2014-12-14 14:44:53 +10:30

terminal.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

tracker.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

turbine.dm

Updates references

2014-12-27 00:03:20 +01:00