Neerti b2f5b758f1 Hopefully fixes merge conflicts.

2017-08-01 16:18:43 -04:00

..

antagonist

Merge pull request #3631 from Anewbe/merc_heist_again

2017-07-28 15:24:06 -05:00

area

Woodrat breaks map stuff

2017-07-02 18:53:17 -07:00

dna

Allows Click Dragging for Cryo and Cloner

2017-07-23 10:06:02 -05:00

gamemodes

Using changeling fake death should work properly if self-respiration is on

2017-07-31 17:58:06 -05:00

jobs

Prevent runtime if accidentally have a spawnpoint authorized by using_map but without any landmarked turfs.

2017-05-17 20:43:03 -04:00

machinery

Merge pull request #3667 from silveryferret/scrubber-tweak

2017-07-30 13:16:41 -05:00

magic

…

mecha

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-05 22:10:06 -04:00

objects

Hopefully fixes merge conflicts.

2017-08-01 16:18:43 -04:00

turfs

Woodrat breaks map stuff

2017-07-02 18:53:17 -07:00

vehicles

…

verbs

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

atoms_movable.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-05 22:10:06 -04:00

atoms.dm

…

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

It's CentCOM not CentCOMM

2017-07-21 04:29:39 -04:00

trader_visit.dm

…