SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi

2016-07-13 17:07:52 -04:00

..

antimatter

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

sensors

Fixes power monitor computer screens

2016-06-03 22:10:52 -04:00

singularity

AI Core Update

2016-07-05 17:33:34 -04:00

apc.dm

AI Core Update

2016-07-05 17:33:34 -04:00

batteryrack.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

breaker_box.dm

…

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

"1" Spam

2016-06-10 09:50:54 -04:00

cell.dm

EMP tweaks/fixes

2016-02-04 09:51:25 -05:00

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

lighting.dm

minor fixes and icon adjustment

2016-06-19 23:30:46 -04:00

pacman2.dm

…

port_gen.dm

Construction Update

2016-03-25 16:02:36 -04:00

power.dm

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

powernet.dm

…

profiling.dm

…

smes_construction.dm

Changes to SMES

2016-04-22 00:58:11 +02:00

smes.dm

RCON Interface Update (#1545)

2016-05-04 15:35:12 +01:00

solar.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state

2016-07-13 17:07:52 -04:00

terminal.dm

Fixes #715

2016-01-14 01:08:21 +10:30

tracker.dm

…

turbine.dm

…