Razharas 80b592d0b3 Resolving conflicts ...

God hates git
And so do i

2014-01-03 21:12:14 +04:00

..

antimatter

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

singularity

Fixes missing !'s and inverted messages.

2013-11-10 21:42:32 +01:00

apc.dm

Merge pull request #1903 from YotaXP/Fix-Borg-APC-Access

2013-11-29 15:09:13 -08:00

cable.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

cell.dm

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

engine.dm

Removed a bunch of copy pasted code regarding moving pulled atmos by clicking on turfs or conveyors. Now this is handled by a mob proc, Move_Pulled()

2013-06-21 17:55:32 -03:00

generator_type2.dm

Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others.

2013-07-03 13:16:53 -03:00

generator.dm

Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others.

2013-07-03 13:16:53 -03:00

gravitygenerator.dm

Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others.

2013-07-03 13:16:53 -03:00

lighting.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

port_gen.dm

Constructable machines will depend on R&D parts

2013-12-23 21:39:27 +04:00

power.dm

making propagate_network non recursive

2013-11-08 00:09:30 +00:00

smes.dm

Glove update

2013-09-17 18:19:13 -04:00

solar.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

switch.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

terminal.dm

- Added a sprite "7" to the sd lighting file as it was used, even if it didn't exist.

2012-07-31 05:24:37 +00:00

tracker.dm

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

turbine.dm

fixes a rare runtime that occurs when the turbine couldn't find a compressor. Brings the code up to current standards. Removes the view function from the computer. Its rather obsolete in the days of telescreens.

2013-12-15 17:38:23 -07:00