deathride58andGitHub 0f388bc994 Merge pull request #7040 from Citadel-Station-13/upstream-merge-38266 ...

[MIRROR] Adds warning to shuttle purchase menu

2018-06-09 04:28:59 +00:00

..

area

Hard upstream sync (#6951)

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

gamemodes

Increases head jobs restricted from antag RNG (#6868)

2018-06-05 23:12:55 -07:00

machinery

adds warning to shuttle purchase menu (#38266)

2018-06-07 20:32:38 -05:00

mecha

Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

objects

Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116

2018-06-05 23:37:20 +00:00

turfs

Adds indestructible sandstone wall (#38350)

2018-06-07 23:16:17 -05: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

…

sound.dm

…

world.dm

makes small tweaks to the hub entry (#6782)

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