Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

antimatter

…

cells

POLARIS: FBP backup battery cells for survival purposes

2018-02-24 14:25:29 -05:00

fusion

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

sensors

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

singularity

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

supermatter

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

tesla

POLARIS: Log more engine info

2018-03-13 18:57:52 -04:00

apc.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018

2018-05-29 21:05:27 -04:00

batteryrack.dm

…

breaker_box.dm

…

cable_ender.dm

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

cable_heavyduty.dm

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

cable_logic.dm

…

cable.dm

Switch cables and pipes to use define constants instead of literals for layers.

2018-04-02 21:50:03 -04:00

cell.dm

Recharger refactor

2018-06-16 17:15:59 -04:00

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

grid_checker.dm

…

lighting_vr.dm

Fix light/camera layers for macros and fix constants for them too.

2018-04-01 16:29:52 -04:00

lighting.dm

readds trailblazers, more mapping stuff

2018-06-07 23:39:55 -04:00

lightswitch_vr.dm

Make light switches constructable

2018-02-14 21:26:00 -05:00

pacman2.dm

…

port_gen.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

power.dm

blueshield, more clothes/vests, more weapons, phorochem fixes,

2018-06-11 21:27:11 -04:00

powernet.dm

…

profiling.dm

…

smes_construction.dm

SMES tweaks (#4793)

2018-02-12 20:39:58 -06:00

smes.dm

POLARIS: Log more engine info

2018-03-13 18:57:52 -04:00

solar.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

terminal.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

tracker.dm

…

turbine.dm

Make gas turbine constructable and operational

2018-02-22 15:43:38 -05:00