Jordan Brown 963fc6b4ae Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

..

antimatter

merge conflict fix

2017-10-05 11:22:57 +02:00

singularity

Merge branch 'master' into patch/thethe

2017-10-13 10:23:55 -04:00

supermatter

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

tesla

Fixes Teslas always doing the same movement pattern (#31469)

2017-10-09 20:01:17 -04:00

apc.dm

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04:00

cable.dm

merge conflict fix

2017-10-05 11:22:57 +02:00

cell.dm

Grammar fixes to atom descriptions (#31293)

2017-10-05 16:33:35 -04:00

floodlight.dm

Fix many instances of "the the"

2017-10-11 21:55:44 -07:00

generator.dm

Removes old debug text

2017-09-19 18:56:39 -04:00

gravitygenerator.dm

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

lighting.dm

Fixes empty light fixtures showing as working in DM

2017-10-11 16:53:23 -04:00

monitor.dm

Standardized power displays

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

port_gen.dm

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

power.dm

ismecha define (#31192)

2017-10-02 02:03:40 -04:00

powernet.dm

SSmachine -> SSmachines

2017-03-22 11:38:35 -04:00

rtg.dm

Radiation rework and subsystem (#30909)

2017-10-13 10:22:00 -04:00

smes.dm

Fixes to more Initialize procs (#30641)

2017-09-13 02:47:17 -04:00

solar.dm

Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)

2017-10-07 13:36:33 -04: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