Markolie 84c8b2e12b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate ...

# Conflicts:
#	code/game/machinery/computer/camera.dm

2016-12-23 18:58:58 +01:00

..

singularity

PA wording fixes

2016-11-06 16:44:54 +01:00

supermatter

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

tesla

Ports typecaches and their use in the tesla

2016-08-03 20:08:51 -04:00

apc.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate

2016-12-23 18:58:58 +01:00

cable_heavyduty.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

cable_logic.dm

…

cable.dm

Delays and Welder Repair Tweaks

2016-08-19 21:34:39 -04:00

cell.dm

Mass replace

2016-07-07 19:34:02 -07:00

engine.dm

Mass replace

2016-07-07 19:34:02 -07:00

generator.dm

Hopefully final TEG fixes

2016-10-13 19:40:16 +02:00

gravitygenerator.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

lighting.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

port_gen.dm

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

power.dm

Mass replace

2016-07-07 19:34:02 -07:00

powernet.dm

Mass replace

2016-07-07 19:34:02 -07:00

smes.dm

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

solar.dm

NanoUI Update: Seperate UI Data into ui_data() proc

2016-12-14 13:37:34 -08:00

switch.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

terminal.dm

…

tracker.dm

Removes .0 at the end of w_class numbers

2016-07-08 12:26:34 -04:00

treadmill.dm

Fox's requests

2016-10-23 15:45:35 -07:00

turbine.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00