oranges 4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox ...

[s] Fix lockboxes not actually being locked

2018-06-11 22:30:08 -05:00

..

area

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

gamemodes

Quartermaster can no longer be a changeling or traitor (#7062)

2018-06-11 13:40:19 -07:00

machinery

Adds logging for sleeper chem injections (#38396)

2018-06-11 00:04:21 -05:00

mecha

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

objects

Merge pull request #38376 from AutomaticFrenzy/patch/lockbox

2018-06-11 22:30:08 -05:00

turfs

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

alternate_appearance.dm

…

atoms_movable.dm

Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225)

2018-06-03 13:25:19 -05:00

atoms.dm

Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined

2018-06-01 09:58:50 -05:00

communications.dm

…

data_huds.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

say.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

shuttle_engines.dm

Standardizes and cleans up some admin messages & logging

2018-05-31 22:41:31 -05:00

sound.dm

…

world.dm

makes small tweaks to the hub entry (#6782)

2018-05-23 12:12:57 -07:00