jughu 4b17b4a9a3 Adds petcollars to the cmo, captain, and bartender's locker

2017-10-14 18:01:05 -05:00

..

area

Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570

2017-10-14 15:37:17 -04:00

gamemodes

Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662

2017-10-14 15:41:09 -04:00

machinery

Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601

2017-10-14 15:37:00 -04:00

mecha

Merge branch 'master' into upstream-merge-31601

2017-10-14 10:17:16 -04:00

objects

Adds petcollars to the cmo, captain, and bartender's locker

2017-10-14 18:01:05 -05:00

turfs

Merge pull request #3382 from Citadel-Station-13/upstream-merge-31655

2017-10-14 15:38:21 -04:00

alternate_appearance.dm

…

atoms_movable.dm

Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes

2017-10-13 19:09:45 -05:00

atoms.dm

Radiation rework and subsystem

2017-10-13 09:22:23 -05:00

communications.dm

…

data_huds.dm

Update data_huds.dm

2017-10-10 00:04:20 -05:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

…

world.dm

Update world.dm

2017-10-13 10:30:18 -05:00