Jordan Brown 9bae1264a5 Merge pull request #30240

2017-08-29 10:44:09 -04:00

..

antimatter

Standardized power displays

2017-08-28 14:22:05 -04:00

singularity

Cleaned up environment_smash vars with bitflag defines (#30154)

2017-08-27 12:49:58 +02:00

supermatter

Fixes supermatter sliver objective being given if there is no supermatter engine (#30032)

2017-08-24 11:39:35 +12:00

tesla

Resolved merge conflicts

2017-08-16 08:33:24 -06:00

apc.dm

Merge pull request #30240

2017-08-29 10:44:09 -04:00

cable.dm

Standardized power displays

2017-08-28 14:22:05 -04:00

cell.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

floodlight.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

generator.dm

Standardized power displays

2017-08-28 14:22:05 -04:00

gravitygenerator.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

lighting.dm

Fixes missing inhands

2017-08-21 18:29:51 -04:00

monitor.dm

Standardized power displays

2017-08-28 14:22:05 -04:00

port_gen.dm

Standardized power displays

2017-08-28 14:22:05 -04:00

power.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

powernet.dm

…

rtg.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

smes.dm

Standardized power displays

2017-08-28 14:22:05 -04:00

solar.dm

Replaced flags with flags_1

2017-08-16 13:01:15 -06:00

switch.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

terminal.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

tracker.dm

Replaced flags with flags_1

2017-08-16 13:01:15 -06:00

turbine.dm

Standardized power displays

2017-08-28 14:22:05 -04:00