Jordan Brown 0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup ...

Cleans up duplicate get_area's in c.grenade priming

2018-05-21 16:35:54 -05:00

..

area

Adds (fake) ambient occlusion as a client preference

2018-05-07 22:08:08 -05:00

gamemodes

Merge branch 'master' into upstream-merge-37476

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

machinery

Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476

2018-05-21 11:23:02 -05:00

mecha

Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760

2018-05-14 12:28:41 -05:00

objects

Merge pull request #37956 from ShizCalev/chem-grenade-cleanup

2018-05-21 16:35:54 -05:00

turfs

Merge branch 'master' into upstream-merge-37476

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

alternate_appearance.dm

…

atoms_movable.dm

Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436)

2018-04-27 07:37:15 -05:00

atoms.dm

game folder

2018-04-23 00:17:28 -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

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

sound.dm

…

world.dm

Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox

2018-05-17 21:38:41 -05:00