Mark Mak 690d7bd0d4 Merge pull request #9732 from TDSSS/ody-stuff ...

New mech equipment: Jaws of life for Ody/Firefighter Ripley

2018-10-19 06:54:38 +08:00

..

area

Resolves conflicts.

2018-10-11 05:36:22 -05:00

dna

Resolves conflicts.

2018-10-11 05:36:22 -05:00

gamemodes

Merge pull request #9856 from Ty-Omaha/borer-fixes

2018-10-16 07:56:49 +08:00

jobs

Resolves conflicts.

2018-10-11 05:36:22 -05:00

machinery

Merge pull request #9732 from TDSSS/ody-stuff

2018-10-19 06:54:38 +08:00

magic

no more runtimes

2018-03-29 00:44:53 -04:00

mecha

Merge pull request #9732 from TDSSS/ody-stuff

2018-10-19 06:54:38 +08:00

objects

Merge pull request #9857 from Agameofscones/ID_Sticker_Redux

2018-10-18 11:26:59 -07:00

turfs

Merge pull request #9821 from SamHPurp/grime/dirt-away

2018-10-12 13:55:40 +08:00

verbs

Resolves conflicts.

2018-10-11 05:36:22 -05:00

alternate_appearance.dm

…

asteroid.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

atoms_movable.dm

get area master does nothing!

2018-09-30 17:28:47 +01:00

atoms.dm

Merge pull request #9776 from tigercat2000/hover_indicator_inventory

2018-10-10 22:19:26 +08:00

data_huds.dm

Abductor Update

2018-07-24 19:49:10 -04:00

shuttle_engines.dm

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

sound.dm

Merge pull request #9388 from FreeStylaLT/crunch

2018-10-15 12:52:43 +08:00

world.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00