Birdtalon b195aa5fa1 removes if statement adds return

2018-11-19 14:04:51 +00:00

..

area

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

dna

SSoverlays for human icons, mostly works

2018-11-08 20:24:22 -08:00

gamemodes

Fix for shuttle curse item

2018-11-15 01:12:42 +00:00

jobs

fixes a couple of silly mistakes

2018-11-12 18:27:42 +00:00

machinery

Merge pull request #10242 from Certhic/radiochannels

2018-11-16 23:51:53 +08:00

magic

no more runtimes

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

mecha

Merge remote-tracking branch 'upstream/master' into updateicons

2018-11-08 20:24:48 -08:00

objects

removes if statement adds return

2018-11-19 14:04:51 +00:00

turfs

Merge pull request #9719 from SamHPurp/smoothing-improvements

2018-10-21 07:41:47 +08:00

verbs

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02: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

Roll the damn changes back, init works now

2018-10-23 17:48:22 -07:00

atoms.dm

Fix atom init again

2018-10-23 18:48:56 -07: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

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