Kyep d488195799 fix merge conflict, wipe map changes

2019-01-03 14:39:41 -08:00

..

area

MERGE SHIT REEEEE IMMAH PUNCH A WALL

2018-12-18 11:47:29 +00:00

dna

this bothers me.

2018-12-25 04:23:04 +01:00

gamemodes

Merge pull request #10540 from datlo/fixplasmaops

2018-12-31 23:14:43 +08:00

jobs

MERGE SHIT REEEEE IMMAH PUNCH A WALL

2018-12-18 11:47:29 +00:00

machinery

fix merge conflict, wipe map changes

2019-01-03 14:39:41 -08:00

magic

…

mecha

Fix mech grenade launchers

2018-12-29 07:46:06 +00:00

objects

fix merge conflict, wipe map changes

2019-01-03 14:39:41 -08:00

turfs

Merge pull request #10450 from datlo/toxinstechdisk

2018-12-24 09:20:52 +08:00

verbs

…

alternate_appearance.dm

…

asteroid.dm

Removing the mass spectrometer and replacing it with the reagent scanner.

2018-11-23 19:48:18 -05:00

atoms_movable.dm

Merge pull request #10185 from Mitchs98/moveresist

2018-12-28 20:53:07 +08:00

atoms.dm

Merge pull request #10185 from Mitchs98/moveresist

2018-12-28 20:53:07 +08:00

data_huds.dm

Cling regenerative stasis now appears as if the cling is dead on the med HUDs

2018-11-04 17:16:31 +01:00

shuttle_engines.dm

…

sound.dm

…

world.dm

…