alberyk 2294b4f0c5 Merge branch 'master' into computer_tweaks ...

# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi

2021-10-29 21:41:30 -03:00

..

antimatter

…

lights

…

sensors

console stuff

2021-10-10 15:08:16 -03:00

singularity

Tesla Equipment Sprites (#11821)

2021-05-08 11:25:09 +02:00

tesla

Tesla Equipment Sprites (#11821)

2021-05-08 11:25:09 +02:00

apc.dm

Adds sensitive hearing (#12151)

2021-10-15 19:02:12 +02:00

batteryrack.dm

…

breaker_box.dm

…

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Synthetic Smörgåsbord (#12417)

2021-09-06 22:47:27 +02:00

cell.dm

Inductive Charger Fix (#12379)

2021-08-24 15:11:54 -03:00

crystal_agitator.dm

…

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

port_gen.dm

…

power.dm

…

powernet.dm

…

profiling.dm

…

radial_floodlight.dm

…

rtg.dm

…

smes_construction.dm

Roundstart smes tweak (#12477)

2021-10-01 14:00:55 -03:00

smes.dm

…

solar.dm

Turret and Solar Panel Rotation (#12241)

2021-08-17 17:21:50 +02:00

terminal.dm

…

tracker.dm

Turret and Solar Panel Rotation (#12241)

2021-08-17 17:21:50 +02:00

turbine.dm

console stuff

2021-10-10 15:08:16 -03:00