Fox McCloud 4e9de085f6 Merge pull request #5465 from TullyBurnalot/IDCryoFix ...

ID Cryodorm Survival Fix

2016-08-17 20:49:22 -04:00

..

area

Merge remote-tracking branch 'upstream/master' into strips-out-media

2016-08-17 17:46:26 -04:00

dna

Adds a helper for saving a head's traits to DNA

2016-08-13 23:28:39 -07:00

gamemodes

Merge pull request #5453 from Crazylemon64/ipc_surgery_fix

2016-08-17 20:15:53 -04:00

jobs

Merge pull request #5432 from Alexshreds/ORM4engies

2016-08-14 22:36:40 -04:00

machinery

Merge pull request #5465 from TullyBurnalot/IDCryoFix

2016-08-17 20:49:22 -04:00

magic

…

mecha

Merge pull request #5429 from tigercat2000/mecha

2016-08-17 17:30:00 -04:00

objects

Merge pull request #5429 from tigercat2000/mecha

2016-08-17 17:30:00 -04:00

turfs

Merge pull request #5429 from tigercat2000/mecha

2016-08-17 17:30:00 -04:00

verbs

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04: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

/tg/ mecha - Part 1

2016-08-12 06:14:00 -07:00

atoms.dm

Iiiiit's merge conflict time!

2016-08-07 23:42:02 -07:00

data_huds.dm

please god tell me i fixed the morgue conflict

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

response_team.dm

Removes eye color vars on the human, stores it on the eyes

2016-08-13 23:05:32 -07: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