Dave 2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376)

2019-09-21 19:32:52 -07:00

..

singularity

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

2019-08-09 23:38:49 +02:00

supermatter

Portal fixes - adds oldloc to Crossed()

2019-07-15 20:16:17 +02:00

tesla

Resolve conflicts

2019-05-03 22:28:04 -04:00

apc.dm

Revert "Datumizes traitors and mindslaves (#11969)" (#12376)

2019-09-21 19:32:52 -07:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

cell.dm

rechargers now show their contents and charge status on examine

2019-05-18 19:56:30 +02:00

generator.dm

…

gravitygenerator.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

lighting.dm

Rebalances Golems, Refactors Species Based Equipping (#12358)

2019-09-21 06:10:37 -07:00

port_gen.dm

…

power.dm

Reverts "Fixes Grid Check"

2019-08-26 00:44:46 -04:00

powernet.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

smes.dm

removes implicit src

2019-08-25 09:04:27 -04:00

solar.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

terminal.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

tracker.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00

treadmill.dm

Portal fixes - adds oldloc to Crossed()

2019-07-15 20:16:17 +02:00

turbine.dm

Resolve conflicts

2019-05-03 22:28:04 -04:00