Fox McCloud 6162323bdc Merge pull request #5400 from chopchop1614/sena ...

Removes coding fluff

2016-08-10 16:33:52 -04:00

..

area

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

dna

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

2016-08-08 23:26:51 -04:00

gamemodes

removes coding fluff

2016-08-09 23:24:47 +01:00

jobs

Fixes #5202

2016-08-10 01:37:34 -04:00

machinery

Adds qdels for some temporary humans

2016-08-09 02:58:36 -04:00

magic

…

mecha

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

objects

Merge pull request #5355 from Fox-McCloud/malf-ai-update

2016-08-08 21:30:12 -04:00

turfs

removes fox's comments

2016-08-07 12:49:44 +03:00

verbs

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

alternate_appearance.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

asteroid.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

atoms_movable.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

atoms.dm

Merge pull request #5316 from Crazylemon64/map_writer

2016-08-08 02:34:02 -04:00

data_huds.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

response_team.dm

Combat Gloves - ERT Commander

2016-08-10 13:28:05 -04:00

shuttle_engines.dm

…

skincmd.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00

smoothwall.dm

…

sound.dm

please god tell me i fixed the morgue conflict

2016-08-04 18:50:05 +01:00